Makefile, debian/{control,inst}: Sort the various lists of things.

They're becoming somewhat unwieldy.  This will hopefully reduce the
number of spurious merge conflicts because things will fit into their
natural places.  Well, except for things which are added concurrently to
this change, of course.

diff --git a/Makefile.am b/Makefile.am
index 2521b3d..36153b0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,32 +40,40 @@ bin_PROGRAMS                += space
 space_SOURCES           = space.c
 dist_man_MANS          += space.1
 
-## not
-bin_PROGRAMS           += not
-not_SOURCES             = not.c
-dist_man_MANS          += not.1
-
-## if-mtu
-bin_PROGRAMS           += if-mtu
-if_mtu_SOURCES          = if-mtu.c
-dist_man_MANS          += if-mtu.1
+## cdb tools
+if HAVE_LIBCDB
+bin_PROGRAMS           += cdb-probe cdb-check-domain
+cdb_probe_SOURCES       = cdb-probe.c
+cdb_probe_LDADD                 = -lcdb
+cdb_check_domain_SOURCES = cdb-check-domain.c
+cdb_check_domain_LDADD  = -lcdb
+dist_man_MANS          += cdb-probe.1 cdb-check-domain.1
+endif
 
 ## getpass
 bin_PROGRAMS           += getpass
 getpass_SOURCES                 = getpass.c
 dist_man_MANS          += getpass.1
 
-## xtitle
-bin_PROGRAMS           += xtitle
-xtitle_SOURCES          = xtitle.c
-dist_man_MANS          += xtitle.1
+## gorp
+if HAVE_CATACOMB
+bin_PROGRAMS           += gorp
+gorp_SOURCES            = gorp.c
+gorp_LDADD              = $(catacomb_LIBS)
+dist_man_MANS          += gorp.1
+endif
 
-## pause
+## if-mtu
+bin_PROGRAMS           += if-mtu
+if_mtu_SOURCES          = if-mtu.c
+dist_man_MANS          += if-mtu.1
+
+## locking
 if HAVE_MLIB
-bin_PROGRAMS           += pause
-pause_SOURCES           = pause.c
-pause_LDADD             = $(mLib_LIBS) $(MATH_LIBS)
-dist_man_MANS          += pause.1
+bin_PROGRAMS           += locking
+locking_SOURCES                 = locking.c
+locking_LDADD           = $(mLib_LIBS)
+dist_man_MANS          += locking.1
 endif
 
 ## mtimeout
@@ -76,20 +84,17 @@ mtimeout_LDADD               = $(mLib_LIBS) $(MATH_LIBS)
 dist_man_MANS          += mtimeout.1
 endif
 
-## stamp
-if HAVE_MLIB
-bin_PROGRAMS           += stamp
-stamp_SOURCES           = stamp.c
-stamp_LDADD             = $(mLib_LIBS)
-dist_man_MANS          += stamp.1
-endif
+## not
+bin_PROGRAMS           += not
+not_SOURCES             = not.c
+dist_man_MANS          += not.1
 
-## locking
+## pause
 if HAVE_MLIB
-bin_PROGRAMS           += locking
-locking_SOURCES                 = locking.c
-locking_LDADD           = $(mLib_LIBS)
-dist_man_MANS          += locking.1
+bin_PROGRAMS           += pause
+pause_SOURCES           = pause.c
+pause_LDADD             = $(mLib_LIBS) $(MATH_LIBS)
+dist_man_MANS          += pause.1
 endif
 
 ## prlimit
@@ -102,14 +107,6 @@ dist_man_MANS              += prlimit.1
 endif
 endif
 
-## gorp
-if HAVE_CATACOMB
-bin_PROGRAMS           += gorp
-gorp_SOURCES            = gorp.c
-gorp_LDADD              = $(catacomb_LIBS)
-dist_man_MANS          += gorp.1
-endif
-
 ## sema
 if HAVE_MLIB
 bin_PROGRAMS           += sema
@@ -121,14 +118,12 @@ sema_LINK          = $(LINK) # don't need C++ libraries here
 dist_man_MANS          += sema.1
 endif
 
-## cdb tools
-if HAVE_LIBCDB
-bin_PROGRAMS           += cdb-probe cdb-check-domain
-cdb_probe_SOURCES       = cdb-probe.c
-cdb_probe_LDADD                 = -lcdb
-cdb_check_domain_SOURCES = cdb-check-domain.c
-cdb_check_domain_LDADD  = -lcdb
-dist_man_MANS          += cdb-probe.1 cdb-check-domain.1
+## stamp
+if HAVE_MLIB
+bin_PROGRAMS           += stamp
+stamp_SOURCES           = stamp.c
+stamp_LDADD             = $(mLib_LIBS)
+dist_man_MANS          += stamp.1
 endif
 
 ## x86 model identification
@@ -141,6 +136,11 @@ dist_man_MANS              += x86-model.1
 endif
 endif
 
+## xtitle
+bin_PROGRAMS           += xtitle
+xtitle_SOURCES          = xtitle.c
+dist_man_MANS          += xtitle.1
+
 ###--------------------------------------------------------------------------
 ### Tools in scripts.
 
@@ -166,18 +166,15 @@ SUBSTITUTIONS = \
 EXTRA_DIST             += config/confsubst
 
 ## Shell scripts.
-dist_bin_SCRIPTS       += check-sender
-dist_man_MANS          += check-sender.1
-
 dist_bin_SCRIPTS       += buf
 dist_man_MANS          += buf.1
 
+dist_bin_SCRIPTS       += check-sender
+dist_man_MANS          += check-sender.1
+
 dist_bin_SCRIPTS       += create
 dist_man_MANS          += create.1
 
-dist_bin_SCRIPTS       += z
-dist_man_MANS          += z.1
-
 bin_SCRIPTS            += hush
 man_MANS               += hush.1
 CLEANFILES             += hush hush.1
@@ -191,11 +188,14 @@ hush.1: hush.1.in Makefile
        $(SUBST) $(srcdir)/hush.1.in >$@.new $(SUBSTITUTIONS) && \
                mv $@.new $@
 
+dist_bin_SCRIPTS       += sshsvc-mkauthkeys
+dist_man_MANS          += sshsvc-mkauthkeys.1
+
 dist_bin_SCRIPTS       += with-umask
 dist_man_MANS          += with-umask.1
 
-dist_bin_SCRIPTS       += sshsvc-mkauthkeys
-dist_man_MANS          += sshsvc-mkauthkeys.1
+dist_bin_SCRIPTS       += z
+dist_man_MANS          += z.1
 
 ## bash scripts.
 if HAVE_BASH

diff --git a/debian/control b/debian/control
index 428958e..d9d9a22 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -14,41 +14,38 @@ Section: utils
 Replaces: nsict-utils (<< 1.4.0~)
 Breaks: nsict-utils (<< 1.4.0~)
 Depends:
-       mdwopt-perl,
+       buf,
+       create,
        distorted-cdb,
-       locking,
        distorted-mail,
-       if-mtu,
-       shadowfix,
-       zz,
+       getpass,
        gorp,
+       hush,
+       if-mtu,
+       inplace,
+       locking,
+       mdwopt-perl,
        mtimeout,
-       splitconf,
-       xtitle,
        pause,
-       buf,
-       create,
-       inplace,
-       stamp,
+       shadowfix,
        space,
-       getpass,
-       hush,
+       splitconf,
+       sshsvc-mkauthkeys,
+       stamp,
        with-umask,
-       sshsvc-mkauthkeys
+       xtitle,
+       zz
 Description: Dummy package for convenience.
 
-Package: nsict-utils
+Package: buf
 Architecture: all
-Section: oldlibs
-Depends: distorted-utils
-Description: Dummy package for transition.
- This is a transitional dummy package.  It can safely be removed.
+Section: utils
+Description: Captures stdin in a temporary file and runs a command.
 
-Package: mdwopt-perl
+Package: create
 Architecture: all
-Section: perl
-Depends: perl5
-Description: Options parser library for perl.
+Section: utils
+Description: Simple script encapsulating atomic file update.
 
 Package: distorted-cdb
 Architecture: any
@@ -58,43 +55,32 @@ Breaks: nsict-cdb (<< 1.4.0~)
 Depends: ${shlibs:Depends}, python (>= 2.4), python-cdb
 Description: Simple utilities for messing with CDB files.
 
-Package: nsict-cdb
+Package: distorted-mail
 Architecture: all
-Section: oldlibs
-Depends: distorted-cdb
-Description: Dummy package for transition.
- This is a transitional dummy package.  It can safely be removed.
+Section: mail
+Depends: ${shlibs:Depends}, qmail, distorted-cdb, perl5, libmime-perl
+Description: Some simple scripts for mail handling.
 
-Package: mtimeout
+Package: getpass
 Architecture: any
-Section: utils
 Depends: ${shlibs:Depends}
-Description: Run a program for at most a given amount of time.
-
-Package: prlimit
-Architecture: linux-any
 Section: utils
-Depends: ${shlibs:Depends}
-Description: Run a program for at most a given amount of time.
+Description: Read a password without echoing; write it to stdout.
 
-Package: locking
+Package: gorp
 Architecture: any
-Section: utils
 Depends: ${shlibs:Depends}
-Description: Run a program while holding a file lock.
-
-Package: distorted-mail
-Architecture: all
-Section: mail
-Depends: ${shlibs:Depends}, qmail, distorted-cdb, perl5, libmime-perl
-Description: Some simple scripts for mail handling.
+Section: utils
+Description: Print a random base64 string.
 
-Package: nsict-mail
+Package: hush
 Architecture: all
-Section: oldlibs
-Depends: distorted-mail
-Description: Dummy package for transition.
- This is a transitional dummy package.  It can safely be removed.
+Section: utils
+Description: Run a command, hiding its output in a logfile unless it fails
+ The hush program is useful for running noisy programs from cron or similar,
+ where you get spammed with uninteresting success reports.  hush runs a
+ command, logging its output, but, unless the command actually fails, it
+ produces no output of its own.
 
 Package: if-mtu
 Architecture: any
@@ -102,35 +88,28 @@ Section: utils
 Depends: ${shlibs:Depends}
 Description: Report the MTU of a network interface.
 
-Package: shadowfix
-Architecture: all
-Section: utils
-Depends: perl5, mdwopt-perl
-Description: Check and fix shadow password and group files.
-
-Package: zz
+Package: inplace
 Architecture: all
 Section: utils
-Description: Run a program, automatically decompressing its argument files.
+Description: Update files in place safely.
 
-Package: xtitle
+Package: locking
 Architecture: any
-Depends: ${shlibs:Depends}
-Recommends: x-terminal-emulator
 Section: utils
-Description: Simple program for messing with xterm (or compatible) title bars.
+Depends: ${shlibs:Depends}
+Description: Run a program while holding a file lock.
 
-Package: splitconf
+Package: mdwopt-perl
 Architecture: all
-Depends: tclsh
-Section: utils
-Description: Gather little config files into one big one.
+Section: perl
+Depends: perl5
+Description: Options parser library for perl.
 
-Package: gorp
+Package: mtimeout
 Architecture: any
-Depends: ${shlibs:Depends}
 Section: utils
-Description: Print a random base64 string.
+Depends: ${shlibs:Depends}
+Description: Run a program for at most a given amount of time.
 
 Package: pause
 Architecture: any
@@ -138,37 +117,27 @@ Depends: ${shlibs:Depends}
 Section: utils
 Description: Wait for a given time, or until a key is pressed.
 
-Package: buf
-Architecture: all
-Section: utils
-Description: Captures stdin in a temporary file and runs a command.
-
-Package: with-umask
-Architecture: all
-Section: utils
-Description: Runs a command with a given umask.
-
-Package: create
-Architecture: all
-Section: utils
-Description: Simple script encapsulating atomic file update.
-
-Package: inplace
-Architecture: all
+Package: prlimit
+Architecture: linux-any
 Section: utils
-Description: Update files in place safely.
+Depends: ${shlibs:Depends}
+Description: Run a program for at most a given amount of time.
 
-Package: stamp
+Package: sema
 Architecture: any
 Depends: ${shlibs:Depends}
 Section: utils
-Description: Like cat, but prefixing each line with a datestamp.
+Description: Perform simple operations on SysV semaphores.
+ The sema program performs simple operations on (System V-style) semaphores.
+ It's not intended to be a utility for general-purpose hacking on existing
+ semaphores, but rather a tool for doing synchronization between shell
+ scripts or other simple programs.
 
-Package: getpass
-Architecture: any
-Depends: ${shlibs:Depends}
+Package: shadowfix
+Architecture: all
 Section: utils
-Description: Read a password without echoing; write it to stdout.
+Depends: perl5, mdwopt-perl
+Description: Check and fix shadow password and group files.
 
 Package: space
 Architecture: any
@@ -180,15 +149,31 @@ Description: Identify and fix problematic whitespace in text files.
  It can safely update files in place, and could therefore be used as part
  of a commit hook.
 
-Package: sema
+Package: splitconf
+Architecture: all
+Depends: tclsh
+Section: utils
+Description: Gather little config files into one big one.
+
+Package: sshsvc-mkauthkeys
+Architecture: all
+Section: utils
+Description: Construct .ssh/authorized_keys files for SSH services.
+ SSH is a fine way to provide services to external users.  It conveniently
+ takes care of details like authenticating users and encrypting
+ communications.  Unfortunately, managing the key files is rather painful.
+ This simple script does a lot of the heavy lifting.
+
+Package: stamp
 Architecture: any
 Depends: ${shlibs:Depends}
 Section: utils
-Description: Perform simple operations on SysV semaphores.
- The sema program performs simple operations on (System V-style) semaphores.
- It's not intended to be a utility for general-purpose hacking on existing
- semaphores, but rather a tool for doing synchronization between shell
- scripts or other simple programs.
+Description: Like cat, but prefixing each line with a datestamp.
+
+Package: with-umask
+Architecture: all
+Section: utils
+Description: Runs a command with a given umask.
 
 Package: x86-model
 Architecture: any-i386 any-amd64
@@ -197,20 +182,35 @@ Section: utils
 Description: Shows basic model information about x86 processors.
  The cpuid program is probably better for most people.
 
-Package: hush
-Architecture: all
+Package: xtitle
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: x-terminal-emulator
 Section: utils
-Description: Run a command, hiding its output in a logfile unless it fails
- The hush program is useful for running noisy programs from cron or similar,
- where you get spammed with uninteresting success reports.  hush runs a
- command, logging its output, but, unless the command actually fails, it
- produces no output of its own.
+Description: Simple program for messing with xterm (or compatible) title bars.
 
-Package: sshsvc-mkauthkeys
+Package: zz
 Architecture: all
 Section: utils
-Description: Construct .ssh/authorized_keys files for SSH services.
- SSH is a fine way to provide services to external users.  It conveniently
- takes care of details like authenticating users and encrypting
- communications.  Unfortunately, managing the key files is rather painful.
- This simple script does a lot of the heavy lifting.
+Description: Run a program, automatically decompressing its argument files.
+
+Package: nsict-cdb
+Architecture: all
+Section: oldlibs
+Depends: distorted-cdb
+Description: Dummy package for transition.
+ This is a transitional dummy package.  It can safely be removed.
+
+Package: nsict-mail
+Architecture: all
+Section: oldlibs
+Depends: distorted-mail
+Description: Dummy package for transition.
+ This is a transitional dummy package.  It can safely be removed.
+
+Package: nsict-utils
+Architecture: all
+Section: oldlibs
+Depends: distorted-utils
+Description: Dummy package for transition.
+ This is a transitional dummy package.  It can safely be removed.

diff --git a/debian/inst b/debian/inst
index 0169cd9..e888314 100644 (file)
--- a/debian/inst
+++ b/debian/inst
@@ -1,14 +1,13 @@
-MdwOpt.pm mdwopt-perl /usr/share/perl5
 buf buf /usr/bin
 buf.1 buf /usr/share/man/man1
 cdb-assign distorted-cdb /usr/bin
 cdb-assign.1 distorted-cdb /usr/share/man/man1
-cdb-map distorted-cdb /usr/bin
-cdb-map.1 distorted-cdb /usr/share/man/man1
 cdb-check-domain distorted-cdb /usr/bin
 cdb-check-domain.1 distorted-cdb /usr/share/man/man1
 cdb-list distorted-cdb /usr/bin
 cdb-list.1 distorted-cdb /usr/share/man/man1
+cdb-map distorted-cdb /usr/bin
+cdb-map.1 distorted-cdb /usr/share/man/man1
 cdb-probe distorted-cdb /usr/bin
 cdb-probe.1 distorted-cdb /usr/share/man/man1
 check-sender distorted-mail /usr/bin
@@ -19,41 +18,42 @@ getpass getpass /usr/bin
 getpass.1 getpass /usr/share/man/man1
 gorp gorp /usr/bin
 gorp.1 gorp /usr/share/man/man1
+hush hush /usr/bin
+hush.1 hush /usr/share/man/man1
 if-mtu if-mtu /usr/bin
 if-mtu.1 if-mtu /usr/share/man/man1
 inplace inplace /usr/bin
 inplace.1 inplace /usr/share/man/man1
-mtimeout mtimeout /usr/bin
-mtimeout.1 mtimeout /usr/share/man/man1
 locking locking /usr/bin
 locking.1 locking /usr/share/man/man1
+MdwOpt.pm mdwopt-perl /usr/share/perl5
+mtimeout mtimeout /usr/bin
+mtimeout.1 mtimeout /usr/share/man/man1
 not distorted-mail /usr/bin
 not.1 distorted-mail /usr/share/man/man1
 pause pause /usr/bin
 pause.1 pause /usr/share/man/man1
 prlimit prlimit /usr/bin
 prlimit.1 prlimit /usr/share/man/man1
+sema sema /usr/bin
+sema.1 sema /usr/share/man/man1
 shadowfix shadowfix /usr/sbin
 shadowfix.8 shadowfix /usr/share/man/man8
 space space /usr/bin
 space.1 space /usr/share/man/man1
 splitconf splitconf /usr/bin
 splitconf.1 splitconf /usr/share/man/man1
+sshsvc-mkauthkeys sshsvc-mkauthkeys /usr/bin
+sshsvc-mkauthkeys.1 sshsvc-mkauthkeys /usr/share/man/man1
 stamp stamp /usr/bin
 stamp.1 stamp /usr/share/man/man1
 unfwd distorted-mail /usr/bin
 unfwd.1 distorted-mail /usr/share/man/man1
+with-umask with-umask /usr/bin
+with-umask.1 with-umask /usr/share/man/man1
+x86-model x86-model /usr/bin
+x86-model.1 x86-model /usr/share/man/man1
 xtitle xtitle /usr/bin
 xtitle.1 xtitle /usr/share/man/man1
 z zz /usr/bin
 z.1 zz /usr/share/man/man1
-x86-model x86-model /usr/bin
-x86-model.1 x86-model /usr/share/man/man1
-hush hush /usr/bin
-hush.1 hush /usr/share/man/man1
-with-umask with-umask /usr/bin
-with-umask.1 with-umask /usr/share/man/man1
-sshsvc-mkauthkeys sshsvc-mkauthkeys /usr/bin
-sshsvc-mkauthkeys.1 sshsvc-mkauthkeys /usr/share/man/man1
-sema sema /usr/bin
-sema.1 sema /usr/share/man/man1