From: Russ Allbery Date: Sat, 15 May 2010 22:24:52 +0000 (-0700) Subject: Update debhelper compatibility level to V7 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fsp.git;a=commitdiff_plain;h=4f2bb6b6307714756f098dcaaa9ad91a778dce3b Update debhelper compatibility level to V7 * Update debhelper compatibility level to V7. - Use dh_prep instead of dh_clean -k. --- diff --git a/debian/changelog b/debian/changelog index 1c46028..9150f9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ shibboleth-sp2 (2.3.1+dfsg-2) UNRELEASED; urgency=low * Modify shib-keygen to create the new certificate key group-readable by _shibd and not world-readable. (Closes: #571631) * Force source format 1.0 for now since it makes backporting easier. + * Update debhelper compatibility level to V7. + - Use dh_prep instead of dh_clean -k. * Update standards version to 3.8.4 (no changes required). -- Russ Allbery Fri, 14 May 2010 17:29:48 -0700 diff --git a/debian/compat b/debian/compat index 7ed6ff8..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/control b/debian/control index 5f39c1f..199b653 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: web Priority: extra Maintainer: Debian Shib Team Uploaders: Russ Allbery , Ferenc Wagner -Build-Depends: debhelper (>= 5), autotools-dev, autoconf, automake, +Build-Depends: debhelper (>= 7), autotools-dev, autoconf, automake, libtool, apache2-threaded-dev, doxygen, liblog4cpp5-dev, libsaml2-dev (>= 2.3), libssl-dev, libxerces-c-dev, libxml-security-c-dev (>= 1.5), libxmltooling-dev (>= 1.3), diff --git a/debian/rules b/debian/rules index ff1d051..48f062d 100755 --- a/debian/rules +++ b/debian/rules @@ -82,7 +82,7 @@ install: install-stamp install-stamp: dh_testdir dh_testroot - dh_clean -k + dh_prep $(MAKE) NOKEYGEN=1 DESTDIR=$(CURDIR)/debian/tmp install rm -r $(CURDIR)/debian/tmp/usr/share/doc/shibboleth* rm -r $(CURDIR)/debian/tmp/var/run