X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fjava-package.git;a=blobdiff_plain;f=lib%2Fjdk.sh;h=ae8d96f9b9f8ea8e2d76025d75ab5a6ec229d780;hp=129bb93a07a0e2e30ba3461a85859c86ee0549c9;hb=2a9168df2bfed5c3353dfea956029a572d2a1e9b;hpb=a598d8a74baa92c6c28f0e2780dfba4c6289627a

diff --git a/lib/jdk.sh b/lib/jdk.sh
index 129bb93..ae8d96f 100644
--- 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
@@ -16,7 +16,7 @@ j2sdk_control() {
 Package: $j2se_package
 Architecture: any
 Depends: $depends
-Recommends: netbase, libx11-6 | xlibs, libasound2, libgtk1.2
+Recommends: netbase
 Provides: java-virtual-machine, java-runtime, java2-runtime, java${j2se_release}-runtime, java$((${j2se_release}-1))-runtime, java$((${j2se_release}-2))-runtime, $java_browser_plugin java-compiler, java2-compiler, java-runtime-headless, java2-runtime-headless, java${j2se_release}-runtime-headless, java$((${j2se_release}-1))-runtime-headless, java$((${j2se_release}-2))-runtime-headless, java-sdk, java2-sdk, java$((${j2se_release}-2))-sdk, java$((${j2se_release}-1))-sdk, java${j2se_release}-sdk
 Description: $j2se_title
  The Java(TM) SE JDK is a development environment for building