Add ${misc:Depends} and ${shlibs:Depends} to dependencies

* Add ${shlibs:Depends} to the libshibsp-dev package dependencies.
* Add ${misc:Depends} to all package dependencies.

diff --git a/debian/changelog b/debian/changelog
index 9fc2d8c..1aef91f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ shibboleth-sp2 (2.3.1+dfsg-1) UNRELEASED; urgency=low
   * Apply upstream fix for shibd removing the PID file when called with
     the -F option.  This prevents the check of certificate permissions in
     the init script from removing the PID file of a running shibd.
+  * Add ${shlibs:Depends} to the libshibsp-dev package dependencies.
+  * Add ${misc:Depends} to all package dependencies.
 
  -- Russ Allbery <rra@debian.org>  Thu, 17 Dec 2009 16:51:57 -0800
 

diff --git a/debian/control b/debian/control
index 8c2d0ca..9fae6c3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-shibboleth/shibboleth-sp2.git
 Package: libapache2-mod-shib2
 Section: httpd
 Architecture: any
-Depends: adduser, ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
 Recommends: apache2, openssl
 Conflicts: libapache2-mod-shib
 Description: Federated web single sign-on system (Apache module)
@@ -34,7 +34,7 @@ Description: Federated web single sign-on system (Apache module)
 Package: libshibsp4
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, opensaml2-schemas (>= 2.3),
+Depends: ${shlibs:Depends}, ${misc:Depends}, opensaml2-schemas (>= 2.3),
  shibboleth-sp2-schemas (>= 2.3), xmltooling-schemas (>= 1.3)
 Description: Federated web single sign-on system (runtime)
  The Shibboleth System is a standards based software package for web
@@ -49,7 +49,8 @@ Description: Federated web single sign-on system (runtime)
 Package: libshibsp-dev
 Section: libdevel
 Architecture: any
-Depends: libshibsp4 (= ${binary:Version}), libsaml2-dev (>= 2.3),
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libshibsp4 (= ${binary:Version}), libsaml2-dev (>= 2.3),
  libxerces-c-dev, libxmltooling-dev (>= 1.3)
 Suggests: libshib2-doc (= ${source:Version})
 Description: Federated web single sign-on system (development)
@@ -66,6 +67,7 @@ Description: Federated web single sign-on system (development)
 Package: libshibsp-doc
 Section: doc
 Architecture: all
+Depends: ${misc:Depends}
 Description: Federated web single sign-on system (API docs)
  The Shibboleth System is a standards based software package for web
  single sign-on across or within organizational boundaries.  It supports
@@ -79,6 +81,7 @@ Description: Federated web single sign-on system (API docs)
 Package: shibboleth-sp2-schemas
 Section: text
 Architecture: all
+Depends: ${misc:Depends}
 Conflicts: libapache2-mod-shib
 Description: Federated web single sign-on system (schemas)
  The Shibboleth System is a standards based software package for web