[java-common] 01/04: Fixed update-java-alternatives to work with the new jdk-headless packages (Closes: #825987)

[Emmanuel Bourg]

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

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

commit 972cc52677e5244419f7967a85043a891d79a3a8
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jan 6 13:31:22 2017 +0100

    Fixed update-java-alternatives to work with the new jdk-headless packages (Closes: #825987)
---
 debian/changelog                 | 2 ++
 scripts/update-java-alternatives | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4181c0e..4d179cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 java-common (0.58) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Fixed update-java-alternatives to work with the new jdk-headless packages.
+    Thanks to Dominic Hargreaves for the patch (Closes: #825987)
   * Use secure Vcs-* URLs
   * Standards-Version updated to 3.9.8
   * Switch to debhelper level 10
diff --git a/scripts/update-java-alternatives b/scripts/update-java-alternatives
index 9eea19c..9fac614 100755
--- a/scripts/update-java-alternatives
+++ b/scripts/update-java-alternatives
@@ -63,7 +63,7 @@ done
 [ "$#" -eq 0 ] || usage 1
 [ -n "$action" ] || usage 1
 
-which='^(hl|jre|jdk|plugin|DUMMY) '
+which='^(hl|jre|jdk|jdkhl|plugin|DUMMY) '
 if [ -n "$hlonly$jreonly$pluginonly" ]; then
     which='^('
     [ -n "$hlonly" ] && which="${which}hl|"

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