[SCM] Debian packaging for the 2.0 Apache Shibboleth SP branch, master, updated. debian/2.4.3+dfsg-3-9-g2a05bab
Russ Allbery
rra at debian.org
Thu Feb 2 08:16:41 UTC 2012
The following commit has been merged in the master branch:
commit 28b09bbcefd64bb1437ce21a7abc10a1d6ccd53a
Author: Russ Allbery <rra at debian.org>
Date: Wed Feb 1 22:33:51 2012 -0800
Use dh-autoreconf to rebuild the build system
* Rebuild the Autotools build system using dh-autoreconf instead of
rolling our own version of the same thing.
diff --git a/debian/changelog b/debian/changelog
index a38027b..a216b7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ shibboleth-sp2 (2.4.3+dfsg-4) UNRELEASED; urgency=low
* Update to debhelper compatibility level V9.
- Enable hardening build flags. (Closes: #656006)
- Enable multiarch support.
+ * Rebuild the Autotools build system using dh-autoreconf instead of
+ rolling our own version of the same thing.
-- Russ Allbery <rra at debian.org> Wed, 01 Feb 2012 22:27:55 -0800
diff --git a/debian/clean b/debian/clean
index 83741e5..6b62fd8 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,15 +1 @@
-aclocal.m4
-build-aux/config.guess
-build-aux/config.sub
-build-aux/depcomp
-build-aux/install-sh
-build-aux/ltmain.sh
-build-aux/missing
-configure
debian/libapache2-mod-shib2.shibd.init
-m4/libtool.m4
-m4/ltoptions.m4
-m4/ltsugar.m4
-m4/ltversion.m4
-m4/lt~obsolete.m4
-shibsp/paths.h
diff --git a/debian/control b/debian/control
index d42ee96..1252731 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ 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>,
Faidon Liambotis <paravoid at debian.org>
-Build-Depends: debhelper (>= 9), apache2-threaded-dev, autoconf, automake,
- autotools-dev, doxygen, graphviz, liblog4cpp5-dev, libmemcached-dev,
+Build-Depends: debhelper (>= 9), apache2-threaded-dev, dh-autoreconf,
+ doxygen, graphviz, liblog4cpp5-dev, libmemcached-dev,
libsaml2-dev (>= 2.4), libssl-dev, libtool, libxerces-c-dev,
libxml-security-c-dev (>= 1.6), libxmltooling-dev (>= 1.4),
opensaml2-schemas, pkg-config, unixodbc-dev, xmltooling-schemas
diff --git a/debian/rules b/debian/rules
index 55aa6fd..991bbff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,16 +31,11 @@ get-orig-source:
gzip -9 shibboleth-sp2_$(DEBVERS).orig.tar
override_dh_auto_configure:
- autoreconf -f -i
dh_auto_configure -- --libexecdir=/usr/lib/shibboleth \
--localstatedir=/var --enable-apache-22 \
--with-apxs2=/usr/bin/apxs2 --disable-dependency-tracking \
--with-memcached $(SYSTEM)
-override_dh_auto_clean:
- dh_auto_clean
- find . -name Makefile.in -print0 | xargs -0r rm
-
override_dh_auto_install:
NOKEYGEN=1 dh_auto_install
rm debian/tmp/usr/lib/shibboleth/*.la
@@ -92,4 +87,4 @@ override_dh_makeshlibs:
dh_makeshlibs -Xusr/lib/shibboleth
%:
- dh $@
+ dh $@ --with autoreconf
--
Debian packaging for the 2.0 Apache Shibboleth SP
More information about the Pkg-shibboleth-devel
mailing list