Use debhelper level 9 in the generated package

[sven/java-package.git] / lib / jdk.sh

diff --git a/lib/jdk.sh b/lib/jdk.sh
index 7ae61f024590da6e6b20f2bfb3eba600c7728527..dc93189a42c040b1a8bd1b3cb9b9a020c60c9568 100644 (file)
--- a/lib/jdk.sh
+++ b/lib/jdk.sh
@@ -3,7 +3,7 @@ j2sdk_control() {
     j2se_control
     java_browser_plugin="java-browser-plugin, "
     depends="\${shlibs:Depends}"
-    if [ "${DEB_BUILD_ARCH:0:3}" = "arm" ]; then
+    if [ "${DEB_BUILD_ARCH:0:3}" = "arm" -a "${j2se_arch}" != "arm-vfp-hflt" ]; then
         # ARM is only softfloat ATM so if building on armhf
         # force the dependencies to pickup cross platform fu
         if [ "${DEB_BUILD_ARCH}" == "armhf" ]; then
@@ -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"