debian/: groupmanage: Move into userv-utils

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

diff --git a/debian/control b/debian/control
index 84378cf17df686bfea3f87f687b518b66d1bf937..0e36df14c7bf40e4c065285a46888c9dd66f6c61 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Description: privsep utilities collection
  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
+ groupmanage - allow users to create and manage a few groups each
 
 Package: userv-dyndns
 Architecture: all
@@ -34,17 +35,6 @@ Description: dynamic DNS for shell account users
  The default configuration creates the infrastructure (including a
  service user) but does not allow any users to modify the DNS.
 
-Package: userv-groupmanage
-Architecture: all
-Depends: userv, ${perl:Depends}, ${misc:Depends}
-Description: user-controlled group membership
- groupmanage is a userv service which allows individual shell users to
- create UN*X groups, and/or to change the membership of existing
- groups of which they are recorded as the manager.
- .
- The default configuration allows users to create and manage a few
- groups, but is reasonably conservative.
-
 Package: userv-git-daemon
 Architecture: all
 Depends: userv, git-core, adduser, ${perl:Depends}, ${misc:Depends}

diff --git a/debian/rules b/debian/rules
index b8b47aa6e777af52ffb37a967d8305d29f899176..c3a20ecb2e086dcce11a4470266be971d94f0109 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -69,7 +69,7 @@ override_dh_auto_install:
        set -e; cd debian/userv-groupmanage/usr/share/doc;      \
                mv groupmanage userv-groupmanage
        -
-       set -e; for p in userv-ipif userv-ucgi; do              \
+       set -e; for p in userv-ipif userv-ucgi userv-groupmanage; do    \
                (cd debian/$$p/usr/share/doc;                   \
                 mv $$p userv-utils);                           \
                cp -al debian/$$p/. debian/userv-utils/.;       \