Updated debhelper level to 7

diff --git a/debian/changelog b/debian/changelog
index 3cda0b90bc823e0cea4f41018d4f7504294cf73b..b1fc3e3f344367bbb6d97d4dad12b3fff39f8e3c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ java-package (0.53) UNRELEASED; urgency=low
   * Removed 'Replaces: ${j2se_package}debian' from the generated control file
   * Adjusted the disk space required to unpack the Java 8 documentation
   * Updated the manpages for Java 8
   * Removed 'Replaces: ${j2se_package}debian' from the generated control file
   * Adjusted the disk space required to unpack the Java 8 documentation
   * Updated the manpages for Java 8

+  * Updated debhelper level to 7
+  * debian/rules: Use dh_prep instead of dh_clean -k

 
  -- Emmanuel Bourg <ebourg@apache.org>  Wed, 28 Aug 2013 19:34:41 +0200
 
 
  -- Emmanuel Bourg <ebourg@apache.org>  Wed, 28 Aug 2013 19:34:41 +0200
 

diff --git a/debian/compat b/debian/compat
index 7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69..7f8f011eb73d6043d2e6db9d2c101195ae2801f2 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7

diff --git a/debian/control b/debian/control
index 4e7f4085a27917f1557ded4349b5cbb9837dfa39..e9fc7f64a40f797864f757749d2f04e805db03ee 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: contrib/misc
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Cédric Pineau <cedric.pineau@gmail.com>
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Cédric Pineau <cedric.pineau@gmail.com>

-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 7)

 Standards-Version: 3.9.4
 Vcs-Git: git://anonscm.debian.org/pkg-java/java-package.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/java-package.git
 Standards-Version: 3.9.4
 Vcs-Git: git://anonscm.debian.org/pkg-java/java-package.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/java-package.git

diff --git a/debian/rules b/debian/rules
index 7e1f875e8ec43ef665ae987d4272bbb049b49b75..58fc11cc794983e138d3177fb0a77b0fdfbef858 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ clean:
 install: build
        dh_testdir
        dh_testroot
 install: build
        dh_testdir
        dh_testroot

-       dh_clean -k
+       dh_prep

        dh_installdirs
        install -m 755 make-jpkg.out $(B)/usr/bin/make-jpkg
        cp lib/*.sh $(B)/usr/share/java-package/
        dh_installdirs
        install -m 755 make-jpkg.out $(B)/usr/bin/make-jpkg
        cp lib/*.sh $(B)/usr/share/java-package/