X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=debian%2Frules;h=7ac91e218d491536c56eb651c445001d5c09e5bc;hp=13d0680e828b8d6b9d8378c5b1bf058cdfee7a7d;hb=c6d1694c6a8c80e76d677fafb811bd977ab1da38;hpb=98796d9fd68319e5e97034f13b13e3032ddd5f22

diff --git a/debian/rules b/debian/rules
index 13d0680..7ac91e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+SHELL=/bin/bash
+
 subdirs_build=	cprogs
 subdirs_nobuild=backup sync-accounts scripts
 package=	chiark-utils
@@ -60,11 +62,20 @@ binary-prep:
 	cd $t/chiark-utils-bin/usr/share/man/man1 && \
 		mv readbuffer.1 writebuffer.1 $t/chiark-rwbuffer/usr/share/man/man1/
 	#
+	install -d $t/chiark-backup/usr/share/man/man1
+	cp backup/man/*.1 $t/chiark-backup/usr/share/man/man1/
+	cd $t/chiark-backup/usr/share/man/man1 && \
+		for m in *.1; do \
+			mv "$$m" backup-"$$m"; \
+		done
+	cp \
+ $t/chiark-backup/usr/share/doc/chiark-backup/examples/chiark/settings.sh \
+ $t/chiark-backup/etc/chiark-backup/settings.sh
+	#
 	install -d $t/chiark-really/usr/sbin
 	install -d $t/chiark-really/usr/share/man/man8
 	cd $t/chiark-utils-bin/usr/sbin && \
 		mv really $t/chiark-really/usr/sbin/
-	strip --strip-unneeded $t/chiark-really/usr/sbin/really
 	cd $t/chiark-utils-bin/usr/share/man/man8 && \
 		mv really.8 $t/chiark-really/usr/share/man/man8/
 	rm	$t/chiark-utils-bin/usr/sbin/trivsoundd \
@@ -87,7 +98,7 @@ binary-one:
 		cp debian/$p/$$f $t/$p/DEBIAN/$$f; \
 		chmod u=rwX,go=rX $t/$p/DEBIAN/$$f; \
 	done
-	dpkg-gencontrol -p$p -P$t/$p -Tdebian/sv-$p
+	dpkg-gencontrol -isp -p$p -P$t/$p -Tdebian/sv-$p
 	chown -R root.root debian/tmp
 	chmod -R g-ws debian/tmp
 	debian/rules binary-hook-$p
@@ -99,12 +110,27 @@ binary-indep:	checkroot build binary-prep
 
 binary-arch:	checkroot build binary-prep
 	$(checkdir)
+	set -ex; for p in chiark-really chiark-utils-bin chiark-rwbuffer; do \
+		dh_strip -p$$p -Pdebian/tmp/$$p; done
 	dpkg-shlibdeps -Tdebian/sv-chiark-rwbuffer \
 		$t/chiark-rwbuffer/usr/bin/*
 	dpkg-shlibdeps -Tdebian/sv-chiark-really \
 		$t/chiark-really/usr/sbin/*
-	dpkg-shlibdeps -Tdebian/sv-chiark-utils-bin \
-		$t/chiark-utils-bin/usr/bin/*
+	set -e; for f in $t/chiark-utils-bin/usr/bin/*; do \
+		case "$$f" in \
+		*/xacpi-simple)		d=Suggests	;; \
+		*/watershed|*/summer)	d=Recommends	;; \
+		*)			d=Depends	;; \
+		esac; \
+		a="$$a -d$$d $$f"; \
+	    done; set -x; \
+	    dpkg-shlibdeps -Tdebian/sv-chiark-utils-bin $$a
+	perl -i~ -pe '						'\
+	 -e'	next unless m/^shlibs:/;			'\
+	 -e'	s/$$/,/; s/=/=, /;				'\
+	 -e'	s/, libgmp3(?:c2)?,/, libgmp3 | libgmp3c2,/; 	'\
+	 -e'	s/=, /=/; s/,$$//;				'\
+			debian/sv-*[!~]
 	set -e; for p in $(packages_arch); \
 		do debian/rules binary-one p=$$p; done