Use debhelper level 9 in the generated package

diff --git a/debian/changelog b/debian/changelog
index 10defdba2cc7ac628979018f99ac7df49af4feb8..b75515df1dcc165c93dcabbe0c931bfd0c122960 100644 (file)
--- 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 834396c07014f1fe1a225aec0b0eb68fc677ae1c..753f37bc267c76c9cc1e26baaf2930ae9a76d0d5 100644 (file)
--- 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 20756e7be2ce4ce095b33053a9a5645491e29415..4e1766d4fcf503f635de2ebe30e6a2b742d903ac 100644 (file)
--- 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 baca98e98331e07d13a2ac3e067659217704c710..83e0373e0d343c5b75ef4c503046a3628fc2583c 100644 (file)
--- 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 ae8d96f9b9f8ea8e2d76025d75ab5a6ec229d780..dc93189a42c040b1a8bd1b3cb9b9a020c60c9568 100644 (file)
--- 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 da8609529bc3ed27bf261c5bc3e4045db58904a1..386436dfea551ed9a28fa728cb93fcd68615c6c0 100644 (file)
--- 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"