[SCM] Debian packaging for the 2.0 Apache Shibboleth SP branch, debian, updated. upstream/2.0.dfsg1-39-gd613c4a

[Russ Allbery]

The following commit has been merged in the debian branch:
commit 67fbe9c7e56fc53121e6d01f022ae7d392f706f4
Author: Russ Allbery <rra at debian.org>
Date:   Tue Jun 24 11:56:48 2008 -0700

    Update build-depends and re-run libtool at build time
    
    Add unixodbc-dev to build-depends so that we build with ODBC support
    as well.  Alphabetize the build-dependencies and add the rest of the
    autotools.  Run libtool and the other autotools at build time to avoid
    the AMD64 rpath bug.  Explicitly build with Apache 2.2.  Use the
    Debian unstable package name for Xerces-C.

diff --git a/debian/control b/debian/control
index 482ca96..fa73045 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,10 @@ 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>
-Build-Depends: debhelper (>= 5), autotools-dev, apache2-threaded-dev,
- doxygen, liblog4cpp5-dev, libxerces-c2-dev, libsaml2-dev, opensaml2-schemas,
- libssl-dev, zlib1g-dev, libxmltooling-dev, xmltooling-schemas, libxml-security-c-dev (>=1.4)
+Build-Depends: debhelper (>= 5), autotools-dev, autoconf, automake,
+ libtool, apache2-threaded-dev, doxygen, liblog4cpp5-dev, libsaml2-dev,
+ libssl-dev, libxerces-c2-dev, libxml-security-c-dev (>= 1.4),
+ libxmltooling-dev, opensaml2-schemas, xmltooling-schemas
 Standards-Version: 3.8.0
 Homepage: http://shibboleth.internet2.edu
 Vcs-Git: git://git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git
diff --git a/debian/rules b/debian/rules
index e983d1e..08b172a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,11 +44,16 @@ endif
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
+	rm -f libtool.m4
+	libtoolize --force
+	autoreconf --force
+	rm -rf autom4te.cache
 	cp /usr/share/misc/config.guess config.guess
 	cp /usr/share/misc/config.sub config.sub
-	CFLAGS="$(CFLAGS)" ./configure --enable-apache-22 \
-	    --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-	    --disable-dependency-tracking $(SYSTEM) $(DEBUG)
+	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ./configure --prefix=/usr \
+	    --sysconfdir=/etc --libexecdir=/usr/lib/shibboleth \
+	    --localstatedir=/var --enable-apache-22 \
+	    --with-apxs2=/usr/bin/apxs2 --disable-dependency-tracking
 	touch $@
 
 build: build-arch build-indep
@@ -64,7 +69,8 @@ clean:
 	dh_testroot
 	rm -f configure-stamp build-stamp install-stamp
 	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean config.guess config.sub
+	dh_clean aclocal.m4 config.h config.h.in config.status configure \
+	    config.guess config.sub libtool.m4 ltmain.sh
 
 install: install-stamp
 install-stamp:

-- 
Debian packaging for the 2.0 Apache Shibboleth SP