diff -U 3 -P -r java-package/sun-j2sdk1.6/install java-package-fixed/sun-j2sdk1.6/install
--- java-package/sun-j2sdk1.6/install	1969-12-31 21:00:00.000000000 -0300
+++ java-package-fixed/sun-j2sdk1.6/install	2006-06-06 03:27:50.000000000 -0300
@@ -0,0 +1,88 @@
+suffix=j2sdk1.6-sun
+j2se_base="/usr/lib/$suffix"
+priority=315
+
+if [ ! -e "$j2se_base/debian/info" ]; then
+    exit 0
+fi
+
+# alternative <program>
+function program_alternative() {
+    local program="$1"
+    update-alternatives \
+	--install "/usr/bin/$program" "$program" \
+	"$j2se_base/bin/$program" "$priority" \
+	--slave "/usr/share/man/man1/$program.1.gz" "$program.1.gz" \
+	"$j2se_base/man/man1/$program.1.gz"
+}
+# kinit, klist, and ktab not installed at this
+# time; handling of /etc/krb5.conf not addressed
+# JRE-specific alternatives with JDKs cannot be 
+# handled by our current approach
+program_alternative appletviewer
+program_alternative apt
+program_alternative ControlPanel
+program_alternative extcheck
+program_alternative HtmlConverter
+program_alternative idlj
+program_alternative jar
+program_alternative jarsigner
+program_alternative java
+program_alternative javac
+program_alternative javadoc
+program_alternative javah
+program_alternative javap
+program_alternative java-rmi.cgi
+program_alternative javaws
+program_alternative jconsole
+program_alternative jdb
+program_alternative jinfo
+program_alternative jmap
+program_alternative jps
+program_alternative jsadebugd
+program_alternative jstack
+program_alternative jstat
+program_alternative jstatd
+program_alternative keytool
+program_alternative native2ascii
+program_alternative orbd
+program_alternative pack200
+program_alternative policytool
+program_alternative rmic
+program_alternative rmid
+program_alternative rmiregistry
+program_alternative serialver
+program_alternative servertool
+program_alternative tnameserv
+program_alternative unpack200
+
+# derive the architecture-specific 
+# directory for the plugin
+arch_dir="$(dpkg --print-architecture)"
+
+# assemble the plugin path
+plugin_dir="$j2se_base/jre/plugin/$arch_dir"
+
+# netscape
+netscape_dir="/usr/lib/netscape/plugins-libc6"
+[ -d "$netscape_dir" ] || install -d -m 755 "$netscape_dir"
+update-alternatives \
+    --install "$netscape_dir/libjavaplugin.so" \
+	"netscape-javaplugin.so" \
+    	"$plugin_dir/ns4/libjavaplugin.so" "$priority"
+
+# mozilla
+mozilla_dir="/usr/lib/mozilla/plugins"
+[ -d "$mozilla_dir" ] || install -d -m 755 "$mozilla_dir"
+update-alternatives \
+    --install "$mozilla_dir/libjavaplugin.so" \
+	"mozilla-javaplugin.so" \
+    	"$plugin_dir/ns7/libjavaplugin_oji.so" "$priority"
+
+# firefox
+firefox_dir="/usr/lib/firefox/plugins"
+[ -d "$firefox_dir" ] || install -d -m 755 "$firefox_dir"
+update-alternatives \
+    --install "$firefox_dir/libjavaplugin.so" \
+	"firefox-javaplugin.so" \
+    	"$plugin_dir/ns7/libjavaplugin_oji.so" "$priority"
diff -U 3 -P -r java-package/sun-j2sdk1.6/remove java-package-fixed/sun-j2sdk1.6/remove
--- java-package/sun-j2sdk1.6/remove	1969-12-31 21:00:00.000000000 -0300
+++ java-package-fixed/sun-j2sdk1.6/remove	2006-06-06 03:27:50.000000000 -0300
@@ -0,0 +1,69 @@
+suffix=j2sdk1.6-sun
+j2se_base="/usr/lib/$suffix"
+
+if [ ! -e "$j2se_base/debian/info" ]; then
+    exit 0
+fi
+
+# alternative <program>
+function program_alternative() {
+    local program="$1"
+    update-alternatives \
+	--remove "$program" "$j2se_base/bin/$program"
+}
+
+program_alternative appletviewer
+program_alternative apt
+program_alternative ControlPanel
+program_alternative extcheck
+program_alternative HtmlConverter
+program_alternative idlj
+program_alternative jar
+program_alternative jarsigner
+program_alternative java
+program_alternative javac
+program_alternative javadoc
+program_alternative javah
+program_alternative javap
+program_alternative java-rmi.cgi
+program_alternative javaws
+program_alternative jconsole
+program_alternative jdb
+program_alternative jinfo
+program_alternative jmap
+program_alternative jps
+program_alternative jsadebugd
+program_alternative jstack
+program_alternative jstat
+program_alternative jstatd
+program_alternative keytool
+program_alternative native2ascii
+program_alternative orbd
+program_alternative pack200
+program_alternative policytool
+program_alternative rmic
+program_alternative rmid
+program_alternative rmiregistry
+program_alternative serialver
+program_alternative servertool
+program_alternative tnameserv
+program_alternative unpack200
+
+# derive the architecture-specific 
+# directory for the plugin
+arch_dir="$(dpkg --print-architecture)"
+
+# assemble the plugin path
+plugin_dir="$j2se_base/plugin/$arch_dir"
+
+# netscape
+update-alternatives \
+    --remove "netscape-javaplugin.so" "$plugin_dir/ns4/libjavaplugin.so"
+
+# mozilla
+update-alternatives \
+    --remove "mozilla-javaplugin.so" "$plugin_dir/ns7/libjavaplugin_oji.so"
+
+# firefox
+update-alternatives \
+    --remove "firefox-javaplugin.so" "$plugin_dir/ns7/libjavaplugin_oji.so"
diff -U 3 -P -r java-package/sun-j2sdk1.6-doc/install java-package-fixed/sun-j2sdk1.6-doc/install
--- java-package/sun-j2sdk1.6-doc/install	1969-12-31 21:00:00.000000000 -0300
+++ java-package-fixed/sun-j2sdk1.6-doc/install	2006-06-06 03:27:50.000000000 -0300
@@ -0,0 +1,16 @@
+j2se_base="/usr/share/doc/j2sdk1.6-sun-doc"
+priority=314
+
+if [ ! -e "$j2se_base/debian/info" ]; then
+    exit 0
+fi
+
+# Register the documentation with the various 
+# documentation systems, i.e. dhelp and dwww.
+
+if [ "$1" = configure ] ; then
+    if which install-docs >/dev/null 2>&1; then
+        install-docs -i /usr/share/doc-base/sun-j2sdk1.6-doc
+    fi
+fi
+
diff -U 3 -P -r java-package/sun-j2sdk1.6-doc/remove java-package-fixed/sun-j2sdk1.6-doc/remove
--- java-package/sun-j2sdk1.6-doc/remove	1969-12-31 21:00:00.000000000 -0300
+++ java-package-fixed/sun-j2sdk1.6-doc/remove	2006-06-06 03:27:50.000000000 -0300
@@ -0,0 +1,7 @@
+j2se_base="/usr/share/doc/j2sdk1.6-sun-doc"
+
+if [ ! -e "$j2se_base/debian/info" ]; then
+    exit 0
+fi
+
+
diff -U 3 -P -r java-package/sun-j2sdk.sh java-package-fixed/sun-j2sdk.sh
--- java-package/sun-j2sdk.sh	2005-11-09 14:09:50.000000000 -0200
+++ java-package-fixed/sun-j2sdk.sh	2006-06-06 03:27:50.000000000 -0300
@@ -35,6 +35,11 @@
 	    j2se_expected_min_size=130
 	    found=true
 	    ;;
+	"jdk-6-beta-linux-i586.bin") # SUPPORTED
+	    j2se_version=1.6.0+beta
+	    j2se_expected_min_size=130
+	    found=true
+	    ;;
       esac
       ;;
     "ia64-linux")

Reply via email to