Add a debian/rules file to the generated source package.

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

diff --git a/lib/jdk.sh b/lib/jdk.sh
index 7ae61f024590da6e6b20f2bfb3eba600c7728527..9205fab946f46986e94fb45ac1eae30dc3d5fd7f 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,11 +44,13 @@ 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"
     j2se_copyright > "$debian_dir/copyright"
+    j2se_rules > "$debian_dir/rules"
+    chmod +x "$debian_dir/rules"
     j2se_install_scripts
     install -d "$target/debian"
     j2se_info > "$target/debian/info"