[SCM] Debian packaging for the 2.0 Apache Shibboleth SP branch, master, updated. debian/2.4.3+dfsg-3-9-g2a05bab

[Russ Allbery]

The following commit has been merged in the master branch:
commit a64e45e66af977a612370874fe22438a653338e6
Author: Russ Allbery <rra at debian.org>
Date:   Wed Feb 1 23:13:25 2012 -0800

    Add missing ${misc:Pre-Depends} dependency

diff --git a/debian/control b/debian/control
index 1252731..d7c7d78 100644
--- a/debian/control
+++ b/debian/control
@@ -36,6 +36,7 @@ Package: libshibsp5
 Section: libs
 Architecture: any
 Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, opensaml2-schemas (>= 2.4),
  shibboleth-sp2-schemas (>= 2.4), xmltooling-schemas (>= 1.4)
 Description: Federated web single sign-on system (runtime)
diff --git a/shibsp/paths.h b/shibsp/paths.h
deleted file mode 100644
index d2d4557..0000000
--- a/shibsp/paths.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Licensed to the University Corporation for Advanced Internet
- * Development, Inc. (UCAID) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for
- * additional information regarding copyright ownership.
- *
- * UCAID licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the
- * License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
- */
-
-/**
- * @file shibsp/paths.h
- * 
- * Default configuration paths.
- */
-
-#ifndef __shibsp_paths_h__
-#define __shibsp_paths_h__
-
-/** Default schema catalogs. */
-#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"
-
-/** Default name of SP console tool logging file. */
-#define SHIBSP_LOGGING "console.logger"
-
-/** Default prefix for installation (used to resolve relative paths). */
-#define SHIBSP_PREFIX  "/opt/shibboleth-svn"
-
-/** Library directory for installation (used to resolve relative paths). */
-#define SHIBSP_LIBDIR  "/opt/shibboleth-svn/lib"
-
-/** Log directory for installation (used to resolve relative paths). */
-#define SHIBSP_LOGDIR  "/opt/shibboleth-svn/var/log"
-
-/** Configuration directory for installation (used to resolve relative paths). */
-#define SHIBSP_CFGDIR  "/opt/shibboleth-svn/etc"
-
-/** Runtime state directory for installation (used to resolve relative paths). */
-#define SHIBSP_RUNDIR  "/opt/shibboleth-svn/var/run"
-
-/** XML directory for installation (used to resolve relative paths). */
-#define SHIBSP_XMLDIR  "/opt/shibboleth-svn/share/xml"
-
-#endif /* __shibsp_paths_h__ */

-- 
Debian packaging for the 2.0 Apache Shibboleth SP