Added more command line tool alternatives

diff --git a/debian/changelog b/debian/changelog
index ab7108dbe370292701d677896f80ac6c301047fb..01b4f702c7dad70928aabd7f1e0e52c1bdeeb102 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ java-package (0.54) unstable; urgency=medium
   * Team upload.
   * Added support for ARM VFP/hard-float JDK releases.
     Thanks to Christopher Huhn <C.Huhn@gsi.de> (Closes: #724455)
   * Team upload.
   * Added support for ARM VFP/hard-float JDK releases.
     Thanks to Christopher Huhn <C.Huhn@gsi.de> (Closes: #724455)

+  * Added more command line tool alternatives: jcmd, jdeps, jhat, jrunscript,
+    schemagen, wsgen, wsimport and xjc

   * Standards-Version updated to 3.9.5 (no changes)
   * Removed the suggested dependency on openjdk-6-jre
 
   * Standards-Version updated to 3.9.5 (no changes)
   * Removed the suggested dependency on openjdk-6-jre
 

diff --git a/lib/oracle-jdk.sh b/lib/oracle-jdk.sh
index 32e85cda0879250a572571a020113f9213096fb9..ee635d07fc4d691b1595a080f550f436d4c3e1f4 100644 (file)
--- a/lib/oracle-jdk.sh
+++ b/lib/oracle-jdk.sh
@@ -93,17 +93,18 @@ EOF
       j2se_remove=oracle_j2sdk_remove
       j2se_jinfo=oracle_j2sdk_jinfo
       if [ "${DEB_BUILD_ARCH:0:3}" = "arm" ]; then
       j2se_remove=oracle_j2sdk_remove
       j2se_jinfo=oracle_j2sdk_jinfo
       if [ "${DEB_BUILD_ARCH:0:3}" = "arm" ]; then

-           oracle_jre_bin_hl="java keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 policytool"
+        # javaws is not available for ARM
+        oracle_jre_bin_hl="java keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 policytool"

         oracle_jre_bin_jre="policytool"
       else
         oracle_jre_bin_hl="java javaws keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 policytool"
         oracle_jre_bin_jre="javaws policytool"
       fi
       if [ "${DEB_BUILD_ARCH:0:3}" != "arm" ]; then
         oracle_jre_bin_jre="policytool"
       else
         oracle_jre_bin_hl="java javaws keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 policytool"
         oracle_jre_bin_jre="javaws policytool"
       fi
       if [ "${DEB_BUILD_ARCH:0:3}" != "arm" ]; then

-           oracle_no_man_jre_bin_jre="ControlPanel"
+        oracle_no_man_jre_bin_jre="ControlPanel"

       fi
       oracle_jre_lib_hl="jexec"
       fi
       oracle_jre_lib_hl="jexec"

-      oracle_bin_jdk="appletviewer extcheck idlj jar jarsigner javac javadoc javah javap jconsole jdb jinfo jmap jps jsadebugd jstack jstat jstatd native2ascii rmic serialver"
+      oracle_bin_jdk="appletviewer extcheck idlj jar jarsigner javac javadoc javah javap jcmd jconsole jdb jdeps jhat jinfo jmap jps jrunscript jsadebugd jstack jstat jstatd native2ascii rmic schemagen serialver wsgen wsimport xjc"

       j2sdk_run
     fi
   fi
       j2sdk_run
     fi
   fi


@@ -127,7 +128,7 @@ install_alternatives $jvm_base$j2se_name/bin $oracle_bin_jdk
 if [ "${DEB_BUILD_ARCH:0:3}" != "arm" ]; then
 plugin_dir="$jvm_base$j2se_name/jre/lib/$DEB_BUILD_ARCH"
 for b in $browser_plugin_dirs;do
 if [ "${DEB_BUILD_ARCH:0:3}" != "arm" ]; then
 plugin_dir="$jvm_base$j2se_name/jre/lib/$DEB_BUILD_ARCH"
 for b in $browser_plugin_dirs;do

-           install_browser_plugin "/usr/lib/\$b/plugins" "libjavaplugin.so" "\$b-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+    install_browser_plugin "/usr/lib/\$b/plugins" "libjavaplugin.so" "\$b-javaplugin.so" "\$plugin_dir/libnpjp2.so"

 done
 fi
 EOF
 done
 fi
 EOF