I'm going to NMU to unstable a fixed version of kaffe as soon the
build is complete. Attached you can find the current debdiff.

AFAICT Patrick's patch was missing the fix for kaffe's pre*inst*. The
attached patch fixes that as well.

Cheers.

-- 
Stefano Zacchiroli -*- PhD in Computer Science \ PostDoc @ Univ. Paris 7
[EMAIL PROTECTED],pps.jussieu.fr,debian.org} -<>- http://upsilon.cc/zack/
Dietro un grande uomo c'รจ sempre /oo\ All one has to do is hit the right
uno zaino        -- A.Bergonzoni \__/ keys at the right time -- J.S.Bach
diff -u kaffe-1.1.8/debian/kaffe.prerm kaffe-1.1.8/debian/kaffe.prerm
--- kaffe-1.1.8/debian/kaffe.prerm
+++ kaffe-1.1.8/debian/kaffe.prerm
@@ -6,7 +6,6 @@
 if [ "$1" != "upgrade" ] ; then
 	for file in appletviewer jar java javac javadoc javah javakey javap jdb native2ascii rmic rmiregistry serialver ; do
 		update-alternatives --remove $file /etc/alternatives/kaffe-system/bin/$file || true
-		update-alternatives --auto $file || true
 	done
 fi
 
diff -u kaffe-1.1.8/debian/kaffe.preinst kaffe-1.1.8/debian/kaffe.preinst
--- kaffe-1.1.8/debian/kaffe.preinst
+++ kaffe-1.1.8/debian/kaffe.preinst
@@ -5,7 +5,6 @@
 if [ "$1" = "upgrade" ] ; then
 	for file in appletviewer jar java javac javadoc javah javakey javap jdb native2ascii rmic rmiregistry serialver ; do
 		update-alternatives --remove $file /usr/lib/kaffe/bin/$file || true
-		update-alternatives --auto $file || true
 	done
 fi
 
diff -u kaffe-1.1.8/debian/changelog kaffe-1.1.8/debian/changelog
--- kaffe-1.1.8/debian/changelog
+++ kaffe-1.1.8/debian/changelog
@@ -1,3 +1,12 @@
+kaffe (2:1.1.8-5.2) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Avoid making kaffe the default java compiler upon configuration,
+    overriding local choices. Thanks to Patrick Schoenfeld for the patch.
+    Closes: #434647
+
+ -- Stefano Zacchiroli <[EMAIL PROTECTED]>  Sun, 26 Oct 2008 19:25:03 +0100
+
 kaffe (2:1.1.8-5.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u kaffe-1.1.8/debian/jikes-kaffe.prerm kaffe-1.1.8/debian/jikes-kaffe.prerm
--- kaffe-1.1.8/debian/jikes-kaffe.prerm
+++ kaffe-1.1.8/debian/jikes-kaffe.prerm
@@ -3,7 +3,6 @@
 case "$1" in
   upgrade | remove)
     update-alternatives --remove javac /usr/bin/jikes-kaffe || true
-    update-alternatives --auto javac || true
    ;;
 esac
 

Reply via email to