Subject: java-package: Does not work with IBM Java 5.0 (patch included)
Package: java-package
Version: 0.26
Severity: normal

*** Please type your report below this line ***

Version 0.26 of java-package does not work with IBM's Java release 5.0.
I've included a patch which updates the package to fix this.  The
package should allow the use of java-package with all available versions
of IBM's sdk and jre.

Kevin

-- System Information:
Debian Release: testing/unstable
  APT prefers breezy-updates
  APT policy: (500, 'breezy-updates'), (500, 'breezy-security'), (500,
'breezy')Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.12-9-686
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)

Versions of packages java-package depends on:
ii  coreutils                 5.2.1-2ubuntu2 The GNU core utilities
ii  debhelper                 4.9.5ubuntu1   helper programs for debian/rules
ii  fakeroot                  1.5.1ubuntu2   Gives a fake root environment
ii  unzip                     5.52-3ubuntu2  De-archiver for .zip files

java-package recommends no packages.

-- no debconf information
diff -Naur java-package-0.26.orig/debian/control java-package-0.26/debian/control
--- java-package-0.26.orig/debian/control	2005-08-29 14:37:54.000000000 -0700
+++ java-package-0.26/debian/control	2005-11-02 08:34:11.000000000 -0800
@@ -17,5 +17,5 @@
  Environments and Development Kits:
  .
   * Sun Microsystems(TM) 1.4 and 1.5 Standard Edition
-  * IBM(TM) 1.3 and 1.4 Standard Edition
+  * IBM(TM) 1.3, 1.4, and 5.0 Standard Edition
   * Blackdown Java-Linux 1.3 and 1.4 Standard Edition
diff -Naur java-package-0.26.orig/ibm-j2re5.0/install java-package-0.26/ibm-j2re5.0/install
--- java-package-0.26.orig/ibm-j2re5.0/install	1969-12-31 16:00:00.000000000 -0800
+++ java-package-0.26/ibm-j2re5.0/install	2005-11-02 08:04:18.000000000 -0800
@@ -0,0 +1,58 @@
+suffix=j2re5.0-ibm
+j2se_base="/usr/lib/$suffix"
+priority=314
+
+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"
+}
+
+program_alternative java
+program_alternative javaw
+program_alternative rmid
+program_alternative rmiregistry
+
+# the plugin is only available for i386 architecture
+
+if [ $(dpkg --print-architecture) = i386 ] ; then
+
+    # assemble the plugin path
+    plugin_dir="$j2se_base/jre/bin"
+
+    # 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/libjavaplugin_oji.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/libjavaplugin_ojigtk2.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/libjavaplugin_ojigtk2.so" "$priority"
+
+fi
diff -Naur java-package-0.26.orig/ibm-j2re5.0/remove java-package-0.26/ibm-j2re5.0/remove
--- java-package-0.26.orig/ibm-j2re5.0/remove	1969-12-31 16:00:00.000000000 -0800
+++ java-package-0.26/ibm-j2re5.0/remove	2005-11-02 08:05:45.000000000 -0800
@@ -0,0 +1,39 @@
+suffix=j2re5.0-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 java
+program_alternative javaw
+program_alternative rmid
+program_alternative rmiregistry
+
+# the plugin is only available for i386 architecture
+if [ $(dpkg --print-architecture) = i386 ] ; then
+
+    # assemble the plugin path
+    plugin_dir="$j2se_base/jre/bin"
+
+    # netscape
+    update-alternatives \
+        --remove "netscape-javaplugin.so" "$plugin_dir/libjavaplugin_oji.so"
+
+    # mozilla
+    update-alternatives \
+        --remove "mozilla-javaplugin.so" "$plugin_dir/libjavaplugin_ojigtk2.so"
+
+    # firefox
+    update-alternatives \
+        --remove "firefox-javaplugin.so" "$plugin_dir/libjavaplugin_ojigtk2.so"
+
+fi
diff -Naur java-package-0.26.orig/ibm-j2sdk5.0/install java-package-0.26/ibm-j2sdk5.0/install
--- java-package-0.26.orig/ibm-j2sdk5.0/install	1969-12-31 16:00:00.000000000 -0800
+++ java-package-0.26/ibm-j2sdk5.0/install	2005-11-01 12:10:17.000000000 -0800
@@ -0,0 +1,68 @@
+suffix=j2sdk5.0-ibm
+j2se_base="/usr/lib/$suffix"
+priority=314
+
+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 idlj
+program_alternative jar
+program_alternative java
+program_alternative javac
+program_alternative javadoc
+program_alternative javah
+program_alternative javap
+program_alternative jdb
+program_alternative rmic
+program_alternative rmid
+program_alternative rmiregistry
+program_alternative serialver
+
+# the plugin is only available for i386 architecture
+
+if [ $(dpkg --print-architecture) = i386 ] ; then
+
+    # assemble the plugin path
+    plugin_dir="$j2se_base/jre/bin"
+
+    # 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/libjavaplugin_oji.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/libjavaplugin_ojigtk2.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/libjavaplugin_ojigtk2.so" "$priority"
+
+fi
diff -Naur java-package-0.26.orig/ibm-j2sdk5.0/remove java-package-0.26/ibm-j2sdk5.0/remove
--- java-package-0.26.orig/ibm-j2sdk5.0/remove	1969-12-31 16:00:00.000000000 -0800
+++ java-package-0.26/ibm-j2sdk5.0/remove	2005-11-02 08:06:26.000000000 -0800
@@ -0,0 +1,48 @@
+suffix=j2sdk5.0-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 idlj
+program_alternative jar
+program_alternative java
+program_alternative javac
+program_alternative javadoc
+program_alternative javah
+program_alternative javap
+program_alternative jdb
+program_alternative rmic
+program_alternative rmid
+program_alternative rmiregistry
+program_alternative serialver
+
+# the plugin is only available for i386 architecture
+if [ $(dpkg --print-architecture) = i386 ] ; then
+
+    # assemble the plugin path
+    plugin_dir="$j2se_base/jre/bin"
+
+    # netscape
+    update-alternatives \
+        --remove "netscape-javaplugin.so" "$plugin_dir/libjavaplugin_oji.so"
+
+    # mozilla
+    update-alternatives \
+        --remove "mozilla-javaplugin.so" "$plugin_dir/libjavaplugin_ojigtk2.so"
+
+    # firefox
+    update-alternatives \
+        --remove "firefox-javaplugin.so" "$plugin_dir/libjavaplugin_ojigtk2.so"
+
+fi
diff -Naur java-package-0.26.orig/lib/ibm-j2re.sh java-package-0.26/lib/ibm-j2re.sh
--- java-package-0.26.orig/lib/ibm-j2re.sh	2005-07-09 05:22:45.000000000 -0700
+++ java-package-0.26/lib/ibm-j2re.sh	2005-11-02 08:34:32.000000000 -0800
@@ -15,6 +15,11 @@
 	    j2se_expected_min_size=37 #  bytes
 	    found=true
 	    ;;
+        "ibm-java2-jre-50-linux-i386.tgz") # SUPPORTED
+            j2se_version=5.0
+            j2se_expected_min_size=40 # 40.7 Mbytes
+            found=true
+            ;;
       esac
       ;;
     amd64|x86_64-linux)
@@ -24,6 +29,11 @@
 	    j2se_expected_min_size=37
 	    found=true
 	    ;;
+        "ibm-java2-jre-50-linux-x86_64.tgz") # SUPPORTED
+            j2se_version=5.0
+            j2se_expected_min_size=42 # 42.7 Mbytes
+            found=true
+            ;;
       esac
       ;;
     s390|s390-linux)
@@ -48,6 +58,16 @@
 	    j2se_expected_min_size=34
 	    found=true
 	    ;;
+        "ibm-java2-jre-50-linux-s390.tgz") # SUPPORTED
+            j2se_version=5.0
+            j2se_expected_min_size=42 # 42.7 Mbytes
+            found=true
+            ;;
+        "ibm-java2-jre-50-linux-s390x.tgz") # SUPPORTED
+            j2se_version=5.0
+            j2se_expected_min_size=42 # 42.7 Mbytes
+            found=true
+            ;;
       esac
       ;;
     powerpc|powerpc-linux)
@@ -62,6 +82,11 @@
 	    j2se_expected_min_size=40 #  bytes
 	    found=true
 	    ;;
+        "ibm-java2-jre-50-linux-ppc.tgz") # SUPPORTED
+            j2se_version=5.0
+            j2se_expected_min_size=46 # 46.9 Mbytes
+            found=true
+            ;;
       esac
       ;;
     powerpc64|powerpc64-linux)
@@ -72,6 +97,7 @@
 	    found=true
 	    ;;
       esac
+      # Note: ibm-java2-jre-50-linux-ppc64 not available as of 20051002
       ;;
   esac
   if [[ -n "$found" ]]; then
diff -Naur java-package-0.26.orig/lib/ibm-j2sdk.sh java-package-0.26/lib/ibm-j2sdk.sh
--- java-package-0.26.orig/lib/ibm-j2sdk.sh	2005-08-29 14:37:56.000000000 -0700
+++ java-package-0.26/lib/ibm-j2sdk.sh	2005-11-02 08:31:06.000000000 -0800
@@ -15,6 +15,11 @@
 	    j2se_expected_min_size=49 # 56719533 bytes
 	    found=true
 	    ;;
+        "ibm-java2-sdk-50-linux-i386.tgz") # SUPPORTED
+	    j2se_version=5.0
+	    j2se_expected_min_size=50 # 58162719 bytes
+	    found=true
+	    ;;
       esac
       ;;
     amd64|x86_64-linux)
@@ -24,6 +29,11 @@
 	    j2se_expected_min_size=52
 	    found=true
 	    ;;
+        "ibm-java2-sdk-50-linux-x86_64.tgz") # SUPPORTED
+            j2se_version=5.0
+            j2se_expected_min_size=58 # 58.3 Mbytes
+            found=true
+            ;;
       esac
       ;;
     powerpc|powerpc-linux)
@@ -43,6 +53,11 @@
 	    j2se_expected_min_size=51 # 59313669 bytes
 	    found=true
 	    ;;
+        "ibm-java2-sdk-50-linux-ppc.tgz") # SUPPORTED
+            j2se_version=5.0
+            j2se_expected_min_size=64 # 64.2 Mbytes
+            found=true
+            ;;
       esac
       ;;
     powerpc64|powerpc64-linux)
@@ -52,6 +67,7 @@
 	    j2se_expected_min_size=55
 	    found=true
 	    ;;
+        # Note: ibm-java2-sdk-50-linux-ppc64 not available as of 20051002
       esac
       ;;
     s390|s390-linux)
@@ -76,6 +92,16 @@
 	    j2se_expected_min_size=20
 	    found=true
 	    ;;
+        "ibm-java2-sdk-50-linux-s390.tgz") # SUPPORTED
+            j2se_version=5.0
+            j2se_expected_min_size=58 # 58.3 Mbytes
+            found=true
+            ;;
+        "ibm-java2-sdk-50-linux-s390x.tgz") # SUPPORTED
+            j2se_version=5.0
+            j2se_expected_min_size=58 # 58.4 Mbytes
+            found=true
+            ;;
       esac
       ;;
   esac
_______________________________________________
pkg-java-maintainers mailing list
pkg-java-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers

Reply via email to