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

diff --git a/cprogs/.cvsignore b/cprogs/.cvsignore
index 61779d678a2bbd0a93e0a8c6c9adeb2437603036..720cd81c216398d729b0a29e129cb1e97c11e38f 100644 (file)
--- a/cprogs/.cvsignore
+++ b/cprogs/.cvsignore
@@ -2,3 +2,4 @@ readbuffer
 writebuffer
 trivsoundd
 really
 writebuffer
 trivsoundd
 really

+with-lock-ex

diff --git a/cprogs/Makefile b/cprogs/Makefile
index ab1b6c923cc5df7d7a1741e442ba974f964dab11..fc4b4dc7ee18da1d11cf16c4e79989b2ef8eae5a 100644 (file)
--- a/cprogs/Makefile
+++ b/cprogs/Makefile
@@ -25,7 +25,7 @@ include ../settings.make
 
 RWBUFFER_SIZE_MB=16
 
 
 RWBUFFER_SIZE_MB=16
 

-PROGRAMS=              readbuffer writebuffer
+PROGRAMS=              readbuffer writebuffer with-lock-ex

 SUIDSBINPROGRAMS=      really
 DAEMONS=               trivsoundd
 MAN1PAGES=             readbuffer.1 writebuffer.1
 SUIDSBINPROGRAMS=      really
 DAEMONS=               trivsoundd
 MAN1PAGES=             readbuffer.1 writebuffer.1

diff --git a/debian/changelog b/debian/changelog
index e25d467eed85f0372d4ed8c8e6651810b3a60450..6f0fccaa68bc8a4d5c1e00077a07a9640092384c 100644 (file)
--- 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
 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 dae4c6e3658a78355c185f6a7a45c7da7096ed8d..47013a87ebd6cf7cd77a28db8c2a246d91b7940e 100644 (file)
--- 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.
 
  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}
 Package: chiark-really
 Architecture: any
 Depends: ${shlibs:Depends}

diff --git a/debian/rules b/debian/rules
index 72d471af9a452c83b2485e40a400351fd6f2ac35..13d0680e828b8d6b9d8378c5b1bf058cdfee7a7d 100755 (executable)
--- 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
 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)
 packages=      $(packages_indep) $(packages_arch)
 
 cwd=   $(shell pwd)


@@ -37,6 +37,8 @@ binary-prep:
                        mandir=$t/$$s/usr/share/man; \
        done
        #
                        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
        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
        #
        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/
                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
                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
                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/
                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*/*
 
        #
        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-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 \
 
 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 \
        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
 
        set -e; for p in $(packages_arch); \
                do debian/rules binary-one p=$$p; done