[cpp-sp] 03/37: Run wrap-and-sort -ast on the package

[Scott Cantor]

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

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

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

commit 06926cfb945c982ef9809d85a3685b70a6238829
Author: Ferenc Wágner <wferi at niif.hu>
AuthorDate: Mon Jan 18 11:35:47 2016 +0100

    Run wrap-and-sort -ast on the package
---
 debian/control                      | 108 +++++++++++++++++++++++++-----------
 debian/shibboleth-sp2-utils.install |   2 +-
 2 files changed, 78 insertions(+), 32 deletions(-)

diff --git a/debian/control b/debian/control
index 4f604f3..7625ed2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,31 @@ Source: shibboleth-sp2
 Section: web
 Priority: extra
 Maintainer: Debian Shib Team <pkg-shibboleth-devel at lists.alioth.debian.org>
-Uploaders: Russ Allbery <rra at debian.org>, Ferenc Wagner <wferi at niif.hu>,
- Faidon Liambotis <paravoid at debian.org>
-Build-Depends: debhelper (>= 9), apache2-dev (>> 2.4.4), dh-apache2,
- dh-autoreconf, doxygen, graphviz, libboost-dev, libfcgi-dev, libkrb5-dev,
- liblog4shib-dev, libmemcached-dev (>= 1.0), libsaml2-dev (>= 2.5),
- libssl-dev, libxerces-c-dev, libxml-security-c-dev (>= 1.7),
- libxmltooling-dev (>= 1.5), opensaml2-schemas, pkg-config, unixodbc-dev,
- xmltooling-schemas
+Uploaders:
+ Russ Allbery <rra at debian.org>,
+ Ferenc Wagner <wferi at niif.hu>,
+ Faidon Liambotis <paravoid at debian.org>,
+Build-Depends:
+ apache2-dev (>> 2.4.4),
+ debhelper (>= 9),
+ dh-apache2,
+ dh-autoreconf,
+ doxygen,
+ graphviz,
+ libboost-dev,
+ libfcgi-dev,
+ libkrb5-dev,
+ liblog4shib-dev,
+ libmemcached-dev (>= 1.0),
+ libsaml2-dev (>= 2.5),
+ libssl-dev,
+ libxerces-c-dev,
+ libxml-security-c-dev (>= 1.7),
+ libxmltooling-dev (>= 1.5),
+ opensaml2-schemas,
+ pkg-config,
+ unixodbc-dev,
+ xmltooling-schemas,
 Standards-Version: 3.9.5
 Homepage: http://shibboleth.net/
 Vcs-Git: git://anonscm.debian.org/pkg-shibboleth/shibboleth-sp2.git
@@ -18,8 +35,11 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-shibboleth/shibboleth-sp2.g
 Package: libapache2-mod-shib2
 Section: httpd
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- libshibsp-plugins (= ${binary:Version}), shibboleth-sp2-utils (>= 2.5)
+Depends:
+ libshibsp-plugins (= ${binary:Version}),
+ shibboleth-sp2-utils (>= 2.5),
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Federated web single sign-on system (Apache module)
  The Shibboleth System is a standards based software package for web
  single sign-on across or within organizational boundaries.  It supports
@@ -36,9 +56,14 @@ Package: libshibsp6
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, opensaml2-schemas (>= 2.5),
- shibboleth-sp2-common (>= 2.5), xmltooling-schemas (>= 1.5)
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ opensaml2-schemas (>= 2.5),
+ shibboleth-sp2-common (>= 2.5),
+ xmltooling-schemas (>= 1.5),
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Federated web single sign-on system (runtime)
  The Shibboleth System is a standards based software package for web
  single sign-on across or within organizational boundaries.  It supports
@@ -53,9 +78,13 @@ Package: libshibsp-plugins
 Section: libs
 Architecture: any
 Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: libapache2-mod-shib2 (<< 2.5.3+dfsg)
-Replaces: libapache2-mod-shib2 (<< 2.5.3+dfsg)
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Breaks:
+ libapache2-mod-shib2 (<< 2.5.3+dfsg),
+Replaces:
+ libapache2-mod-shib2 (<< 2.5.3+dfsg),
 Description: Federated web single sign-on system (plugins)
  The Shibboleth System is a standards based software package for web
  single sign-on across or within organizational boundaries.  It supports
@@ -70,9 +99,14 @@ Package: libshibsp-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, libshibsp6 (= ${binary:Version}),
- libsaml2-dev (>= 2.5), libxerces-c-dev, libxmltooling-dev (>= 1.5)
-Suggests: libshibsp-doc
+Depends:
+ libsaml2-dev (>= 2.5),
+ libshibsp6 (= ${binary:Version}),
+ libxerces-c-dev,
+ libxmltooling-dev (>= 1.5),
+ ${misc:Depends},
+Suggests:
+ libshibsp-doc,
 Description: Federated web single sign-on system (development)
  The Shibboleth System is a standards based software package for web
  single sign-on across or within organizational boundaries.  It supports
@@ -88,7 +122,8 @@ Package: libshibsp-doc
 Section: doc
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
+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
@@ -103,11 +138,14 @@ Package: shibboleth-sp2-common
 Section: libs
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
-Breaks: libapache2-mod-shib2 (<< 2.5.3+dfsg),
- shibboleth-sp2-schemas (<< 2.5.3+dfsg)
-Replaces: libapache2-mod-shib2 (<< 2.5.3+dfsg),
- shibboleth-sp2-schemas (<< 2.5.3+dfsg)
+Depends:
+ ${misc:Depends},
+Breaks:
+ libapache2-mod-shib2 (<< 2.5.3+dfsg),
+ shibboleth-sp2-schemas (<< 2.5.3+dfsg),
+Replaces:
+ libapache2-mod-shib2 (<< 2.5.3+dfsg),
+ shibboleth-sp2-schemas (<< 2.5.3+dfsg),
 Description: Federated web single sign-on system (common files)
  The Shibboleth System is a standards based software package for web
  single sign-on across or within organizational boundaries.  It supports
@@ -123,7 +161,9 @@ Package: shibboleth-sp2-schemas
 Section: oldlibs
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, shibboleth-sp2-common
+Depends:
+ shibboleth-sp2-common,
+ ${misc:Depends},
 Description: Federated web single sign-on system (transitional package)
  This is a transitional package to smooth upgrades from earlier Shibboleth
  versions.  The schemas are now provided by shibboleth-sp2-common.  This
@@ -139,11 +179,17 @@ Description: Federated web single sign-on system (transitional package)
 Package: shibboleth-sp2-utils
 Architecture: any
 Multi-Arch: foreign
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser,
- libshibsp-plugins (= ${binary:Version})
-Recommends: openssl
-Breaks: libapache2-mod-shib2 (<< 2.5.3+dfsg)
-Replaces: libapache2-mod-shib2 (<< 2.5.3+dfsg)
+Depends:
+ adduser,
+ libshibsp-plugins (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ openssl,
+Breaks:
+ libapache2-mod-shib2 (<< 2.5.3+dfsg),
+Replaces:
+ libapache2-mod-shib2 (<< 2.5.3+dfsg),
 Description: Federated web single sign-on system (daemon and utilities)
  The Shibboleth System is a standards based software package for web
  single sign-on across or within organizational boundaries.  It supports
diff --git a/debian/shibboleth-sp2-utils.install b/debian/shibboleth-sp2-utils.install
index af84257..04669b2 100644
--- a/debian/shibboleth-sp2-utils.install
+++ b/debian/shibboleth-sp2-utils.install
@@ -1,4 +1,4 @@
 usr/bin
-usr/sbin
 usr/lib/*/shibboleth/shibauthorizer
 usr/lib/*/shibboleth/shibresponder
+usr/sbin

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