From c9f122a746a77f1656b42bee903f110e42f20960 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 14 Jul 2016 11:25:35 +0200
Subject: [PATCH] more package shuffling

---
 debian/control                | 29 ++++++++++++++++++++++++++---
 debian/psl-make-dafsa.install |  2 ++
 debian/rules                  | 16 +++++++++++-----
 3 files changed, 39 insertions(+), 8 deletions(-)
 create mode 100755 debian/psl-make-dafsa.install

diff --git a/debian/control b/debian/control
index a16b489..fea4199 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,16 @@ Maintainer: Tim Rühsen <tim.ruehsen@gmx.de>
 Uploaders:
  Daniel Kahn Gillmor <dkg@fifthhorseman.net>,
 Build-Depends:
- automake,
- debhelper (>=9),
+ debhelper (>=9)
+Build-Depends-Indep:
+ dh-exec
+Build-Depends-Arch:
  dh-autoreconf,
  gtk-doc-tools,
- help2man,
  libicu-dev,
  pkg-config,
+ automake,
+ help2man,
  publicsuffix (>= 20150507),
 Standards-Version: 3.9.8
 Section: libs
@@ -70,3 +73,23 @@ Description: Explore the Public Suffix List
  .
  This package contains a commandline tool to explore the Public Suffix
  List.
+
+Package: psl-make-dafsa
+Section: net
+Architecture: all
+Depends:
+ python-minimal,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Create a binary DAFSA from a Public Suffix List
+ libpsl permits the use of an optimized binary representation of the
+ Public Suffix List (PSL).  This format is a deterministic acyclic
+ finite state automaton, or DAFSA.
+ .
+ It is primarily used for building a new version of the publicsuffix
+ package, but could also be used by anyone else looking to match
+ printable US ASCII strings.
+ .
+ This package contains a python script to convert a standard PSL into
+ a DAFSA, either in C source code form, or in a specialized mmap-able
+ binary format.
diff --git a/debian/psl-make-dafsa.install b/debian/psl-make-dafsa.install
new file mode 100755
index 0000000..3e6b0f7
--- /dev/null
+++ b/debian/psl-make-dafsa.install
@@ -0,0 +1,2 @@
+#!/usr/bin/dh-exec
+src/make_dafsa.py => usr/share/psl_make_dafsa
diff --git a/debian/rules b/debian/rules
index 3c910eb..1038caf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,17 @@
 #!/usr/bin/make -f
-%:
-	dh $@  --with autoreconf
 
-override_dh_autoreconf:
+# FIXME: how do we only use dh_autoreconf when building arch-specific
+# packages?  see debian/README.source for an explanation of why we
+# care about splitting binary-only builds from arch:all builds.
+DH_AUTORECONF = --with autoreconf
+
+%:
+	dh $@ $(DH_AUTORECONF)
+
+override_dh_autoreconf-arch:
 	dh_autoreconf ./autogen.sh
 
-override_dh_auto_configure:
+override_dh_auto_configure-arch:
 	dh_auto_configure -- \
 		--enable-builtin=libicu \
 		--enable-gtk-doc \
@@ -17,7 +23,7 @@ override_dh_auto_configure:
 		--with-psl-file=/usr/share/publicsuffix/public_suffix_list.dat \
 		--with-psl-testfile=/usr/share/doc/publicsuffix/examples/test_psl.txt
 
-override_dh_auto_build:
+override_dh_auto_build-arch:
 	dh_auto_build
 	help2man --no-info --no-discard-stderr --output=debian/psl.1 \
 		--name="Explore the Public Suffix List" tools/psl