[pkg-java] r3807 - in trunk/java-package: . debian ibm-j2re1.6 ibm-j2sdk1.6 lib sun-j2re1.6 sun-j2sdk1.5-doc sun-j2sdk1.6 sun-j2sdk1.6-doc

mkoch at alioth.debian.org mkoch at alioth.debian.org
Tue Jul 10 06:25:55 UTC 2007


Author: mkoch
Date: 2007-07-10 06:25:55 +0000 (Tue, 10 Jul 2007)
New Revision: 3807

Added:
   trunk/java-package/ibm-j2re1.6/
   trunk/java-package/ibm-j2re1.6/install
   trunk/java-package/ibm-j2re1.6/remove
   trunk/java-package/ibm-j2sdk1.6/
   trunk/java-package/ibm-j2sdk1.6/install
   trunk/java-package/ibm-j2sdk1.6/remove
   trunk/java-package/sun-j2re1.6/
   trunk/java-package/sun-j2re1.6/install
   trunk/java-package/sun-j2re1.6/remove
   trunk/java-package/sun-j2sdk1.6-doc/
   trunk/java-package/sun-j2sdk1.6-doc/install
   trunk/java-package/sun-j2sdk1.6-doc/remove
   trunk/java-package/sun-j2sdk1.6/
   trunk/java-package/sun-j2sdk1.6/install
   trunk/java-package/sun-j2sdk1.6/remove
Modified:
   trunk/java-package/debian/changelog
   trunk/java-package/lib/ibm-j2sdk.sh
   trunk/java-package/lib/sun-j2re.sh
   trunk/java-package/lib/sun-j2sdk-doc.sh
   trunk/java-package/sun-j2sdk1.5-doc/install
Log:
java-package (0.31) unstable; urgency=low

  * Reapplied changes from 0.28 to 0.29. Closes: 322843.

 -- Michael Koch <konqueror at gmx.de>  Tue, 10 Jul 2007 08:16:14 +0200



Modified: trunk/java-package/debian/changelog
===================================================================
--- trunk/java-package/debian/changelog	2007-07-08 07:44:20 UTC (rev 3806)
+++ trunk/java-package/debian/changelog	2007-07-10 06:25:55 UTC (rev 3807)
@@ -1,3 +1,9 @@
+java-package (0.31) unstable; urgency=low
+
+  * Reapplied changes from 0.28 to 0.29. Closes: 322843.
+
+ -- Michael Koch <konqueror at gmx.de>  Tue, 10 Jul 2007 08:16:14 +0200
+
 java-package (0.30) unstable; urgency=low
 
   * Added support for SUN JDK 6u2 (and following updates).

Added: trunk/java-package/ibm-j2re1.6/install
===================================================================
--- trunk/java-package/ibm-j2re1.6/install	                        (rev 0)
+++ trunk/java-package/ibm-j2re1.6/install	2007-07-10 06:25:55 UTC (rev 3807)
@@ -0,0 +1,72 @@
+
+    suffix=j2re1.6-ibm
+    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"
+        cat >/usr/bin/$program-$suffix <<EOF
+#! /bin/sh
+exec $j2se_base/jre/bin/$program \${1+"\$@"}
+EOF
+        chmod 755 /usr/bin/$program-$suffix
+        update-alternatives \
+            --install "/usr/bin/$program" "$program" \
+            "/usr/bin/$program-$suffix" "$priority"
+    }
+
+    # kinit, klist, and ktab not installed at this
+    # time; handling of /etc/krb5.conf not addressed
+    program_alternative ControlPanel
+    program_alternative ikeyman
+    program_alternative java
+    program_alternative javaw
+    program_alternative javaws
+    program_alternative jextract
+    program_alternative keytool
+    program_alternative pack200
+    program_alternative policytool
+    program_alternative rmid
+    program_alternative rmiregistry
+    program_alternative tnameserv
+    program_alternative unpack200
+
+    # assemble the plugin path
+    plugin_dir="$j2se_base/jre/bin"
+
+    # netscape
+    netscape_dir="/usr/lib/netscape/plugins-libc6"
+
+    install_java_plugin "$netscape_dir" "libjavaplugin.so" \
+            "netscape-javaplugin.so" \
+            "$plugin_dir/libjavaplugin_oji.so" \
+            "$priority"
+
+    # mozilla
+    mozilla_dir="/usr/lib/mozilla/plugins"
+
+    install_java_plugin "$mozilla_dir" "libjavaplugin.so" \
+            "mozilla-javaplugin.so" \
+            "$plugin_dir/libjavaplugin_oji.so" \
+            "$priority"
+
+    # mozilla-firefox
+    mozilla_firefox_dir="/usr/lib/mozilla-firefox/plugins"
+
+    install_java_plugin "$mozilla_firefox_dir" "libjavaplugin.so" \
+            "mozilla-firefox-javaplugin.so" \
+            "$plugin_dir/libjavaplugin_oji.so" \
+            "$priority"
+
+    # firefox (1.5+)
+    firefox_dir="/usr/lib/firefox/plugins"
+
+    install_java_plugin "$firefox_dir" "libjavaplugin.so"\
+            "firefox-javaplugin.so" \
+            "$plugin_dir/ns7/libjavaplugin_oji.so" \
+            "$priority"

Added: trunk/java-package/ibm-j2re1.6/remove
===================================================================
--- trunk/java-package/ibm-j2re1.6/remove	                        (rev 0)
+++ trunk/java-package/ibm-j2re1.6/remove	2007-07-10 06:25:55 UTC (rev 3807)
@@ -0,0 +1,48 @@
+
+    suffix=j2re1.6-ibm
+    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" "/usr/bin/$program-$suffix"
+        rm "/usr/bin/$program-$suffix"
+    }
+
+    program_alternative ControlPanel
+    program_alternative ikeyman
+    program_alternative java
+    program_alternative javaw
+    program_alternative javaws
+    program_alternative jextract
+    program_alternative keytool
+    program_alternative pack200
+    program_alternative policytool
+    program_alternative rmid
+    program_alternative rmiregistry
+    program_alternative tnameserv
+    program_alternative unpack200
+
+    # assemble the plugin path
+    plugin_dir="$j2se_base/jre/bin"
+
+    # netscape
+    remove_java_plugin "netscape-javaplugin.so" \
+            "$plugin_dir/libjavaplugin_oji.so"
+
+    # mozilla
+    remove_java_plugin "mozilla-javaplugin.so" \
+            "$plugin_dir/libjavaplugin_oji.so"
+
+    # mozilla-firefox (pre-1.5)
+    remove_java_plugin "mozilla-firefox-javaplugin.so"\
+            "$plugin_dir/libjavaplugin_oji.so"
+
+    # firefox
+    remove_java_plugin "firefox-javaplugin.so" \
+            "$plugin_dir/libjavaplugin_oji.so"

Added: trunk/java-package/ibm-j2sdk1.6/install
===================================================================
--- trunk/java-package/ibm-j2sdk1.6/install	                        (rev 0)
+++ trunk/java-package/ibm-j2sdk1.6/install	2007-07-10 06:25:55 UTC (rev 3807)
@@ -0,0 +1,83 @@
+
+    suffix=j2sdk1.6-ibm
+    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"
+        cat >/usr/bin/$program-$suffix <<EOF
+#! /bin/sh
+exec $j2se_base/bin/$program \${1+"\$@"}
+EOF
+        chmod 755 /usr/bin/$program-$suffix
+        update-alternatives \
+            --install "/usr/bin/$program" "$program" \
+            "/usr/bin/$program-$suffix" "$priority"
+    }
+
+    program_alternative appletviewer
+    program_alternative apt
+    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 javaw
+    program_alternative javaws
+    program_alternative jconsole
+    program_alternative jdb
+    program_alternative jdmpview
+    program_alternative keytool
+    program_alternative native2ascii
+    program_alternative policytool
+    program_alternative rmic
+    program_alternative rmid
+    program_alternative rmiregistry
+    program_alternative serialver
+    program_alternative tnameserv
+
+    # assemble the java plugin path
+    plugin_dir="$j2se_base/jre/bin"
+
+    # netscape
+    netscape_dir="/usr/lib/netscape/plugins-libc6"
+    
+    install_java_plugin "$netscape_dir" "libjavaplugin.so" \
+            "netscape-javaplugin.so" \
+            "$plugin_dir/libjavaplugin_oji.so" \
+            "$priority"
+
+    # mozilla
+    mozilla_dir="/usr/lib/mozilla/plugins"
+    
+    install_java_plugin "$mozilla_dir" "libjavaplugin.so" \
+            "mozilla-javaplugin.so" \
+            "$plugin_dir/libjavaplugin_oji.so" \
+            "$priority"
+
+    # mozilla-firefox (pre-1.5)
+    mozilla_firefox_dir="/usr/lib/mozilla-firefox/plugins"
+    
+    install_java_plugin "$mozilla_firefox_dir" "libjavaplugin.so" \
+            "mozilla-firefox-javaplugin.so" \
+            "$plugin_dir/libjavaplugin_oji.so" \
+            "$priority"
+
+    # firefox (1.5+)
+    firefox_dir="/usr/lib/firefox/plugins"
+    
+    install_java_plugin "$firefox_dir" "libjavaplugin.so" \
+            "firefox-javaplugin.so" \
+            "$plugin_dir/ns7/libjavaplugin_oji.so" \
+            "$priority"

Added: trunk/java-package/ibm-j2sdk1.6/remove
===================================================================
--- trunk/java-package/ibm-j2sdk1.6/remove	                        (rev 0)
+++ trunk/java-package/ibm-j2sdk1.6/remove	2007-07-10 06:25:55 UTC (rev 3807)
@@ -0,0 +1,61 @@
+
+    suffix=j2sdk1.6-ibm
+    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" "/usr/bin/$program-$suffix"
+        rm "/usr/bin/$program-$suffix"
+    }
+
+    program_alternative appletviewer
+    program_alternative apt
+    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 javaw
+    program_alternative javaws
+    program_alternative jconsole
+    program_alternative jdb
+    program_alternative jdmpview
+    program_alternative keytool
+    program_alternative native2ascii
+    program_alternative policytool
+    program_alternative rmic
+    program_alternative rmid
+    program_alternative rmiregistry
+    program_alternative serialver
+    program_alternative tnameserv
+
+    # assemble the plugin path
+    plugin_dir="$j2se_base/jre/bin"
+
+    # netscape
+    remove_java_plugin "netscape-javaplugin.so" \
+            "$plugin_dir/libjavaplugin_oji.so"
+
+    # mozilla
+    remove_java_plugin "mozilla-javaplugin.so" \
+            "$plugin_dir/libjavaplugin_oji.so"
+  
+    # mozilla-firefox (pre-1.5)
+    remove_java_plugin "mozilla-firefox-javaplugin.so" \
+            "$plugin_dir/libjavaplugin_oji.so"
+
+    # firefox (1.5+)
+    remove_java_plugin "firefox-javaplugin.so" \
+            "$plugin_dir/libjavaplugin_oji.so"

Modified: trunk/java-package/lib/ibm-j2sdk.sh
===================================================================
--- trunk/java-package/lib/ibm-j2sdk.sh	2007-07-08 07:44:20 UTC (rev 3806)
+++ trunk/java-package/lib/ibm-j2sdk.sh	2007-07-10 06:25:55 UTC (rev 3807)
@@ -20,6 +20,11 @@
 	    j2se_expected_min_size=56 # 58162719 bytes
 	    found=true
 	    ;;
+	"ibm-java-sdk-60-linux-i386-20070329.tgz" ) # SUPPORTED
+	    j2se_version=1.6.0
+	    j2se_expected_min_size=61 # 63942070 bytes
+	    found=true
+	    ;;
       esac
       ;;
     amd64|x86_64-linux-gnu)
@@ -34,6 +39,11 @@
 	    j2se_expected_min_size=57 # 59706399 bytes
 	    found=true
 	    ;;
+	"ibm-java-sdk-60-linux-x86_64-20070329.tgz" ) # SUPPORTED
+	    j2se_version=1.6.0
+	    j2se_expected_min_size=61 # 63942070 bytes
+	    found=true
+	    ;;
       esac
       ;;
     powerpc|powerpc-linux)
@@ -58,6 +68,11 @@
 	    j2se_expected_min_size=61 # 63942070 bytes
 	    found=true
 	    ;;
+	"ibm-java-sdk-60-linux-ppc32-20070329.tgz" ) # SUPPORTED
+	    j2se_version=1.6.0
+	    j2se_expected_min_size=61 # 63942070 bytes
+	    found=true
+	    ;;
       esac
       ;;
     powerpc64|powerpc64-linux)
@@ -72,6 +87,11 @@
 	    j2se_expected_min_size=61 # 63942070 bytes
 	    found=true
 	    ;;
+	"ibm-java-sdk-60-linux-ppc64-20070329.tgz" ) # SUPPORTED
+	    j2se_version=1.6.0
+	    j2se_expected_min_size=61 # 63942070 bytes
+	    found=true
+	    ;;
       esac
       ;;
     s390|s390-linux)
@@ -106,6 +126,11 @@
 	    j2se_expected_min_size=57 # 59773265 bytes
 	    found=true
 	    ;;
+	"ibm-java-sdk-60-linux-s390-20070329.tgz" ) # SUPPORTED
+	    j2se_version=1.6.0
+	    j2se_expected_min_size=61 # 63942070 bytes
+	    found=true
+	    ;;
       esac
       ;;
   esac

Modified: trunk/java-package/lib/sun-j2re.sh
===================================================================
--- trunk/java-package/lib/sun-j2re.sh	2007-07-08 07:44:20 UTC (rev 3806)
+++ trunk/java-package/lib/sun-j2re.sh	2007-07-10 06:25:55 UTC (rev 3807)
@@ -35,6 +35,16 @@
 	    j2se_expected_min_size=16 # 16542512 bytes
 	    found=true
 	    ;;
+	"jre-6-linux-i586.bin") # SUPPORTED
+	    j2se_version=1.6.0
+	    j2se_expected_min_size=16 # 16542512 bytes
+	    found=true
+	    ;;
+	"jre-6u"[0-9]"-linux-i586.bin") # SUPPORTED
+	    j2se_version=1.6.0+update${archive_name:6:1}
+	    j2se_expected_min_size=16 # 16542512 bytes
+	    found=true
+	    ;;
       esac
       ;;
     amd64|x86_64-linux-gnu)
@@ -49,6 +59,11 @@
 	    j2se_expected_min_size=60 # 69936 kB
 	    found=true
 	    ;;
+	"jre-6u"[0-9]"-linux-amd64.bin") # SUPPORTED
+	    j2se_version=1.6.0+update${archive_name:6:1}
+	    j2se_expected_min_size=16 # 16542512 bytes
+	    found=true
+	    ;;
       esac
       ;;
   esac

Modified: trunk/java-package/lib/sun-j2sdk-doc.sh
===================================================================
--- trunk/java-package/lib/sun-j2sdk-doc.sh	2007-07-08 07:44:20 UTC (rev 3806)
+++ trunk/java-package/lib/sun-j2sdk-doc.sh	2007-07-10 06:25:55 UTC (rev 3807)
@@ -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=44 # 44566 kB
+	    found=true
+	    ;;
       esac
   if [[ -n "$found" ]]; then
 	cat << EOF

Added: trunk/java-package/sun-j2re1.6/install
===================================================================
--- trunk/java-package/sun-j2re1.6/install	                        (rev 0)
+++ trunk/java-package/sun-j2re1.6/install	2007-07-10 06:25:55 UTC (rev 3807)
@@ -0,0 +1,63 @@
+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 javaws
+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"

Added: trunk/java-package/sun-j2re1.6/remove
===================================================================
--- trunk/java-package/sun-j2re1.6/remove	                        (rev 0)
+++ trunk/java-package/sun-j2re1.6/remove	2007-07-10 06:25:55 UTC (rev 3807)
@@ -0,0 +1,45 @@
+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 javaws
+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"

Modified: trunk/java-package/sun-j2sdk1.5-doc/install
===================================================================
--- trunk/java-package/sun-j2sdk1.5-doc/install	2007-07-08 07:44:20 UTC (rev 3806)
+++ trunk/java-package/sun-j2sdk1.5-doc/install	2007-07-10 06:25:55 UTC (rev 3807)
@@ -1,5 +1,5 @@
 j2se_base="/usr/share/doc/j2sdk1.5-sun-doc"
-priority=314
+priority=315
 
 if [ ! -e "$j2se_base/debian/info" ]; then
     exit 0

Added: trunk/java-package/sun-j2sdk1.6/install
===================================================================
--- trunk/java-package/sun-j2sdk1.6/install	                        (rev 0)
+++ trunk/java-package/sun-j2sdk1.6/install	2007-07-10 06:25:55 UTC (rev 3807)
@@ -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"

Added: trunk/java-package/sun-j2sdk1.6/remove
===================================================================
--- trunk/java-package/sun-j2sdk1.6/remove	                        (rev 0)
+++ trunk/java-package/sun-j2sdk1.6/remove	2007-07-10 06:25:55 UTC (rev 3807)
@@ -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"

Added: trunk/java-package/sun-j2sdk1.6-doc/install
===================================================================
--- trunk/java-package/sun-j2sdk1.6-doc/install	                        (rev 0)
+++ trunk/java-package/sun-j2sdk1.6-doc/install	2007-07-10 06:25:55 UTC (rev 3807)
@@ -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
+

Added: trunk/java-package/sun-j2sdk1.6-doc/remove
===================================================================
--- trunk/java-package/sun-j2sdk1.6-doc/remove	                        (rev 0)
+++ trunk/java-package/sun-j2sdk1.6-doc/remove	2007-07-10 06:25:55 UTC (rev 3807)
@@ -0,0 +1,7 @@
+j2se_base="/usr/share/doc/j2sdk1.6-sun-doc"
+
+if [ ! -e "$j2se_base/debian/info" ]; then
+    exit 0
+fi
+
+




More information about the pkg-java-commits mailing list