[SCM] Debian packaging for XML-Security-C branch, master, updated. debian/1.5.1-3-17-g9102852

[Russ Allbery]

The following commit has been merged in the master branch:
commit 363a8d26f03fa263b22888ca96c097a54460c875
Author: Russ Allbery <rra at debian.org>
Date:   Sun Mar 6 19:57:41 2011 -0800

    Update to debhelper compat level V8 and autotools-dev module
    
    * Update to debhelper compatibility level V8.
      - Use the autotools-dev debhelper module for config.{sub,guess}.
      - Use debhelper rule minimization.
      - Move files to clean into a separate clean control file.
    * Use autoreconf instead of running the tools separately.

diff --git a/debian/changelog b/debian/changelog
index ce08ca3..293158e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,11 @@ xml-security-c (1.6.0-1) UNRELEASED; urgency=low
     - Add methods for Reference removal to DSIGSignature and
       DSIGSignedInfo classes
     - Lots of various bug fixes
+  * Update to debhelper compatibility level V8.
+    - Use the autotools-dev debhelper module for config.{sub,guess}.
+    - Use debhelper rule minimization.
+    - Move files to clean into a separate clean control file.
+  * Use autoreconf instead of running the tools separately.
   * Update package home page for new upstream location.
   * Update debian/copyright to the current DEP-5 specification.
   * debian/watch fixes for upstream distribution and versioning.
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..199820f
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,11 @@
+aclocal.m4 
+build-aux/depcomp
+build-aux/install-sh
+build-aux/ltmain.sh
+build-aux/missing
+configure
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index c04cc5a..1d360fb 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 (>= 7), autoconf, automake, libtool, libssl-dev,
- libxerces-c-dev
+Build-Depends: debhelper (>= 8), autoconf, automake,
+ autotools-dev (>= 20100122.1~), libtool, libssl-dev, libxerces-c-dev
 Standards-Version: 3.8.4
 Homepage: http://santuario.apache.org/cindex.html
 Vcs-Git: git://git.debian.org/git/pkg-shibboleth/xml-security-c.git
diff --git a/debian/rules b/debian/rules
index 16dd772..dea86cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,89 +1,8 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+override_dh_auto_configure:
+	autoreconf -f -i
+	dh_auto_configure -- --with-xerces --without-xalan --with-openssl
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    CFLAGS += -O0
-else
-    CFLAGS += -O2
-endif
-
-# Tell Autoconf the correct system types.
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-    SYSTEM = --build $(DEB_HOST_GNU_TYPE)
-else
-    SYSTEM = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-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
-	aclocal
-	autoconf
-	./configure CFLAGS="$(CFLAGS)" --prefix=/usr \
-	    --mandir=\$${prefix}/share/man --with-xerces --without-xalan \
-	    --with-openssl $(SYSTEM)
-	touch configure-stamp
-
-build: build-arch build-indep
-build-arch: configure-stamp build-stamp
-build-indep:
-build-stamp:
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	rm -rf autom4te.cache
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean aclocal.m4 config/config.guess config/config.sub	\
-	    config/ltmain.sh configure m4/libtool.m4 m4/ltoptions.m4	\
-	    m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4
-
-install: build-stamp
-	dh_testdir
-	dh_testroot
-	dh_prep
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-	dh_install --sourcedir=debian/tmp
-
-binary: binary-arch binary-indep
-binary-indep:
-binary-arch: DH_OPTIONS=-a
-binary-arch: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-.PHONY: binary binary-arch binary-indep build build-arch build-indep clean
-.PHONY: configure install
+%:
+	dh $@ --with autotools_dev

-- 
Debian packaging for XML-Security-C