debian/: Working on new packaging arrangements

Rename userv-misc to userv-utils.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/.gitignore b/.gitignore
index 13c30c25f0e0387e84f51ba8f617d5705f3a002e..bc5340b6bf00c6243279b214d8517fee5e1c2413 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,12 +7,12 @@ debian/*.debhelper.log
 debian/tmp
 debian/files
 
+debian/userv-utils
 debian/userv-cgi
 debian/userv-dyndns
 debian/userv-git-daemon
 debian/userv-groupmanage
 debian/userv-ipif
-debian/userv-misc
 
 dist_tmp
 userv-utils-*.tar.gz

diff --git a/debian/changelog b/debian/changelog
index fe7458332a8f54336050d140b93000edef637a64..3bb0840fab813545cdab5e104dca4fccc306d983 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+userv-utils (0.6.0~~iwj4) unstable; urgency=medium
+
+  * wip package reorganisation
+
+ --
+
 userv-utils (0.6.0~~iwj3) unstable; urgency=low
 
   * Correct binary package dependencies by referencing substvars in
@@ -20,7 +26,7 @@ userv-utils (0.6.0~~iwj3) unstable; urgency=low
   * Make deprecated things not built by default by Makefile (and remove
     code in debian/rules for achieving this).
 
- --
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Fri, 14 Apr 2017 15:58:46 +0100
 
 userv-utils (0.6.0~~iwj2) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 1cfde2f9c5b3cc484b9e2c4c336922982849ced1..d25819de962c46963efb0211692e659c5f0fab75 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,19 @@ Maintainer: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Standards-Version: 3.7.0.0
 Build-Depends: debhelper (>= 8)
 
+Package: userv-utils
+Architecture: all
+Depends: userv
+Recommends: ${perl:Depends}, ${misc:Depends}
+Description: privsep utilities collection
+ Several small userv services, which allow certain system configuration
+ actions to be delegated.  In each case the service is disabled unless
+ enabled by symlink /etc/userv/services.d/* -> ../services-available/*.
+ .
+ mailq - allow users to view the mail queue
+ ndc-reload  - allow certain users to reload the nameserver
+ checkpasswd-* - allow users to run a UNIX password check
+
 Package: userv-ipif
 Architecture: any
 Depends: userv, ${shlibs:Depends}, ${misc:Depends}
@@ -73,16 +86,3 @@ Description: per-user git daemon service
  the line from /usr/share/doc/examples/userv-git-daemon.inetd into
  /etc/inetd.conf and (b) specifically list hostnames and target
  directories in /etc/userv/git-urlmap.
-
-Package: userv-misc
-Architecture: all
-Depends: userv
-Recommends: ${perl:Depends}, ${misc:Depends}
-Description: miscellaneous small userv scripts
- This package a few small userv services.  Since you must choose
- whether to install this package or not as one lump, the default
- configuration for each script does not give users any new abilities.
- .
- mailq - allow users to view the mail queue
- ndc-reload  - allow certain users to reload the nameserver
- checkpasswd-* - allow users to run a UNIX password check

diff --git a/debian/rules b/debian/rules
index a06ad571c542780d24565568d803948a0c60a4e6..499179be04ef47a88b008c9e8a9459bd65af2b40 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@
 subdirs_build= ipif www-cgi git-daemon
 subdirs_nobuild=dyndns groupmanage misc
 package=       userv-utils
-packages_indep=        userv-dyndns userv-groupmanage userv-misc userv-git-daemon
+packages_indep=        userv-dyndns userv-groupmanage userv-utils userv-git-daemon
 packages_arch= userv-ipif userv-cgi
 packages=      $(packages_indep) $(packages_arch)
 
@@ -57,6 +57,7 @@ override_dh_auto_install:
                ; \
        done
        -
+       mv debian/userv-misc debian/userv-utils
        mv debian/userv-www-cgi debian/userv-cgi
        mv debian/userv-groupmanage/usr/share/doc/groupmanage \
           debian/userv-groupmanage/usr/share/doc/userv-groupmanage
@@ -65,9 +66,12 @@ override_dh_auto_install:
                $d/userv-dyndns/etc/userv/dyndns-service-users.example \
                $d/userv-groupmanage/etc/groupmanage.conf.example
        rename 's/\.distrib$$//' $d/*/etc/userv/services.d/*.distrib
-       rename 's/$$/\.disabled/' $d/userv-misc/etc/userv/services.d/mailq
        -
-       mv $d/userv-misc/usr/bin/mailq $d/userv-misc/usr/bin/mailq.userv
+       mv $d/userv-utils/usr/bin/mailq $d/userv-utils/usr/bin/mailq.userv
+       -
+       set -e; cd $d/userv-utils/etc/userv;                    \
+               mkdir services-available;                       \
+               mv services.d/* services-available/
 
 override_dh_install: