[cpp-sp] 13/36: Add additional Multi-Arch control fields

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to annotated tag debian/2.5.1+dfsg-1
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=bd1314a738093ce85d846cc0775d345d1779bf4b

commit bd1314a738093ce85d846cc0775d345d1779bf4b
Author: Russ Allbery <rra at debian.org>
AuthorDate: Thu May 30 17:39:31 2013 -0700

    Add additional Multi-Arch control fields
    
    * Add Multi-Arch: same to libshibsp-dev and Multi-Arch: foreign to
      libshibsp-doc and shibboleth-sp2-schemas.
---
 debian/changelog | 16 +++++++++-------
 debian/control   |  3 +++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f916a2d..e94bc4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,13 +41,6 @@ shibboleth-sp2 (2.5.1+dfsg-1) UNRELEASED; urgency=low
       handled more smoothly.
     - SP initialization now fails if an external session cache is
       configured but cannot be opened.
-  * Add build dependency on libboost-dev.
-  * Use log4shib instead of log4cpp.
-  * Force build dependencies and package dependencies on xml-security-c
-    1.7 or later, xmltooling 1.5 or later, and opensaml2 2.5 or later to
-    ensure everything is consistent.
-  * Remove explicit build dependency on libtool.  This is now handled by
-    dh-autoreconf.
   * Remove the (undefined) warn_log destination from the default
     native.logger configuration file, restoring consistency with the
     Debian modification to log to syslog.  Since all native logs go to
@@ -55,6 +48,15 @@ shibboleth-sp2 (2.5.1+dfsg-1) UNRELEASED; urgency=low
     on threshold.  The previous version of the file referenced a
     commented-out warn_log destination, which caused errors to be spammed
     to syslog.
+  * Add build dependency on libboost-dev.
+  * Use log4shib instead of log4cpp.
+  * Force build dependencies and package dependencies on xml-security-c
+    1.7 or later, xmltooling 1.5 or later, and opensaml2 2.5 or later to
+    ensure everything is consistent.
+  * Remove explicit build dependency on libtool.  This is now handled by
+    dh-autoreconf.
+  * Add Multi-Arch: same to libshibsp-dev and Multi-Arch: foreign to
+    libshibsp-doc and shibboleth-sp2-schemas.
   * Install the upstream doc/RELEASE.txt file as the upstream changelog.
     It's not exactly a changelog, but it has pointers to the upstream web
     documentation of changes, which is probably what people are looking for.
diff --git a/debian/control b/debian/control
index fb6222a..c4c909c 100644
--- a/debian/control
+++ b/debian/control
@@ -53,6 +53,7 @@ Description: Federated web single sign-on system (runtime)
 Package: libshibsp-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends}, libshibsp5 (= ${binary:Version}),
  libsaml2-dev (>= 2.5), libxerces-c-dev, libxmltooling-dev (>= 1.5)
 Suggests: libshib2-doc (= ${source:Version})
@@ -70,6 +71,7 @@ Description: Federated web single sign-on system (development)
 Package: libshibsp-doc
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}, libjs-jquery
 Description: Federated web single sign-on system (API docs)
  The Shibboleth System is a standards based software package for web
@@ -84,6 +86,7 @@ Description: Federated web single sign-on system (API docs)
 Package: shibboleth-sp2-schemas
 Section: text
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Conflicts: libapache2-mod-shib
 Description: Federated web single sign-on system (schemas)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.