Update to debhelper compatibility level V8

* Update to debhelper compatibility level V8.
  - Use debhelper rule minimization.

diff --git a/debian/changelog b/debian/changelog
index d57354e..f5dc2e6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,8 @@ shibboleth-sp2 (2.4.2+dfsg-1) UNRELEASED; urgency=low
     build results.
   * Add build dependency on pkg-config, which upstream now uses to find
     the SSL libraries.
+  * Update to debhelper compatibility level V8.
+    - Use debhelper rule minimization.
   * Update debian/copyright to the current DEP-5 specification.
 
  -- Russ Allbery <rra@debian.org>  Mon, 29 Nov 2010 15:54:07 -0800

diff --git a/debian/clean b/debian/clean
new file mode 100644 (file)
index 0000000..4021626
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,13 @@
+aclocal.m4
+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/compat b/debian/compat
index 7f8f011..45a4fb7 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8

diff --git a/debian/control b/debian/control
index 879b52d..a8b96a2 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian Shib Team <pkg-shibboleth-devel@lists.alioth.debian.org>
 Uploaders: Russ Allbery <rra@debian.org>, Ferenc Wagner <wferi@niif.hu>,
  Faidon Liambotis <paravoid@debian.org>
-Build-Depends: debhelper (>= 7), apache2-threaded-dev, autoconf, automake,
+Build-Depends: debhelper (>= 8), apache2-threaded-dev, autoconf, automake,
  autotools-dev, doxygen, liblog4cpp5-dev, libmemcached-dev,
  libsaml2-dev (>= 2.4), libssl-dev, libtool, libxerces-c-dev,
  libxml-security-c-dev (>= 1.6), libxmltooling-dev (>= 1.4),

diff --git a/debian/rules b/debian/rules
index 3b5169a..2b53392 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,31 +1,12 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-CFLAGS = -g
-CXXFLAGS = -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
     DEBUG = --enable-debug
 else
     DEBUG =
 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
-
-# These variable is used only by get-orig-source, which will normally only be
-# run by maintainers.
+# These variables are used by get-orig-source and to generate man pages.
 DEBVERS := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 \
                | cut -d- -f1)
 VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g')
@@ -44,47 +25,19 @@ get-orig-source:
        rm -rf shibboleth-sp2_$(DEBVERS).orig
        gzip -9 shibboleth-sp2_$(DEBVERS).orig.tar
 
-configure: configure-stamp
-configure-stamp:
-       dh_testdir
-       cp /usr/share/misc/config.guess config.guess
-       cp /usr/share/misc/config.sub config.sub
-       rm -f libtool.m4
-       libtoolize --force
-       autoreconf --force
-       rm -rf autom4te.cache
-       CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ./configure --prefix=/usr \
-           --sysconfdir=/etc --libexecdir=/usr/lib/shibboleth \
+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)
-       touch $@
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep:
-build-stamp: configure-stamp
-       dh_testdir
-       $(MAKE)
-       touch $@
+           --with-memcached $(SYSTEM)
 
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f configure-stamp build-stamp install-stamp
-       [ ! -f Makefile ] || $(MAKE) distclean
+override_dh_auto_clean:
+       dh_auto_clean
        find . -name Makefile.in -print0 | xargs -0r rm
-       dh_clean aclocal.m4 config.h config.h.in config.status configure \
-           config.guess config.sub libtool.m4 ltmain.sh shibsp/paths.h \
-           debian/libapache2-mod-shib2.shibd.init
 
-install: install-stamp
-install-stamp:
-       dh_testdir
-       dh_testroot
-       dh_prep
-       $(MAKE) NOKEYGEN=1 DESTDIR=$(CURDIR)/debian/tmp install
+override_dh_auto_install:
+       NOKEYGEN=1 dh_auto_install
        rm -r $(CURDIR)/debian/tmp/usr/share/doc/shibboleth*
        rm -r $(CURDIR)/debian/tmp/var/run
        rm $(CURDIR)/debian/tmp/etc/shibboleth/*.dist
@@ -99,7 +52,8 @@ install-stamp:
            $(CURDIR)/debian/tmp/usr/bin/shib-metagen
        mv $(CURDIR)/debian/tmp/etc/shibboleth/shibd-debian \
            $(CURDIR)/debian/libapache2-mod-shib2.shibd.init
-       dh_installdirs -s -i
+
+override_dh_install:
        mv $(CURDIR)/debian/tmp/usr/lib/shibboleth/mod_shib_22.so \
            $(CURDIR)/debian/libapache2-mod-shib2/usr/lib/apache2/modules
        rm $(CURDIR)/debian/tmp/usr/lib/shibboleth/mod_shib_22.la
@@ -119,39 +73,9 @@ install-stamp:
            --center 'Shibboleth' --release $(VERSION) \
            $(CURDIR)/debian/libapache2-mod-shib2/usr/share/man/man8/shibd.8
        dh_install -s -i --fail-missing
-       touch $@
 
-binary: binary-arch binary-indep
-binary-arch: DH_OPTIONS=-a
-binary-arch: install-stamp
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs
+override_dh_installdocs:
        dh_installdocs -A doc/NOTICE.txt
-       dh_installinit --name=shibd
-       dh_installlogcheck
-       dh_strip
-       dh_compress
-       dh_fixperms
-       DH_OPTIONS="" dh_makeshlibs -plibshibsp4
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
 
-binary-indep: DH_OPTIONS=-i
-binary-indep: install-stamp
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs
-       dh_installdocs -A doc/NOTICE.txt
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-.PHONY: binary binary-arch binary-indep build build-arch build-indep clean
-.PHONY: install
+override_dh_installinit:
+       dh_installinit --name=shibd