Add section and priority fields, and manpages for backup scripts

diff --git a/debian/control b/debian/control
index 47013a87ebd6cf7cd77a28db8c2a246d91b7940e..91f27d308ef0889d428bb614e9fbff4a8d3d1f87 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,10 +6,10 @@ Uploaders: matthew@debian.org
 Standards-Version: 3.2.1.0
 
 Package: chiark-backup
-Architecture: all
-Depends: chiark-rwbuffer
 Section: utils
 Priority: extra
+Architecture: all
+Depends: chiark-rwbuffer
 Description: backup system for small systems and networks
  These are the backup scripts used by chiark.greenend.org.uk and other
  systems belonging to the Sinister Greenend Organisation.  Features:
@@ -19,10 +19,10 @@ Description: backup system for small systems and networks
  If you have a larger site you may wish to look at Amanda.
 
 Package: chiark-scripts
-Conflicts: chiark-named-conf, sync-accounts
-Replaces: chiark-named-conf, sync-accounts
 Section: admin
 Priority: extra
+Conflicts: chiark-named-conf, sync-accounts
+Replaces: chiark-named-conf, sync-accounts
 Architecture: all
 Description: chiark system administration scripts
  This package contains a number of small administration scripts used
@@ -42,10 +42,10 @@ Description: chiark system administration scripts
  databases such as NIS.
 
 Package: chiark-rwbuffer
-Architecture: any
-Depends: ${shlibs:Depends}
 Section: utils
 Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}
 Description: readbuffer/writebuffer: prevents tape drive seesawing, etc.
  readbuffer and writebuffer: programs for reading input from devices,
  and writing output to, which don't like constant stopping and
@@ -65,10 +65,10 @@ Description: chiark system administration utilities
  another program or script.
 
 Package: chiark-really
-Architecture: any
-Depends: ${shlibs:Depends}
 Section: admin
 Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}
 Description: really - a tool for gaining privilege (simple, realistic sudo)
  really is a program that allows certain users to become whatever user
  they like on request.  It is a bit like sudo in that respect.

diff --git a/debian/rules b/debian/rules
index 13d0680e828b8d6b9d8378c5b1bf058cdfee7a7d..1733dcd8a95a92017d8938f044b088b1ca234610 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -60,11 +60,18 @@ binary-prep:
        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 && \
+               for m in *.1; do \
+                       mv "$$m" backup-"$$m"; \
+               done
+       #
        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 $t/chiark-really/usr/sbin/really
+       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 \
@@ -87,7 +94,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