Followup-For: Bug #775072

Hi,

attached is an updated patch for openjdk-7-jre to clean up the ancient
alternatives.

Unfortunately I couldn't test it due to the "10 years" FTBFS #775044


Andreas
diff -Nru openjdk-7-7u71-2.5.3/debian/JB-jre.preinst.in openjdk-7-7u71-2.5.3/debian/JB-jre.preinst.in
--- openjdk-7-7u71-2.5.3/debian/JB-jre.preinst.in	2014-10-17 02:09:34.000000000 +0200
+++ openjdk-7-7u71-2.5.3/debian/JB-jre.preinst.in	2013-01-11 01:04:52.000000000 +0100
@@ -10,6 +10,18 @@
 old_basedir=/usr/lib/jvm/java-7-openjdk
 jre_tools='policytool'
 
+
+case "$1" in
+    install|upgrade)
+	# cleanup obsolete alternatives left by openjdk-6-jre/squeeze
+	if dpkg --compare-versions "$2" lt "7u71-2.5.3-3~"; then
+	    for i in javaws pluginappletviewer; do
+		update-alternatives --remove $i /usr/lib/jvm/java-6-openjdk/jre/bin/$i || true
+	    done
+	fi
+	;;
+esac
+
 case "$1" in
     upgrade)
 	if [ -n "$multiarch" ] && [ -n "$2" ]; then
diff -Nru openjdk-7-7u71-2.5.3/debian/changelog openjdk-7-7u71-2.5.3/debian/changelog
--- openjdk-7-7u71-2.5.3/debian/changelog	2014-11-13 11:10:36.000000000 +0100
+++ openjdk-7-7u71-2.5.3/debian/changelog	2013-01-11 01:10:06.000000000 +0100
@@ -1,3 +1,10 @@
+openjdk-7 (7u71-2.5.3-3) UNRELEASED; urgency=medium
+
+  * Cleanup obsolete alternatives (javaws, pluginappletviewer) left by
+    openjdk-6-jre/squeeze.  (Closes: #xxxxxx)
+
+ -- Andreas Beckmann <[email protected]>  Sun, 11 Jan 2015 01:04:57 +0100
+
 openjdk-7 (7u71-2.5.3-2) unstable; urgency=medium
 
   * Regenerate the .orig.tar to omit a third hotspot tarball.

Reply via email to