Move the Shibboleth SP schemas into a separate package

It looks like the library itself wants to have the schemas available, so
to be fully correct, break them into a separate package that the library
can depend on rather than putting them in with the Apache module.  Since
the Apache module is currently the only user of the library, this won't
make a difference in practice, but I think it more accurately reflects
the dependency structure.

diff --git a/debian/control b/debian/control
index 9e69a2e..09723b4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,8 @@ Description: Federated web single sign-on system (Apache module)
 Package: libshibsp1
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, opensaml2-schemas, xmltooling-schemas
+Depends: ${shlibs:Depends}, opensaml2-schemas, shibboleth-sp2-schemas,
+ xmltooling-schemas
 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
@@ -73,3 +74,17 @@ Description: Federated web single sign-on system (API docs)
  establish their identities with their local authentication systems.
  .
  This package contains the Shibboleth SP library API documentation.
+
+Package: shibboleth-sp2-schemas
+Section: text
+Architecture: all
+Conflicts: libapache2-mod-shib
+Description: Federated web single sign-on system (schemas)
+ The Shibboleth System is a standards based software package for web
+ single sign-on across or within organizational boundaries.  It supports
+ authorization and attribute exchange using the OASIS SAML 2.0 protocol.
+ Shibboleth allows sites to make informed authorization decisions for
+ individual access of protected online resources while allowing users to
+ establish their identities with their local authentication systems.
+ .
+ This package contains the additional schemas used by the Shibboleth SP.

diff --git a/debian/libapache2-mod-shib2.install b/debian/libapache2-mod-shib2.install
index b25d8d7..4e943b8 100644 (file)
--- a/debian/libapache2-mod-shib2.install
+++ b/debian/libapache2-mod-shib2.install
@@ -1,6 +1,5 @@
 debian/tmp/usr/bin
 debian/tmp/usr/sbin
-debian/tmp/usr/share/xml/shibboleth
 debian/tmp/etc/shibboleth
 debian/tmp/usr/lib/shibboleth
 debian/tmp/var/run/shibboleth

diff --git a/debian/shibboleth-sp2-schemas.install b/debian/shibboleth-sp2-schemas.install
new file mode 100644 (file)
index 0000000..ef73d02
--- /dev/null
+++ b/debian/shibboleth-sp2-schemas.install
@@ -0,0 +1 @@
+debian/tmp/usr/share/xml/shibboleth