From: ianmdlvl <ianmdlvl>
Date: Sun, 6 Jul 2003 20:07:46 +0000 (+0000)
Subject: add with-lock-ex to new chiark-utils-bin package
X-Git-Tag: debian_version_3_99_1_0_9~11
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=98796d9fd68319e5e97034f13b13e3032ddd5f22;ds=sidebyside

add with-lock-ex to new chiark-utils-bin package
---

diff --git a/cprogs/.cvsignore b/cprogs/.cvsignore
index 61779d6..720cd81 100644
--- a/cprogs/.cvsignore
+++ b/cprogs/.cvsignore
@@ -2,3 +2,4 @@ readbuffer
 writebuffer
 trivsoundd
 really
+with-lock-ex
diff --git a/cprogs/Makefile b/cprogs/Makefile
index ab1b6c9..fc4b4dc 100644
--- a/cprogs/Makefile
+++ b/cprogs/Makefile
@@ -25,7 +25,7 @@ include ../settings.make
 
 RWBUFFER_SIZE_MB=16
 
-PROGRAMS=		readbuffer writebuffer
+PROGRAMS=		readbuffer writebuffer with-lock-ex
 SUIDSBINPROGRAMS=	really
 DAEMONS=		trivsoundd
 MAN1PAGES=		readbuffer.1 writebuffer.1
diff --git a/debian/changelog b/debian/changelog
index e25d467..6f0fcca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+chiark-utils (3.99.1.0.7iwj) unstable; urgency=low
+
+  * add with-lock-ex to new chiark-utils-bin package
+
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Sun,  6 Jul 2003 21:07:35 +0100
+
 chiark-utils (3.99.1.0.6iwj) unstable; urgency=low
 
   * do dpkg-shlibdeps on usr/sbin/really
diff --git a/debian/control b/debian/control
index dae4c6e..47013a8 100644
--- a/debian/control
+++ b/debian/control
@@ -51,6 +51,19 @@ Description: readbuffer/writebuffer: prevents tape drive seesawing, etc.
  and writing output to, which don't like constant stopping and
  starting, such as tape drives and audio playback devices.
 
+Package: chiark-utils-bin
+Architecture: any
+Depends: ${shlibs:Depends}
+Section: utils
+Priority: extra
+Description: chiark system administration utilities
+ This package contains a number of small administration scripts used
+ by chiark.greenend.org.uk and other systems belonging to the Sinister
+ Greenend Organisation.  Currently featuring only:
+ .
+ with-lock-ex: a simple tool for acquiring a lockfile before running
+ another program or script.
+
 Package: chiark-really
 Architecture: any
 Depends: ${shlibs:Depends}
diff --git a/debian/rules b/debian/rules
index 72d471a..13d0680 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ subdirs_build=	cprogs
 subdirs_nobuild=backup sync-accounts scripts
 package=	chiark-utils
 packages_indep=	chiark-backup chiark-scripts
-packages_arch=	chiark-rwbuffer chiark-really
+packages_arch=	chiark-rwbuffer chiark-really chiark-utils-bin
 packages=	$(packages_indep) $(packages_arch)
 
 cwd=	$(shell pwd)
@@ -37,6 +37,8 @@ binary-prep:
 			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
@@ -53,18 +55,22 @@ binary-prep:
 	#
 	install -d $t/chiark-rwbuffer/usr/bin
 	install -d $t/chiark-rwbuffer/usr/share/man/man1
-	cd $t/cprogs/usr/bin && \
+	cd $t/chiark-utils-bin/usr/bin && \
 		mv readbuffer writebuffer $t/chiark-rwbuffer/usr/bin/
-	cd $t/cprogs/usr/share/man/man1 && \
+	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-really/usr/sbin
 	install -d $t/chiark-really/usr/share/man/man8
-	cd $t/cprogs/usr/sbin && \
+	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/cprogs/usr/share/man/man8 && \
+	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*/*
 
@@ -73,6 +79,7 @@ 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 \
@@ -95,7 +102,9 @@ binary-arch:	checkroot build binary-prep
 	dpkg-shlibdeps -Tdebian/sv-chiark-rwbuffer \
 		$t/chiark-rwbuffer/usr/bin/*
 	dpkg-shlibdeps -Tdebian/sv-chiark-really \
-		$t/chiark-rwbuffer/usr/sbin/*
+		$t/chiark-really/usr/sbin/*
+	dpkg-shlibdeps -Tdebian/sv-chiark-utils-bin \
+		$t/chiark-utils-bin/usr/bin/*
 	set -e; for p in $(packages_arch); \
 		do debian/rules binary-one p=$$p; done