Added jcontrol to the command line alternatives (Closes: #799370)

diff --git a/debian/changelog b/debian/changelog
index 8eb51d39c164266342423c4e1a95f68807b87a3a..9a22c8b7ad23d7ffb272a240a92fe40e731f2d82 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ java-package (0.60) UNRELEASED; urgency=medium
   * Add build-essential as a dependency and drop the (now redundant)
     recommends on gcc.  (Closes: #787809)
 
+  [ Emmanuel Bourg ]
+  * Added jcontrol to the command line alternatives (Closes: #799370)
+
  -- tony mancill <tmancill@debian.org>  Thu, 18 Jun 2015 22:00:02 -0700
 
 java-package (0.59) unstable; urgency=medium

diff --git a/lib/oracle-jdk.sh b/lib/oracle-jdk.sh
index 1fa6657291016b37d0cd28a5079c60688fd376f3..a6a894a5138cc4ace71af23262ef0f05a980c3e5 100644 (file)
--- a/lib/oracle-jdk.sh
+++ b/lib/oracle-jdk.sh
@@ -101,7 +101,7 @@ EOF
         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 jcontrol"
       fi
       oracle_jre_lib_hl="jexec"
       oracle_bin_jdk="appletviewer extcheck idlj jar jarsigner javac javadoc javah javap jcmd jconsole jdb jdeps jhat jinfo jmap jmc jps jrunscript jsadebugd jstack jstat jstatd jvisualvm native2ascii rmic schemagen serialver wsgen wsimport xjc"

diff --git a/lib/oracle-jre.sh b/lib/oracle-jre.sh
index 2e1ab8ca5e93b546e508f860794f77f210ee38a1..d69de39dc57c023b94c527eae6078a8e8f3bbf85 100644 (file)
--- a/lib/oracle-jre.sh
+++ b/lib/oracle-jre.sh
@@ -78,7 +78,7 @@ EOF
       j2se_jinfo=oracle_j2re_jinfo
       oracle_jre_bin_hl="java javaws keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 policytool"
       oracle_jre_bin_jre="javaws policytool"
-      oracle_no_man_jre_bin_jre="ControlPanel"
+      oracle_no_man_jre_bin_jre="ControlPanel jcontrol"
       oracle_jre_lib_hl="jexec"
       j2re_run
     fi