Package: java-package
Version: 0.27
Followup-For: Bug #341749
Ok, I've made a proper patch this time since I needed to get these new packages
built for distribution. This patch only applies to building IBM Java v5
packages.
If for some odd reason you want to build a Sun package, it shouldn't take much
to migrate this. Same goes to migrating back to v1.4.
To complicate things slightly, and at the same time simplyify things too, this
patch actually fixes 3 bugs, this one (341749), 338569 - can't run java programs
via two symlinks (which makes the package completly unusable) & 341751 -
installs
incorrect (non-existant) java plugin for ibm java 5.0 (which prevents the
firefox
plugin working at all).
Sorry if that confuses things for the maintainer.
Again this patch only covers IBM Java 1.5/5.0. The firefox 1.5 plugin issue will
need migrating to 1.3/1.4 & sun. The can't run progs via two symlinks issue will
need migrating to 1.3/1.4.
Richard.
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.14-2-686
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Versions of packages java-package depends on:
ii coreutils 5.93-5 The GNU core utilities
ii debhelper 5.0.7 helper programs for debian/rules
ii fakeroot 1.5.5 Gives a fake root environment
ii unzip 5.52-5 De-archiver for .zip files
java-package recommends no packages.
-- no debconf information
diff -ru java-package.old/ibm-j2re1.5/install java-package/ibm-j2re1.5/install
--- java-package.old/ibm-j2re1.5/install 2005-12-03 11:14:06.000000000
+0000
+++ java-package/ibm-j2re1.5/install 2005-12-03 11:34:34.000000000 +0000
@@ -12,9 +12,14 @@
# 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" \
- "$j2se_base/bin/$program" "$priority"
+ "/usr/bin/$program-$suffix" "$priority"
}
# kinit, klist, and ktab not installed at this
@@ -62,6 +67,14 @@
update-alternatives \
--install "$firefox_dir/libjavaplugin.so" \
"firefox-javaplugin.so" \
- "$plugin_dir/libjavaplugin_ojigcc3.so" "$priority"
+ "$plugin_dir/libjavaplugin_ojigtk2.so" "$priority"
+
+ # firefox 1.5+
+ firefox15_dir="/usr/lib/firefox/plugins"
+ [ -d "$firefox15_dir" ] || install -d -m 755 "$firefox15_dir"
+ update-alternatives \
+ --install "$firefox15_dir/libjavaplugin.so" \
+ "firefox-1.5-javaplugin.so" \
+ "$plugin_dir/libjavaplugin_ojigtk2.so" "$priority"
fi
diff -ru java-package.old/ibm-j2re1.5/remove java-package/ibm-j2re1.5/remove
--- java-package.old/ibm-j2re1.5/remove 2005-12-03 11:14:06.000000000 +0000
+++ java-package/ibm-j2re1.5/remove 2005-12-03 11:35:12.000000000 +0000
@@ -12,7 +12,8 @@
function program_alternative() {
local program="$1"
update-alternatives \
- --remove "$program" "$j2se_base/bin/$program"
+ --remove "$program" "/usr/bin/$program-$suffix"
+ rm "/usr/bin/$program-$suffix"
}
program_alternative ControlPanel
@@ -45,6 +46,10 @@
# firefox
update-alternatives \
- --remove "firefox-javaplugin.so" "$plugin_dir/libjavaplugin_ojigcc3.so"
+ --remove "firefox-javaplugin.so" "$plugin_dir/libjavaplugin_ojigtk2.so"
+
+ # firefox 1.5+
+ update-alternatives \
+ --remove "firefox-1.5-javaplugin.so"
"$plugin_dir/libjavaplugin_ojigtk2.so"
fi
diff -ru java-package.old/ibm-j2sdk1.5/install java-package/ibm-j2sdk1.5/install
--- java-package.old/ibm-j2sdk1.5/install 2005-12-03 11:14:06.000000000
+0000
+++ java-package/ibm-j2sdk1.5/install 2005-12-03 11:31:43.000000000 +0000
@@ -9,9 +9,14 @@
# 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" \
- "$j2se_base/bin/$program" "$priority"
+ "/usr/bin/$program-$suffix" "$priority"
}
program_alternative appletviewer
@@ -70,6 +75,14 @@
update-alternatives \
--install "$firefox_dir/libjavaplugin.so" \
"firefox-javaplugin.so" \
- "$plugin_dir/libjavaplugin_ojigcc3.so" "$priority"
+ "$plugin_dir/libjavaplugin_ojigtk2.so" "$priority"
+
+ # firefox 1.5+
+ firefox15_dir="/usr/lib/firefox/plugins"
+ [ -d "$firefox15_dir" ] || install -d -m 755 "$firefox15_dir"
+ update-alternatives \
+ --install "$firefox15_dir/libjavaplugin.so" \
+ "firefox-1.5-javaplugin.so" \
+ "$plugin_dir/libjavaplugin_ojigtk2.so" "$priority"
fi
diff -ru java-package.old/ibm-j2sdk1.5/remove java-package/ibm-j2sdk1.5/remove
--- java-package.old/ibm-j2sdk1.5/remove 2005-12-03 11:14:06.000000000
+0000
+++ java-package/ibm-j2sdk1.5/remove 2005-12-03 11:29:38.000000000 +0000
@@ -9,7 +9,8 @@
function program_alternative() {
local program="$1"
update-alternatives \
- --remove "$program" "/$j2se_base/bin/$program"
+ --remove "$program" "/usr/bin/$program-$suffix"
+ rm "/usr/bin/$program-$suffix"
}
program_alternative appletviewer
@@ -55,6 +56,10 @@
# firefox
update-alternatives \
- --remove "firefox-javaplugin.so" "$plugin_dir/libjavaplugin_ojigcc3.so"
+ --remove "firefox-javaplugin.so" "$plugin_dir/libjavaplugin_ojigtk2.so"
+
+ # firefox 1.5+
+ update-alternatives \
+ --remove "firefox-1.5-javaplugin.so"
"$plugin_dir/libjavaplugin_ojigtk2.so"
fi
_______________________________________________
pkg-java-maintainers mailing list
pkg-java-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers
