X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fjava-package.git;a=blobdiff_plain;f=lib%2Fj2sdk.sh;h=778b3703866f67da00d6f54e8a4aeff6091c7947;hp=ef48f4cce98350427df6e1cc28baf7332c3d9c3b;hb=d8cde9ed501f030194a66a7993523d43ab926084;hpb=e0a81f74e9d4982fffab79fb8fe7fa45358631ed

diff --git a/lib/j2sdk.sh b/lib/j2sdk.sh
index ef48f4c..778b370 100644
--- a/lib/j2sdk.sh
+++ b/lib/j2sdk.sh
@@ -1,12 +1,23 @@
 
 j2sdk_control() {
     j2se_control
+    java_browser_plugin="java-browser-plugin, "
+    depends="\${shlibs:Depends}"
+    if [ "${DEB_BUILD_ARCH:0:3}" = "arm" ]; 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
+            depends="libc6-armel, libsfgcc1, libsfstdc++6"
+        fi
+        # No browser on ARM yet
+        java_browser_plugin=""
+    fi
     cat << EOF
 Package: $j2se_package
 Architecture: any
-Depends: \${shlibs:Depends}
+Depends: $depends
 Recommends: netbase, libx11-6 | xlibs, libasound2, libgtk1.2, libstdc++5
-Provides: java-virtual-machine, java-runtime, java2-runtime, java6-runtime, java-browser-plugin, java-compiler, java2-compiler, java-runtime-headless, java2-runtime-headless, java6-runtime-headless, java-sdk, java2-sdk, java6-sdk, j2sdk$j2se_release, j2re$j2se_release
+Provides: java-virtual-machine, java-runtime, java2-runtime, $java_browser_plugin java-compiler, java2-compiler, java-runtime-headless, java2-runtime-headless, java-sdk, java2-sdk, j2sdk$j2se_release, j2re$j2se_release
 Replaces: ${j2se_package}debian
 Description: $j2se_title
  The Java(TM) SE JDK is a development environment for building
@@ -29,7 +40,7 @@ j2sdk_run() {
     diskfree "$j2se_required_space"
     read_maintainer_info
     j2se_package="$j2se_vendor-java$j2se_release-jdk"
-    j2se_name="jdk$j2se_release-$j2se_vendor"
+    j2se_name="jdk-$j2se_release-$j2se_vendor-$j2se_arch"
     local target="$install_dir$jvm_base$j2se_name"
     install -d -m 755 "$( dirname "$target" )"
     extract_bin "$archive_path" "$j2se_expected_min_size" "$target"