X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=debian%2Frules;h=bee06b08f1d641db64db7c9c22f8365b62d888fb;hp=30a80f09fb3ef9defb7bb96c8ecd902e9141f45d;hb=7008564f235a85e19b1ae27989428940149236cb;hpb=3132b6c3eebf3f16d43c2189fc9be5e52a6b2018

diff --git a/debian/rules b/debian/rules
index 30a80f0..bee06b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 
-subdirs_build=	cprogs
+SHELL=/bin/bash
+
+subdirs_build_arch=	cprogs
 subdirs_nobuild=backup sync-accounts scripts
 package=	chiark-utils
 packages_indep=	chiark-backup chiark-scripts
@@ -11,10 +13,14 @@ cwd=	$(shell pwd)
 d=	$(cwd)/debian
 t=	$d/tmp
 
-build:
+build-arch:
 	$(checkdir)
-	set -e; for s in $(subdirs_build); do $(MAKE) -C $$s all; done
-	touch build
+	set -e; for s in $(subdirs_build_arch); do $(MAKE) -C $$s all; done
+	touch build_arch
+
+build-indep:
+
+build: build-arch build-indep
 
 clean:
 	$(checkdir)
@@ -74,7 +80,6 @@ binary-prep:
 	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 --remove-section .note --remove-section .comment $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 \
@@ -109,12 +114,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