X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=debian%2Frules;h=32f312912b87f42b97d5d3508ceb3bf1d451a772;hp=e0c537338315b9d12b10782825543361f97f599a;hb=42c13be0ac6147fa4150d93225b81e6c5a928a4d;hpb=2c85e1f7f38307728b65514bdaf2d118302106bd

diff --git a/debian/rules b/debian/rules
index e0c5373..32f3129 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 SHELL=/bin/bash
 
-subdirs_build=	cprogs
+subdirs_build_arch=	cprogs
 subdirs_nobuild=backup sync-accounts scripts
 package=	chiark-utils
 packages_indep=	chiark-backup chiark-scripts
@@ -13,25 +13,36 @@ cwd=	$(shell pwd)
 d=	$(cwd)/debian
 t=	$d/tmp
 
+makebuildargs := OPTIMISE= DEBUG= \
+ CMDLINE_CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" \
+ CMDLINE_CPPFLAGS="$(shell dpkg-buildflags --get CPPFLAGS)" \
+ CMDLINE_LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS)"
+
 build:
 	$(checkdir)
-	set -e; for s in $(subdirs_build); do $(MAKE) -C $$s all; done
+	set -e; for s in $(subdirs_build_arch); do \
+		$(MAKE) -C $$s all $(makebuildargs); \
+	done
 	touch build
 
+build-indep: build
+build-arch: build
+
 clean:
 	$(checkdir)
 	rm -f build
-	set -e; for s in $(subdirs_build); do \
+	set -e; for s in $(subdirs_build_arch); do \
 		$(MAKE) -C $$s -i distclean || \
 		$(MAKE) -C $$s -f Makefile.in distclean; \
 	done
 	rm -rf *~ debian/tmp debian/*~ debian/files* debian/substvars*
+	rm -rf debian/sv-* debian/*.debhelper.log
 
 binary-prep:
 	$(checkdir)
 	rm -rf debian/tmp*
 	#
-	set -e; for s in $(subdirs_build) $(subdirs_nobuild); do \
+	set -e; for s in $(subdirs_build_arch) $(subdirs_nobuild); do \
 		$(MAKE) -C $$s install install-docs install-examples \
 			prefix=$t/$$s/usr \
 			etcdir=$t/$$s/etc \
@@ -52,7 +63,7 @@ binary-prep:
 			$t/$$p/usr/share/doc/$$p/; \
 		ln -s changelog.gz \
 			$t/$$p/usr/share/doc/$$p/changelog.Debian.gz; \
-		gzip -9v $t/$$p/usr/share/doc/$$p/changelog; \
+		gzip -9vn $t/$$p/usr/share/doc/$$p/changelog; \
 		done
 	#
 	install -d $t/chiark-rwbuffer/usr/bin
@@ -76,15 +87,13 @@ 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 \
 		$t/chiark-utils-bin/usr/share/man/man8/trivsoundd.8
-	rmdir	$t/chiark-utils-bin/usr/sbin \
-		$t/chiark-utils-bin/usr/share/man/man8
+	rmdir	$t/chiark-utils-bin/usr/sbin
 	#
-	gzip -9f $t/*/usr/share/man/man*/*
+	gzip -9fn $t/*/usr/share/man/man*/*
 
 binary-hook-chiark-backup:
 binary-hook-chiark-rwbuffer:
@@ -99,7 +108,8 @@ binary-one:
 		cp debian/$p/$$f $t/$p/DEBIAN/$$f; \
 		chmod u=rwX,go=rX $t/$p/DEBIAN/$$f; \
 	done
-	dpkg-gencontrol -isp -p$p -P$t/$p -Tdebian/sv-$p
+	dh_link -p$p -Pdebian/tmp/$p
+	dpkg-gencontrol -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
@@ -111,13 +121,23 @@ 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/[^x]* \
-		-dSuggests $t/chiark-utils-bin/usr/bin/x*
+	set -e; for f in $t/chiark-utils-bin/usr/bin/*; do \
+		case "$$f" in \
+		*/xbatmon-simple|*/xduplic-copier) \
+					d=Suggests	;; \
+		*/watershed|*/summer|*/cgi-fcgi-interp)	\
+					d=Recommends	;; \
+		*)			d=Depends	;; \
+		esac; \
+		a="$$a -d$$d $$f"; \
+	    done; set -x; \
+	    dpkg-shlibdeps -Tdebian/sv-chiark-utils-bin $$a
 	set -e; for p in $(packages_arch); \
 		do debian/rules binary-one p=$$p; done