rules & dh_* files for package split

9 files changed, 32 insertions, 5 deletions

diff --git a/debian/install b/debian/install
deleted file mode 100644
index 9807820..0000000
--- a/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-dist-ghc/build/keysafe/keysafe usr/bin
diff --git a/debian/keysafe-bin.install b/debian/keysafe-bin.install
new file mode 100644
index 0000000..e57b60e
--- /dev/null
+++ b/debian/keysafe-bin.install
@@ -0,0 +1 @@
+dist/build/keysafe/keysafe usr/bin
diff --git a/debian/manpages b/debian/keysafe-bin.manpages
index 3d66e51..3d66e51 100644
--- a/debian/manpages
+++ b/debian/keysafe-bin.manpages
diff --git a/debian/keysafe-server.dirs b/debian/keysafe-server.dirs
new file mode 100644
index 0000000..4e9d5eb
--- /dev/null
+++ b/debian/keysafe-server.dirs
@@ -0,0 +1 @@
+var/lib/keysafe
diff --git a/debian/keysafe-server.keysafe.default b/debian/keysafe-server.keysafe.default
new file mode 120000
index 0000000..4cb68ea
--- /dev/null
+++ b/debian/keysafe-server.keysafe.default
@@ -0,0 +1 @@
+../keysafe.default
\ No newline at end of file
diff --git a/debian/keysafe-server.keysafe.init b/debian/keysafe-server.keysafe.init
new file mode 120000
index 0000000..1731ca4
--- /dev/null
+++ b/debian/keysafe-server.keysafe.init
@@ -0,0 +1 @@
+../keysafe.init
\ No newline at end of file
diff --git a/debian/keysafe-server.keysafe.service b/debian/keysafe-server.keysafe.service
new file mode 120000
index 0000000..a9bb8fa
--- /dev/null
+++ b/debian/keysafe-server.keysafe.service
@@ -0,0 +1 @@
+../keysafe.service
\ No newline at end of file
diff --git a/debian/keysafe.install b/debian/keysafe.install
new file mode 100644
index 0000000..c19fa11
--- /dev/null
+++ b/debian/keysafe.install
@@ -0,0 +1,2 @@
+keysafe.autostart etc/xdg/autostart
+keysafe.desktop usr/share/applications/
diff --git a/debian/rules b/debian/rules
index 918d4cc..8b1f148 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,35 @@
 #!/usr/bin/make -f
 
-export BUILDER=cabal
+export BUILDER=./Setup
+# ^ see below
 
 %:
 	dh $@
 
+override_dh_auto_test:
+	./keysafe --test
+
+# upstream's install-files target is not sufficient for our split into
+# three binary packages, so disable it here and use dh_* tools
 override_dh_auto_install:
-	$(MAKE) install-files
 
+# GHC cannot produce debugging symbols
 override_dh_strip:
-	# GHC cannot produce debugging symbols so the -dbgsym package
-	# ends up empty, so disable generating it
 	dh_strip --no-automatic-dbgsym
+
+# ensure service name is 'keysafe' not 'keysafe-server'.  This is so
+# we are consistent with other distros despite our package split (see
+# INSTALL)
+override_dh_installinit:
+	dh_installinit --name=keysafe
+
+# use Setup.hs directly, not cabal, because cabal likes to write to
+# $HOME and can complain about needing a sandbox (this technique
+# originally from Joey Hess's hothasktags rules file)
+override_dh_auto_configure:
+	ghc --make Setup
+	./Setup configure
+override_dh_auto_clean:
+	if [ -x Setup ]; then ./Setup clean; fi
+	rm -f Setup Setup.o Setup.hi keysafe
+	rm -rf dist .stack-work