[SCM] live-helper branch, debian-next, updated. debian/2.0_a5-1-6-ge97165a

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit e97165ac0bc86be372484eef12c1f0de12b7758e
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Jan 24 09:09:47 2010 +0100

    Adding update-alternatives call to set sun-java as default java in sun-java example hook.

diff --git a/examples/hooks/all_chroot_sun-java6.sh b/examples/hooks/all_chroot_sun-java6.sh
index c86066f..5a75962 100755
--- a/examples/hooks/all_chroot_sun-java6.sh
+++ b/examples/hooks/all_chroot_sun-java6.sh
@@ -26,3 +26,6 @@ DEBIAN_FRONTEND="dialog" apt-get install --yes sun-java6-bin sun-java6-demo \
 # Ensure that /tmp has the right permissions; apparently sun-java5-doc tampers
 # with it
 chmod 1777 /tmp
+
+# Set sun-java as default java
+update-alternatives --set java /usr/lib/jvm/java-6-sun/jre/bin/java

-- 
live-helper