[SCM] Debian packaging for XML-Security-C branch, debian, updated. upstream/1.5.1-66-g032d1c8

[Russ Allbery]

The following commit has been merged in the debian branch:
commit 032d1c824740ad398335be34711dec19809713b5
Author: Russ Allbery <rra at debian.org>
Date:   Wed Aug 5 13:17:21 2009 -0700

    Run autoreconf during the build
    
    * Upstream now ships an older version of libtool and we have patches to
      configure.ac, so run autoreconf during the build to force everything
      to be updated.
    
    Running libtoolize independently requires re-running aclocal, and by that
    point one may as well just use autoreconf -f -i.

diff --git a/debian/changelog b/debian/changelog
index 7bf7f75..9bf2298 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xml-security-c (1.5.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
     - Rename library package for upstream SONAME bump.
-  * Upstream now ships an older version of libtool, so run libtoolize
-    during the build.
+  * Upstream now ships an older version of libtool and we have patches to
+    configure.ac, so run autoreconf during the build to force everything
+    to be updated.
   * Build against Xerces-C 3.0.
   * Stop building against Xalan.  The Xalan packages for Debian have been
     orphaned, the current Xalan release does not support Xerces-C 3.0, and
diff --git a/debian/control b/debian/control
index 55042f8..d3c518f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: libs
 Priority: extra
 Maintainer: Debian Shib Team <pkg-shibboleth-devel at lists.alioth.debian.org>
 Uploaders: Russ Allbery <rra at debian.org>
-Build-Depends: debhelper (>= 5), autoconf, autotools-dev, libtool,
- libssl-dev, libxerces-c-dev
+Build-Depends: debhelper (>= 5), autoconf, automake, libtool, libssl-dev,
+ libxerces-c-dev
 Standards-Version: 3.8.2
 Homepage: http://xml.apache.org/security/
 Vcs-Git: git://git.debian.org/git/pkg-shibboleth/xml-security-c.git
diff --git a/debian/rules b/debian/rules
index d4d41a1..1ba0877 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,10 +31,7 @@ endif
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	cp /usr/share/misc/config.guess config/
-	cp /usr/share/misc/config.sub config/
-	libtoolize -c -f
-	autoconf
+	autoreconf -f -i
 	./configure CFLAGS="$(CFLAGS)" --prefix=/usr \
 	    --mandir=\$${prefix}/share/man --with-xerces --without-xalan \
 	    --with-openssl $(SYSTEM)

-- 
Debian packaging for XML-Security-C