Hello, I have written a comprehensive patch that adds support for
j2sdk1.6, j2sdk1.6-doc, and j2sre1.6 to java-package. I'm aware that
soon enough sun-java-1.6 will be moved into the main tree, but I was
impatient. Anyway, if there are any changes I could make that might
convince you to use my patch, just let me know and I'll make them
right away. Just trying to help.
Regards,
Josiah Purtlebaugh
--
http://www.codelove.org
diff -Nru java-package-0.28/lib/sun-j2re.sh java-package-0.28-tor/lib/sun-j2re.sh
--- java-package-0.28/lib/sun-j2re.sh 2006-06-20 08:36:14.000000000 -0700
+++ java-package-0.28-tor/lib/sun-j2re.sh 2006-12-13 21:26:23.000000000 -0800
@@ -35,6 +35,11 @@
j2se_expected_min_size=16 # 16542512 bytes
found=true
;;
+ "jre-6-linux-i586.bin") # SUPPORTED
+ j2se_version=1.6.0
+ j2se_expected_min_size=97 # 98764 kB
+ found=true
+ ;;
esac
;;
amd64|x86_64-linux-gnu)
@@ -49,6 +54,11 @@
j2se_expected_min_size=60 # 69936 kB
found=true
;;
+ "jre-6-linux-amd64.bin") # SUPPORTED
+ j2se_version=1.6.0
+ j2se_expected_min_size=60 # FIXME: This is a guess.
+ found=true
+ ;;
esac
;;
esac
diff -Nru java-package-0.28/lib/sun-j2sdk-doc.sh java-package-0.28-tor/lib/sun-j2sdk-doc.sh
--- java-package-0.28/lib/sun-j2sdk-doc.sh 2006-06-20 08:36:14.000000000 -0700
+++ java-package-0.28-tor/lib/sun-j2sdk-doc.sh 2006-12-13 21:44:31.000000000 -0800
@@ -27,6 +27,11 @@
j2se_expected_min_size=44 # 44566 kB
found=true
;;
+ "jdk-6-doc.zip") # SUPPORTED
+ j2se_version=1.6.0
+ j2se_expected_min_size=52 # 52 mB
+ found=true
+ ;;
esac
if [[ -n "$found" ]]; then
cat << EOF
diff -Nru java-package-0.28/lib/sun-j2sdk.sh java-package-0.28-tor/lib/sun-j2sdk.sh
--- java-package-0.28/lib/sun-j2sdk.sh 2006-06-20 08:36:14.000000000 -0700
+++ java-package-0.28-tor/lib/sun-j2sdk.sh 2006-12-13 21:42:07.000000000 -0800
@@ -35,6 +35,11 @@
j2se_expected_min_size=130
found=true
;;
+ "jdk-1.6-linux-i586.bin") # SUPPORTED
+ j2se_version=1.6.0
+ j2se_expected_min_size=190 # 190320 kB
+ found=true
+ ;;
esac
;;
"ia64-linux")
@@ -68,6 +73,11 @@
j2se_expected_min_size=105
found=true
;;
+ "jdk-6-linux-amd64.bin") # SUPPORTED
+ j2se_version=1.6.0
+ j2se_expected_mind_size=120 # FIXME: This is a guess.
+ found=true
+ ;;
esac
;;
esac
diff -Nru java-package-0.28/make-jpkg.1 java-package-0.28-tor/make-jpkg.1
--- java-package-0.28/make-jpkg.1 2006-06-20 08:36:16.000000000 -0700
+++ java-package-0.28-tor/make-jpkg.1 2006-12-13 21:45:59.000000000 -0800
@@ -27,7 +27,7 @@
.PP
\fBmake-jpkg\fP creates a Debian package from a Java(TM) 2
distribution. This program works currently with the following Java(TM) 2 REs and SDKs:
- Sun Microsystems(TM) 1.4 and 1.5 Standard Edition
+ Sun Microsystems(TM) 1.4, 1.5 and 1.6 Standard Edition
IBM(TM) 1.3, 1.4, and 5.0 Standard Edition
Blackdown Java-Linux 1.3 and 1.4 Standard Edition
.PP
diff -Nru java-package-0.28/sun-j2re1.6/install java-package-0.28-tor/sun-j2re1.6/install
--- java-package-0.28/sun-j2re1.6/install 1969-12-31 16:00:00.000000000 -0800
+++ java-package-0.28-tor/sun-j2re1.6/install 2006-12-13 21:39:04.000000000 -0800
@@ -0,0 +1,65 @@
+suffix=j2re1.6-sun
+j2se_base="/usr/lib/$suffix"
+priority=316
+
+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
+program_alternative ControlPanel
+program_alternative java
+program_alternative java_vm
+program_alternative javaws
+program_alternative jcontrol
+program_alternative keytool
+program_alternative orbd
+program_alternative pack200
+program_alternative policytool
+program_alternative rmid
+program_alternative rmiregistry
+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
+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/mozilla-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 -Nru java-package-0.28/sun-j2re1.6/remove java-package-0.28-tor/sun-j2re1.6/remove
--- java-package-0.28/sun-j2re1.6/remove 1969-12-31 16:00:00.000000000 -0800
+++ java-package-0.28-tor/sun-j2re1.6/remove 2006-12-13 21:39:21.000000000 -0800
@@ -0,0 +1,47 @@
+suffix=j2re1.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 ControlPanel
+program_alternative java
+program_alternative java_vm
+program_alternative javaws
+program_alternative jcontrol
+program_alternative keytool
+program_alternative orbd
+program_alternative pack200
+program_alternative policytool
+program_alternative rmid
+program_alternative rmiregistry
+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 -Nru java-package-0.28/sun-j2sdk1.6/install java-package-0.28-tor/sun-j2sdk1.6/install
--- java-package-0.28/sun-j2sdk1.6/install 1969-12-31 16:00:00.000000000 -0800
+++ java-package-0.28-tor/sun-j2sdk1.6/install 2006-12-13 21:36:07.000000000 -0800
@@ -0,0 +1,95 @@
+suffix=j2sdk1.6-sun
+j2se_base="/usr/lib/$suffix"
+priority=316
+
+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 jcontrol
+program_alternative jdb
+program_alternative jhat
+program_alternative jinfo
+program_alternative jmap
+program_alternative jps
+program_alternative jrunscript
+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 schemagen
+program_alternative serialver
+program_alternative servertool
+program_alternative tnameserv
+program_alternative unpack200
+program_alternative wsgen
+program_alternative wsimport
+program_alternative xjc
+
+# 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/mozilla-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 -Nru java-package-0.28/sun-j2sdk1.6/remove java-package-0.28-tor/sun-j2sdk1.6/remove
--- java-package-0.28/sun-j2sdk1.6/remove 1969-12-31 16:00:00.000000000 -0800
+++ java-package-0.28-tor/sun-j2sdk1.6/remove 2006-12-13 21:35:54.000000000 -0800
@@ -0,0 +1,75 @@
+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 jcontrol
+program_alternative jdb
+program_alternative jinfo
+program_alternative jmap
+program_alternative jps
+program_alternative jrunscript
+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 schemagen
+program_alternative serialver
+program_alternative servertool
+program_alternative tnameserv
+program_alternative unpack200
+program_alternative wsgen
+program_alternative wsimport
+program_alternative xjc
+
+# 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 -Nru java-package-0.28/sun-j2sdk1.6-doc/install java-package-0.28-tor/sun-j2sdk1.6-doc/install
--- java-package-0.28/sun-j2sdk1.6-doc/install 1969-12-31 16:00:00.000000000 -0800
+++ java-package-0.28-tor/sun-j2sdk1.6-doc/install 2006-12-13 21:37:21.000000000 -0800
@@ -0,0 +1,16 @@
+j2se_base="/usr/share/doc/j2sdk1.6-sun-doc"
+priority=316
+
+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 -Nru java-package-0.28/sun-j2sdk1.6-doc/remove java-package-0.28-tor/sun-j2sdk1.6-doc/remove
--- java-package-0.28/sun-j2sdk1.6-doc/remove 1969-12-31 16:00:00.000000000 -0800
+++ java-package-0.28-tor/sun-j2sdk1.6-doc/remove 2006-12-13 21:37:31.000000000 -0800
@@ -0,0 +1,7 @@
+j2se_base="/usr/share/doc/j2sdk1.6-sun-doc"
+
+if [ ! -e "$j2se_base/debian/info" ]; then
+ exit 0
+fi
+
+
