summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuel Bourg <ebourg@apache.org>2017-01-06 13:31:22 +0100
committerEmmanuel Bourg <ebourg@apache.org>2017-01-06 13:31:22 +0100
commit972cc52677e5244419f7967a85043a891d79a3a8 (patch)
treeebc590f8b55b150e2db4baee3f9f666fc726f749
parent92e8b1dc9ab7fcf3a4b4668e5d13f58e48ad3468 (diff)
downloadjava-common-972cc52677e5244419f7967a85043a891d79a3a8.tar.gz
Fixed update-java-alternatives to work with the new jdk-headless packages (Closes: #825987)
-rw-r--r--debian/changelog2
-rwxr-xr-xscripts/update-java-alternatives2
2 files changed, 3 insertions, 1 deletions
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|"