X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=debian%2Frules;h=cc926b8e147e35939c3d63fd0ea32fb177448997;hb=HEAD;hp=b711bb1c1a5f12c74c2960926bbab8e095370466;hpb=10f4dec74dc00896c1fcfcdf0b27afe94a765e6d;p=chiark-utils.git

diff --git a/debian/rules b/debian/rules
index b711bb1..62bc32d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 SHELL=/bin/bash
 
 subdirs_build_arch=	cprogs
-subdirs_nobuild=backup sync-accounts scripts
+subdirs_nobuild=backup sync-accounts scripts fishdescriptor
 package=	chiark-utils
 packages_indep=	chiark-backup chiark-scripts
 packages_arch=	chiark-rwbuffer chiark-really chiark-utils-bin
@@ -13,15 +13,17 @@ cwd=	$(shell pwd)
 d=	$(cwd)/debian
 t=	$d/tmp
 
+D_BUILDFLAGS=DEB_BUILD_MAINT_OPTIONS=future=+lfs dpkg-buildflags
+
 makebuildargs := OPTIMISE= DEBUG= \
- CMDLINE_CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" \
- CMDLINE_CPPFLAGS="$(shell dpkg-buildflags --get CPPFLAGS)" \
- CMDLINE_LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS)"
+ CMDLINE_CFLAGS="$(shell $(D_BUILDFLAGS) --get CFLAGS)" \
+ CMDLINE_CPPFLAGS="$(shell $(D_BUILDFLAGS) --get CPPFLAGS) -D_TIME_BITS=64" \
+ CMDLINE_LDFLAGS="$(shell $(D_BUILDFLAGS) --get LDFLAGS)"
 
 build:
 	$(checkdir)
 	set -e; for s in $(subdirs_build_arch); do \
-		$(MAKE) -C $$s all $(makebuildargs); \
+		dh_auto_build --sourcedirectory=$$s -- all $(makebuildargs); \
 	done
 	touch build
 
@@ -52,6 +54,7 @@ binary-prep:
 	#
 	mv $t/cprogs $t/chiark-utils-bin
 	#
+	cp -a debian/tmp/fishdescriptor/* debian/tmp/scripts/.
 	cp -a debian/tmp/sync-accounts/* debian/tmp/scripts/.
 	rm -r debian/tmp/sync-accounts
 	mv debian/tmp/scripts debian/tmp/chiark-scripts
@@ -63,7 +66,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
@@ -91,10 +94,9 @@ binary-prep:
 		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:
@@ -109,8 +111,9 @@ binary-one:
 		cp debian/$p/$$f $t/$p/DEBIAN/$$f; \
 		chmod u=rwX,go=rX $t/$p/DEBIAN/$$f; \
 	done
+	dh_lintian -p$p -Pdebian/tmp/$p
 	dh_link -p$p -Pdebian/tmp/$p
-	dpkg-gencontrol -isp -p$p -P$t/$p -Tdebian/sv-$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
@@ -132,18 +135,13 @@ binary-arch:	checkroot build binary-prep
 		case "$$f" in \
 		*/xbatmon-simple|*/xduplic-copier) \
 					d=Suggests	;; \
-		*/watershed|*/summer)	d=Recommends	;; \
+		*/watershed|*/summer|*/cgi-fcgi-interp|*/prefork-interp) \
+					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