This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository java-package.

commit fcab14d90fac6c2354140a59f8c68425239ad29d
Author: Emmanuel Bourg <[email protected]>
Date:   Fri Sep 18 22:14:14 2015 +0200

    Added jcontrol to the command line alternatives (Closes: #799370)
---
 debian/changelog  | 3 +++
 lib/oracle-jdk.sh | 2 +-
 lib/oracle-jre.sh | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8eb51d3..9a22c8b 100644
--- 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 <[email protected]>  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 1fa6657..a6a894a 100644
--- 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 2e1ab8c..d69de39 100644
--- 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

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/java-package.git

_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to