[SCM] Debian packaging for the 2.0 Apache Shibboleth SP branch, debian, updated. upstream/2.2.1+dfsg-140-g1524052

[Russ Allbery]

The following commit has been merged in the debian branch:
commit a715303c4670e28e677df553ef4ea33b67f0645c
Author: Russ Allbery <rra at debian.org>
Date:   Tue Nov 10 16:16:54 2009 -0800

    Revert local modification of shibsp/paths.h
    
    This file is generated during the build from paths.h.in and will be
    correct for our builds, so no need to modify this file in the package.
    Instead, just remove this file in the clean target so that the diff
    is not included in the package.

diff --git a/debian/rules b/debian/rules
index c3c846f..ff1d051 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,7 +75,7 @@ clean:
 	[ ! -f Makefile ] || $(MAKE) distclean
 	find . -name Makefile.in -print0 | xargs -0r rm
 	dh_clean aclocal.m4 config.h config.h.in config.status configure \
-	    config.guess config.sub libtool.m4 ltmain.sh \
+	    config.guess config.sub libtool.m4 ltmain.sh shibsp/paths.h \
 	    debian/libapache2-mod-shib2.shibd.init
 
 install: install-stamp
diff --git a/shibsp/paths.h b/shibsp/paths.h
index c319ac6..2f9ac99 100644
--- a/shibsp/paths.h
+++ b/shibsp/paths.h
@@ -24,7 +24,7 @@
 #define __shibsp_paths_h__
 
 /** Default schema catalogs. */
-#define SHIBSP_SCHEMAS "/usr/share/xml/xmltooling/catalog.xml:/usr/share/xml/opensaml/saml20-catalog.xml:/usr/share/xml/opensaml/saml11-catalog.xml:/usr/share/xml/shibboleth/catalog.xml"
+#define SHIBSP_SCHEMAS "/opt/shibboleth-sp/share/xml/xmltooling/catalog.xml:/opt/shibboleth-sp/share/xml/opensaml/saml20-catalog.xml:/opt/shibboleth-sp/share/xml/opensaml/saml11-catalog.xml:/opt/shibboleth-sp/share/xml/shibboleth/catalog.xml"
 
 /** Default name of SP configuration file. */
 #define SHIBSP_CONFIG "shibboleth2.xml"
@@ -33,21 +33,21 @@
 #define SHIBSP_LOGGING "console.logger"
 
 /** Default prefix for installation (used to resolve relative paths). */
-#define SHIBSP_PREFIX  "/usr"
+#define SHIBSP_PREFIX  "/opt/shibboleth-sp"
 
 /** Library directory for installation (used to resolve relative paths). */
-#define SHIBSP_LIBDIR  "/usr/lib"
+#define SHIBSP_LIBDIR  "/opt/shibboleth-sp/lib"
 
 /** Log directory for installation (used to resolve relative paths). */
-#define SHIBSP_LOGDIR  "/var/log/shibboleth"
+#define SHIBSP_LOGDIR  "/opt/shibboleth-sp/var/log"
 
 /** Configuration directory for installation (used to resolve relative paths). */
-#define SHIBSP_CFGDIR  "/etc/shibboleth"
+#define SHIBSP_CFGDIR  "/opt/shibboleth-sp/etc"
 
 /** Runtime state directory for installation (used to resolve relative paths). */
-#define SHIBSP_RUNDIR  "/var/run/shibboleth"
+#define SHIBSP_RUNDIR  "/opt/shibboleth-sp/var/run"
 
 /** XML directory for installation (used to resolve relative paths). */
-#define SHIBSP_XMLDIR  "/usr/share/xml/shibboleth"
+#define SHIBSP_XMLDIR  "/opt/shibboleth-sp/share/xml"
 
 #endif /* __shibsp_paths_h__ */

-- 
Debian packaging for the 2.0 Apache Shibboleth SP