debian/: Move ipif into -utils

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

diff --git a/debian/control b/debian/control
index d25819d..a089e2c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Standards-Version: 3.7.0.0
 Build-Depends: debhelper (>= 8)
 
 Package: userv-utils
-Architecture: all
+Architecture: any
 Depends: userv
 Recommends: ${perl:Depends}, ${misc:Depends}
 Description: privsep utilities collection
@@ -14,21 +14,11 @@ Description: privsep utilities collection
  actions to be delegated.  In each case the service is disabled unless
  enabled by symlink /etc/userv/services.d/* -> ../services-available/*.
  .
+ ipif - allow non-root users to create network interfaces
  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}
-Recommends: ssh
-Description: VPN system (and user-mode network interface)
- userv-ipif is a userv service to allow non-root users to create
- network interfaces implemented in user space.
- .
- The default configuration does set up any users with permission to
- create network interfaces such as VPN endpoints.
-
 Package: userv-dyndns
 Architecture: all
 Depends: userv, chiark-utils-bin, ${perl:Depends}, ${misc:Depends}

diff --git a/debian/rules b/debian/rules
index 499179b..76e59ff 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -58,6 +58,14 @@ override_dh_auto_install:
        done
        -
        mv debian/userv-misc debian/userv-utils
+       -
+       set -e; cd debian/userv-ipif/usr/share/doc;     \
+               mv userv-ipif userv-utils;              \
+               cd userv-utils;                         \
+               mv service.c.txt ipif.txt
+       -
+       cp -al debian/userv-ipif/. 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