r1863 - in trunk/java-package: debian ibm-j2re1.3 ibm-j2re1.4
ibm-j2re1.5 ibm-j2sdk1.3 ibm-j2sdk1.4 ibm-j2sdk1.5
Barry Hawkins
barryh-guest at costa.debian.org
Sun Feb 5 20:36:02 UTC 2006
Author: barryh-guest
Date: 2006-02-05 20:36:01 +0000 (Sun, 05 Feb 2006)
New Revision: 1863
Modified:
trunk/java-package/debian/changelog
trunk/java-package/ibm-j2re1.3/install
trunk/java-package/ibm-j2re1.3/remove
trunk/java-package/ibm-j2re1.4/install
trunk/java-package/ibm-j2re1.4/remove
trunk/java-package/ibm-j2re1.5/install
trunk/java-package/ibm-j2re1.5/remove
trunk/java-package/ibm-j2sdk1.3/install
trunk/java-package/ibm-j2sdk1.3/remove
trunk/java-package/ibm-j2sdk1.4/install
trunk/java-package/ibm-j2sdk1.4/remove
trunk/java-package/ibm-j2sdk1.5/install
trunk/java-package/ibm-j2sdk1.5/remove
Log:
Corrections to install/remove scripts for IBM JREs/JDKs
Modified: trunk/java-package/debian/changelog
===================================================================
--- trunk/java-package/debian/changelog 2006-02-05 17:23:15 UTC (rev 1862)
+++ trunk/java-package/debian/changelog 2006-02-05 20:36:01 UTC (rev 1863)
@@ -2,12 +2,12 @@
* Modified to reflect migration to Subversion
* Corrected test for AMD64 architecture during plug-in detection
- (Closes: #345775)
+ * Corrected detected version for IBM 1.5 JDK on AMD64 (Closes: #345775)
* Repaired alternatives handling for IBM JREs and JDKs (Closes: #338569)
* Corrected pathing for alternatives installation for Mozilla and
Firefox plugins (Closes: #341751)
- -- Barry Hawkins <barry at alltc.com> Mon, 05 Dec 2005 23:46:26 -0500
+ -- Barry Hawkins <barry at alltc.com> Sat, 04 Feb 2006 20:01:57 -0500
java-package (0.27) unstable; urgency=low
Modified: trunk/java-package/ibm-j2re1.3/install
===================================================================
--- trunk/java-package/ibm-j2re1.3/install 2006-02-05 17:23:15 UTC (rev 1862)
+++ trunk/java-package/ibm-j2re1.3/install 2006-02-05 20:36:01 UTC (rev 1863)
@@ -6,15 +6,17 @@
exit 0
fi
-# Append JRE directory for alternatives installation
-j2se_base=$j2se_base/jre
-
# 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" \
- "$j2se_base/bin/$program" "$priority"
+ "/usr/bin/$program-$suffix" "$priority"
}
program_alternative java
@@ -60,3 +62,4 @@
"$plugin_dir/libjavaplugin_oji.so" "$priority"
fi
+
Modified: trunk/java-package/ibm-j2re1.3/remove
===================================================================
--- trunk/java-package/ibm-j2re1.3/remove 2006-02-05 17:23:15 UTC (rev 1862)
+++ trunk/java-package/ibm-j2re1.3/remove 2006-02-05 20:36:01 UTC (rev 1863)
@@ -5,14 +5,12 @@
exit 0
fi
-# Append JRE directory for alternatives installation
-j2se_base=$j2se_base/jre
-
# alternative <program>
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 java
Modified: trunk/java-package/ibm-j2re1.4/install
===================================================================
--- trunk/java-package/ibm-j2re1.4/install 2006-02-05 17:23:15 UTC (rev 1862)
+++ trunk/java-package/ibm-j2re1.4/install 2006-02-05 20:36:01 UTC (rev 1863)
@@ -6,15 +6,17 @@
exit 0
fi
-# Append JRE directory for alternatives installation
-j2se_base=$j2se_base/jre
-
# 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" \
- "$j2se_base/bin/$program" "$priority"
+ "/usr/bin/$program-$suffix" "$priority"
}
# kinit, klist, and ktab not installed at this
Modified: trunk/java-package/ibm-j2re1.4/remove
===================================================================
--- trunk/java-package/ibm-j2re1.4/remove 2006-02-05 17:23:15 UTC (rev 1862)
+++ trunk/java-package/ibm-j2re1.4/remove 2006-02-05 20:36:01 UTC (rev 1863)
@@ -5,14 +5,12 @@
exit 0
fi
-# Append JRE directory for alternatives installation
-j2se_base=$j2se_base/jre
-
# alternative <program>
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 ikeyman
Modified: trunk/java-package/ibm-j2re1.5/install
===================================================================
--- trunk/java-package/ibm-j2re1.5/install 2006-02-05 17:23:15 UTC (rev 1862)
+++ trunk/java-package/ibm-j2re1.5/install 2006-02-05 20:36:01 UTC (rev 1863)
@@ -6,15 +6,17 @@
exit 0
fi
-# Append JRE directory for alternatives installation
-j2se_base=$j2se_base/jre
-
# 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" \
- "$j2se_base/bin/$program" "$priority"
+ "/usr/bin/$program-$suffix" "$priority"
}
# kinit, klist, and ktab not installed at this
@@ -54,7 +56,7 @@
update-alternatives \
--install "$mozilla_dir/libjavaplugin.so" \
"mozilla-javaplugin.so" \
- "$plugin_dir/libjavaplugin_ojigcc3.so" "$priority"
+ "$plugin_dir/libjavaplugin_oji.so" "$priority"
# firefox
firefox_dir="/usr/lib/mozilla-firefox/plugins"
@@ -62,6 +64,6 @@
update-alternatives \
--install "$firefox_dir/libjavaplugin.so" \
"firefox-javaplugin.so" \
- "$plugin_dir/libjavaplugin_ojigcc3.so" "$priority"
+ "$plugin_dir/libjavaplugin_oji.so" "$priority"
fi
Modified: trunk/java-package/ibm-j2re1.5/remove
===================================================================
--- trunk/java-package/ibm-j2re1.5/remove 2006-02-05 17:23:15 UTC (rev 1862)
+++ trunk/java-package/ibm-j2re1.5/remove 2006-02-05 20:36:01 UTC (rev 1863)
@@ -5,14 +5,12 @@
exit 0
fi
-# Append JRE directory for alternatives installation
-j2se_base=$j2se_base/jre
-
# alternative <program>
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
@@ -41,10 +39,10 @@
# mozilla
update-alternatives \
- --remove "mozilla-javaplugin.so" "$plugin_dir/libjavaplugin_ojigcc3.so"
+ --remove "mozilla-javaplugin.so" "$plugin_dir/libjavaplugin_oji.so"
# firefox
update-alternatives \
- --remove "firefox-javaplugin.so" "$plugin_dir/libjavaplugin_ojigcc3.so"
+ --remove "firefox-javaplugin.so" "$plugin_dir/libjavaplugin_oji.so"
fi
Modified: trunk/java-package/ibm-j2sdk1.3/install
===================================================================
--- trunk/java-package/ibm-j2sdk1.3/install 2006-02-05 17:23:15 UTC (rev 1862)
+++ trunk/java-package/ibm-j2sdk1.3/install 2006-02-05 20:36:01 UTC (rev 1863)
@@ -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
Modified: trunk/java-package/ibm-j2sdk1.3/remove
===================================================================
--- trunk/java-package/ibm-j2sdk1.3/remove 2006-02-05 17:23:15 UTC (rev 1862)
+++ trunk/java-package/ibm-j2sdk1.3/remove 2006-02-05 20:36:01 UTC (rev 1863)
@@ -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
Modified: trunk/java-package/ibm-j2sdk1.4/install
===================================================================
--- trunk/java-package/ibm-j2sdk1.4/install 2006-02-05 17:23:15 UTC (rev 1862)
+++ trunk/java-package/ibm-j2sdk1.4/install 2006-02-05 20:36:01 UTC (rev 1863)
@@ -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
Modified: trunk/java-package/ibm-j2sdk1.4/remove
===================================================================
--- trunk/java-package/ibm-j2sdk1.4/remove 2006-02-05 17:23:15 UTC (rev 1862)
+++ trunk/java-package/ibm-j2sdk1.4/remove 2006-02-05 20:36:01 UTC (rev 1863)
@@ -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
Modified: trunk/java-package/ibm-j2sdk1.5/install
===================================================================
--- trunk/java-package/ibm-j2sdk1.5/install 2006-02-05 17:23:15 UTC (rev 1862)
+++ trunk/java-package/ibm-j2sdk1.5/install 2006-02-05 20:36:01 UTC (rev 1863)
@@ -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
@@ -62,7 +67,7 @@
update-alternatives \
--install "$mozilla_dir/libjavaplugin.so" \
"mozilla-javaplugin.so" \
- "$plugin_dir/libjavaplugin_ojigcc3.so" "$priority"
+ "$plugin_dir/libjavaplugin_oji.so" "$priority"
# firefox
firefox_dir="/usr/lib/mozilla-firefox/plugins"
@@ -70,6 +75,6 @@
update-alternatives \
--install "$firefox_dir/libjavaplugin.so" \
"firefox-javaplugin.so" \
- "$plugin_dir/libjavaplugin_ojigcc3.so" "$priority"
+ "$plugin_dir/libjavaplugin_oji.so" "$priority"
fi
Modified: trunk/java-package/ibm-j2sdk1.5/remove
===================================================================
--- trunk/java-package/ibm-j2sdk1.5/remove 2006-02-05 17:23:15 UTC (rev 1862)
+++ trunk/java-package/ibm-j2sdk1.5/remove 2006-02-05 20:36:01 UTC (rev 1863)
@@ -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
@@ -51,10 +52,10 @@
# mozilla
update-alternatives \
- --remove "mozilla-javaplugin.so" "$plugin_dir/libjavaplugin_ojigcc3.so"
+ --remove "mozilla-javaplugin.so" "$plugin_dir/libjavaplugin_oji.so"
# firefox
update-alternatives \
- --remove "firefox-javaplugin.so" "$plugin_dir/libjavaplugin_ojigcc3.so"
+ --remove "firefox-javaplugin.so" "$plugin_dir/libjavaplugin_oji.so"
fi
More information about the pkg-java-commits
mailing list