From: Emmanuel Bourg <ebourg@apache.org>
Date: Thu, 24 Apr 2014 21:28:12 +0000 (+0200)
Subject: Use debhelper level 9 in the generated package
X-Git-Url: https://git.sven.stormbind.net/?a=commitdiff_plain;h=2db62a21fffe2ec4479cc496b99e4abcbc350895;p=sven%2Fjava-package.git

Use debhelper level 9 in the generated package
---

diff --git a/debian/changelog b/debian/changelog
index 10defdb..b75515d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ java-package (0.55) UNRELEASED; urgency=medium
 
   [ Emmanuel Bourg ]
   * Bumped the Standards-Version of the generated package to 3.9.5
+  * Use debhelper level 9 in the generated package
 
  -- tony mancill <tmancill@debian.org>  Mon, 07 Apr 2014 21:26:36 -0700
 
diff --git a/debian/control b/debian/control
index 834396c..753f37b 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/java-package.git
 
 Package: java-package
 Architecture: all
-Depends: ${misc:Depends}, debhelper, fakeroot, unzip, libx11-6, libasound2,
+Depends: ${misc:Depends}, debhelper (>= 9), fakeroot, unzip, libx11-6, libasound2,
  lsb-release
 Recommends: dpkg-dev, gcc
 Suggests: openjdk-7-jre
diff --git a/lib/javase.sh b/lib/javase.sh
index 20756e7..4e1766d 100644
--- a/lib/javase.sh
+++ b/lib/javase.sh
@@ -28,7 +28,7 @@ Source: $j2se_package
 Section: non-free/devel
 Priority: optional
 Maintainer: $maintainer_name <$maintainer_email>
-Build-Depends: debhelper (>= 4.0.0)
+Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.5
 
 EOF
@@ -188,7 +188,6 @@ j2se_build() {
     echo "Create debian package:"
 
     #export DH_VERBOSE=1
-    export DH_COMPAT=7
     export DH_OPTIONS=--tmpdir="$install_dir"
 
     echo "    dh_testdir"
diff --git a/lib/jdk-doc.sh b/lib/jdk-doc.sh
index baca98e..83e0373 100644
--- a/lib/jdk-doc.sh
+++ b/lib/jdk-doc.sh
@@ -44,7 +44,7 @@ j2sdk_doc_run() {
     install -d -m 755 "$( dirname "$target" )"
     extract_bin "$archive_path" "$j2se_expected_min_size" "$target"
     rm -rf "$target/.systemPrefs"
-    echo "7" > "$debian_dir/compat"
+    echo "9" > "$debian_dir/compat"
     j2se_readme > "$debian_dir/README.Debian"
     j2se_changelog > "$debian_dir/changelog"
     j2sdk_doc_control > "$debian_dir/control"
diff --git a/lib/jdk.sh b/lib/jdk.sh
index ae8d96f..dc93189 100644
--- a/lib/jdk.sh
+++ b/lib/jdk.sh
@@ -44,7 +44,7 @@ j2sdk_run() {
     install -d -m 755 "$( dirname "$target" )"
     extract_bin "$archive_path" "$j2se_expected_min_size" "$target"
     rm -rf "$target/.systemPrefs"
-    echo "7" > "$debian_dir/compat"
+    echo "9" > "$debian_dir/compat"
     j2se_readme > "$debian_dir/README.Debian"
     j2se_changelog > "$debian_dir/changelog"
     j2sdk_control > "$debian_dir/control"
diff --git a/lib/jre.sh b/lib/jre.sh
index da86095..386436d 100644
--- a/lib/jre.sh
+++ b/lib/jre.sh
@@ -30,7 +30,7 @@ j2re_run() {
     install -d -m 755 "$( dirname "$target" )"
     extract_bin "$archive_path" "$j2se_expected_min_size" "$target"
     rm -rf "$target/.systemPrefs"
-    echo "7" > "$debian_dir/compat"
+    echo "9" > "$debian_dir/compat"
     j2se_readme > "$debian_dir/README.Debian"
     j2se_changelog > "$debian_dir/changelog"
     j2re_control > "$debian_dir/control"