[PATCH 2/6] debian/rules: avoid deprecated dh_clean --keep syntax
dh_clean -k is deprecated because it has a confusing name. The
synonym dh_prep was added in debhelper 7, which has been available
for about a year and a half.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
debian/changelog | 2 ++
debian/control | 2 +-
debian/rules | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c027bf9..31e3ae5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
libpciaccess (0.12.0-2) UNRELEASED; urgency=low
* Allow non-root users to run “debian/rules clean”.
+ * Use dh_prep instead of dh_clean -k. Requires a build-time
+ dependency on debhelper 7.
-- Jonathan Nieder <jrnieder@gmail.com> Fri, 04 Feb 2011 19:51:53 -0600
diff --git a/debian/control b/debian/control
index 7ccacba..7b967c2 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
- debhelper (>= 5),
+ debhelper (>= 7),
libtool,
automake,
zlib1g-dev,
diff --git a/debian/rules b/debian/rules
index 10c19a8..6ad11a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,7 +62,7 @@ clean:
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
--
1.7.4
Reply to: