From: Andreas Metzler <[email protected]>

Use dh_prep instead of "dh_clean -k" (dh-clean-k-is-deprecated). However
do not replace instances of dh_clean without -k option. (Debian
bug590244). Build-Depend on debhelper 7.
---
 debian/changelog |    3 +++
 debian/control   |    2 +-
 debian/rules     |    4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f55964b..77fb157 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ wmaker (0.92.0-9) unstable; urgency=low
       debhelper-but-no-misc-depends)
     + [debian/control] Move homepage from description text to homepage
       field. (Lintian description-contains-homepage)
+    + Use dh_prep instead of "dh_clean -k" (dh-clean-k-is-deprecated). However
+      do not replace instances of dh_clean without -k option. Closes: #590244
+    + Build-Depend on debhelper 7.
   * Invoke ./configure mit correct --build argument, as per
      /usr/share/doc/autotools-dev/README.Debian.gz.
 
diff --git a/debian/control b/debian/control
index 84c1643..a6322ec 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: John H. Robinson, IV <[email protected]>
 Standards-Version: 3.8.0.1
-Build-Depends: debhelper (>= 4), automake1.4, gettext, dctrl-tools,
+Build-Depends: debhelper (>= 7.0.15), automake1.4, gettext, dctrl-tools,
  libfontconfig1-dev, libjpeg-dev, libpng12-dev, libsm-dev, libtiff4-dev,
  libtool, libgif-dev, libx11-dev, libxext-dev, libxft-dev, libxinerama-dev,
  libxkbfile-dev, libxpm-dev, libxt-dev, libxrender-dev, sharutils, libxmu-dev
diff --git a/debian/rules b/debian/rules
index 63e43e4..0a01834 100755
--- a/debian/rules
+++ b/debian/rules
@@ -194,12 +194,12 @@ clean:
 binary-indep: build
 #      dh_testdir -i
 #      dh_testroot
-#      dh_clean -i -k
+#      dh_prep -i
 
 binary-arch: build
        dh_testdir -a
        dh_testroot
-       dh_clean -a -k
+       dh_prep -a
        dh_installdirs -a
        debian/rules install-wmaker-stamp
        debian/rules debian/$(LIBWRASTER)-dev.files
-- 
1.7.1


-- 
To unsubscribe, send mail to [email protected].

Reply via email to