Correct binary package dependencies by referencing substvars in debian/control.

diff --git a/debian/changelog b/debian/changelog
index 0fe288b7232fe0576ba8f7f088a37e4af416b28f..b409efbe0cd1e49e91fe4459810a646d58aeffda 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+userv-utils (0.6.0~~iwj3) unstable; urgency=low
+
+  * Correct binary package dependencies by referencing substvars in
+    debian/control.
+
+ --
+
 userv-utils (0.6.0~~iwj2) unstable; urgency=low
 
   * Use dh(1).  WIP.

diff --git a/debian/control b/debian/control
index 8b6e3e54696b62723c849f86d6c39010d6fb905a..a92cb18a544a09c6fce58d2e90081973c86c8e12 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Standards-Version: 2.1.1.0
 
 Package: userv-ipif
 Architecture: any
-Depends: userv
+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
@@ -23,7 +23,7 @@ Description: VPN system (and user-mode network interface)
 
 Package: userv-dyndns
 Architecture: all
-Depends: userv, chiark-utils-bin
+Depends: userv, chiark-utils-bin, ${perl:Depends}, ${misc:Depends}
 Recommends: bind
 Description: dynamic DNS for shell account users
  userv-dyndns is a userv service which allows non-root users to
@@ -37,7 +37,7 @@ Description: dynamic DNS for shell account users
 
 Package: userv-cgi
 Architecture: any
-Depends: userv
+Depends: userv, ${shlibs:Depends}, ${misc:Depends}
 Recommends: httpd
 Description: user-provided CGI scripts invoked by userv
  This package contains ucgi, a userv service which allows CGI programs
@@ -56,7 +56,7 @@ Description: user-provided CGI scripts invoked by userv
 
 Package: userv-groupmanage
 Architecture: all
-Depends: userv
+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
@@ -67,7 +67,7 @@ Description: user-controlled group membership
 
 Package: userv-git-daemon
 Architecture: all
-Depends: userv, git-core
+Depends: userv, git-core, adduser, ${perl:Depends}, ${misc:Depends}
 Description: per-user git daemon service
  userv-git-daemon allows users to publish git repositories which will
  be published via the git protocol on 9418.  This is a bit like
@@ -82,6 +82,7 @@ Description: per-user git daemon service
 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