[SCM] Debian packaging for the 2.0 Apache Shibboleth SP branch, master, updated. debian/2.4.3+dfsg-4-1-g558acf2

[Russ Allbery]

The following commit has been merged in the master branch:
commit 558acf26c5a7982776c651725a361786fb7f9da7
Author: Russ Allbery <rra at debian.org>
Date:   Thu Feb 2 00:18:44 2012 -0800

    Restore mistakenly deleted shibsp/paths.h
    
    This is modified during the build, but that doesn't mean we want to
    delete it off the master branch.  (This would have had no effect on
    the build, since deleted files are ignored when the diff is generated.)

diff --git a/shibsp/paths.h.in b/shibsp/paths.h
similarity index 75%
copy from shibsp/paths.h.in
copy to shibsp/paths.h
index d4ba1eb..d2d4557 100644
--- a/shibsp/paths.h.in
+++ b/shibsp/paths.h
@@ -28,7 +28,7 @@
 #define __shibsp_paths_h__
 
 /** Default schema catalogs. */
-#define SHIBSP_SCHEMAS "@-XMLTOOLINGXMLDIR-@/catalog.xml:@-OPENSAMLXMLDIR-@/saml20-catalog.xml:@-OPENSAMLXMLDIR-@/saml11-catalog.xml:@-PKGXMLDIR-@/catalog.xml"
+#define SHIBSP_SCHEMAS "/opt/shibboleth-svn/share/xml/xmltooling/catalog.xml:/opt/shibboleth-svn/share/xml/opensaml/saml20-catalog.xml:/opt/shibboleth-svn/share/xml/opensaml/saml11-catalog.xml:/opt/shibboleth-svn/share/xml/shibboleth/catalog.xml"
 
 /** Default name of SP configuration file. */
 #define SHIBSP_CONFIG "shibboleth2.xml"
@@ -37,21 +37,21 @@
 #define SHIBSP_LOGGING "console.logger"
 
 /** Default prefix for installation (used to resolve relative paths). */
-#define SHIBSP_PREFIX  "@-PREFIX-@"
+#define SHIBSP_PREFIX  "/opt/shibboleth-svn"
 
 /** Library directory for installation (used to resolve relative paths). */
-#define SHIBSP_LIBDIR  "@-LIBDIR-@"
+#define SHIBSP_LIBDIR  "/opt/shibboleth-svn/lib"
 
 /** Log directory for installation (used to resolve relative paths). */
-#define SHIBSP_LOGDIR  "@-LOGDIR-@"
+#define SHIBSP_LOGDIR  "/opt/shibboleth-svn/var/log"
 
 /** Configuration directory for installation (used to resolve relative paths). */
-#define SHIBSP_CFGDIR  "@-SYSCONFDIR-@"
+#define SHIBSP_CFGDIR  "/opt/shibboleth-svn/etc"
 
 /** Runtime state directory for installation (used to resolve relative paths). */
-#define SHIBSP_RUNDIR  "@-RUNDIR-@"
+#define SHIBSP_RUNDIR  "/opt/shibboleth-svn/var/run"
 
 /** XML directory for installation (used to resolve relative paths). */
-#define SHIBSP_XMLDIR  "@-XMLDIR-@"
+#define SHIBSP_XMLDIR  "/opt/shibboleth-svn/share/xml"
 
 #endif /* __shibsp_paths_h__ */

-- 
Debian packaging for the 2.0 Apache Shibboleth SP