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

diff --git a/debian/rules b/debian/rules
index 8cc2a66..e0c5373 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,12 @@
 #!/usr/bin/make -f
 
-subdirs=	backup
+SHELL=/bin/bash
+
+subdirs_build=	cprogs
+subdirs_nobuild=backup sync-accounts scripts
 package=	chiark-utils
-packages_indep=	chiark-backup
-packages_arch=	chiark-rwbuffer
+packages_indep=	chiark-backup chiark-scripts
+packages_arch=	chiark-rwbuffer chiark-really chiark-utils-bin
 packages=	$(packages_indep) $(packages_arch)
 
 cwd=	$(shell pwd)
@@ -12,13 +15,13 @@ t=	$d/tmp
 
 build:
 	$(checkdir)
-	set -e; for s in $(subdirs); do $(MAKE) -C $$s all; done
+	set -e; for s in $(subdirs_build); do $(MAKE) -C $$s all; done
 	touch build
 
 clean:
 	$(checkdir)
 	rm -f build
-	set -e; for s in $(subdirs); do \
+	set -e; for s in $(subdirs_build); do \
 		$(MAKE) -C $$s -i distclean || \
 		$(MAKE) -C $$s -f Makefile.in distclean; \
 	done
@@ -28,31 +31,67 @@ binary-prep:
 	$(checkdir)
 	rm -rf debian/tmp*
 	#
+	set -e; for s in $(subdirs_build) $(subdirs_nobuild); do \
+		$(MAKE) -C $$s install install-docs install-examples \
+			prefix=$t/$$s/usr \
+			etcdir=$t/$$s/etc \
+			varlib=$t/$$s/var/lib \
+			mandir=$t/$$s/usr/share/man; \
+	done
+	#
+	mv $t/cprogs $t/chiark-utils-bin
+	#
+	cp -a debian/tmp/sync-accounts/* debian/tmp/scripts/.
+	rm -r debian/tmp/sync-accounts
+	mv debian/tmp/scripts debian/tmp/chiark-scripts
+	mv debian/tmp/backup debian/tmp/chiark-backup
+	#
 	set -e; for p in $(packages); do \
 		install -d $t/$$p/DEBIAN $t/$$p/usr/share/doc/$$p; \
 		cp debian/copyright debian/changelog \
-			$t/$$p/usr/share/doc/$$p; \
+			$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; \
 		done
 	#
-	$(MAKE) -C backup install install-docs install-examples \
-		prefix=$t/chiark-backup/usr \
-		etcdir=$t/chiark-backup/etc \
-		varlib=$t/chiark-backup/var/lib \
-		mandir=$t/chiark-backup/usr/share/man
-	#
 	install -d $t/chiark-rwbuffer/usr/bin
 	install -d $t/chiark-rwbuffer/usr/share/man/man1
-	cd $t/chiark-backup/usr/bin && \
-		mv readbuffer writebuffer $t/chiark-rwbuffer/usr/bin
+	cd $t/chiark-utils-bin/usr/bin && \
+		mv readbuffer writebuffer $t/chiark-rwbuffer/usr/bin/
+	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 && \
-		mv readbuffer.1 writebuffer.1 $t/chiark-rwbuffer/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 --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
+	#
 	gzip -9f $t/*/usr/share/man/man*/*
 
 binary-hook-chiark-backup:
 binary-hook-chiark-rwbuffer:
+binary-hook-sync-accounts:
+binary-hook-chiark-scripts:
+binary-hook-chiark-really:
+binary-hook-chiark-utils-bin:
 
 binary-one:
 	set -e; for f in preinst postinst prerm postrm conffiles; do \
@@ -60,7 +99,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
@@ -72,12 +111,18 @@ binary-indep:	checkroot build binary-prep
 
 binary-arch:	checkroot build binary-prep
 	$(checkdir)
-	dpkg-shlibdeps -Tdebian/sv-chiark-rwbuffer $t/chiark-rwbuffer/usr/bin/*
+	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 p in $(packages_arch); \
 		do debian/rules binary-one p=$$p; done
 
 define checkdir
-	test -f backup/writebuffer.c
+	test -f cprogs/writebuffer.c
 endef
 
 # Below here is fairly generic really