CVS java-package/blackdown-j2re1.4

[Jeroen van Wolffelaar]

Update of /cvsroot/pkg-java/java-package/blackdown-j2re1.4
In directory haydn:/tmp/cvs-serv13883/blackdown-j2re1.4

Modified Files:
	install remove 
Log Message:
Patch provided by Joshua Kwan <joshk@debian.org>, doing the following of which
I'm not going to dissict back in per-fix changes:

  * Unclutter Debian build system and rework package slightly so that
    *debian packages are not needed anymore. The necessary files will be
    included in the generated packages. (Closes: #291145, #289245, #284779)
  * Add support for Blackdown 1.4.2+01 build. (Closes: #285405)
  * Fix support for Sun 1.5.0 amd64 builds due to typo. (Closes: #290879)
  * Mozilla browser plugin name changed in 1.4.2 versions. Detect and correct.
    (Closes: #273730)
  * Use DEBFULLNAME, DEBNAME and DEBEMAIL as first-priority defaults for
    maintainer name and email, if available. (Closes: #279653)
  * Use --block-size=1M instead of -BM. (Closes: #289005, #291161)
  * Disable support for Sun JDK 1.3 due to its dependencies on libraries
    that are simply not available anymore. (Closes: #272972)
  * Fix up short description a little bit.
  * Bump Standards-Version to 3.6.1 (no changes)
  * Be a bit more conservative with the real-root test.
  * Remove last j2se-package references.
  * Change Suggests on fakeroot to a Depends because it is worthless both
    as real root and as a normal user without fakeroot.



--- /cvsroot/pkg-java/java-package/blackdown-j2re1.4/install	2004/10/11 23:10:23	1.1.1.1
+++ /cvsroot/pkg-java/java-package/blackdown-j2re1.4/install	2005/01/24 23:07:38	1.2
@@ -1,11 +1,12 @@
-#! /bin/bash -e
-
-
 j2se_base="/usr/lib/j2re1.4-blackdown"
-priority=200
+
+# due to prior brokenness
+priority=250
 
 if [ ! -e "$j2se_base/debian/info" ]; then
     exit 0
+else
+	. "$j2se_base/debian/info"
 fi
 
 # alternative <program>
@@ -22,16 +23,22 @@
 program_alternative rmid
 program_alternative rmiregistry
 
-
 plugin_dir="$j2se_base/plugin/i386"
 
-# netscape
+# In 1.4.2, plugins got 'lib' prepended
+if dpkg --compare-versions "$j2se_version" ge "1.4.2"; then
+	lib="lib"
+else
+	lib=""
+fi
+
 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/netscape4/javaplugin.so" "$priority"
+    	"$plugin_dir/netscape4/${lib}javaplugin.so" "$priority"
+
 
 # mozilla
 mozilla_dir="/usr/lib/mozilla/plugins"
@@ -39,7 +46,7 @@
 update-alternatives \
     --install "$mozilla_dir/libjavaplugin.so" \
 	"mozilla-javaplugin.so" \
-    	"$plugin_dir/mozilla/javaplugin_oji.so" "$priority"
+    	"$plugin_dir/mozilla/${lib}javaplugin_oji.so" "$priority"
 
 # firefox
 firefox_dir="/usr/lib/mozilla-firefox/plugins"
@@ -47,4 +54,4 @@
 update-alternatives \
     --install "$firefox_dir/libjavaplugin.so" \
 	"firefox-javaplugin.so" \
-    	"$plugin_dir/mozilla/javaplugin_oji.so" "$priority"
+    	"$plugin_dir/mozilla/${lib}javaplugin_oji.so" "$priority"
--- /cvsroot/pkg-java/java-package/blackdown-j2re1.4/remove	2004/10/11 23:10:23	1.1.1.1
+++ /cvsroot/pkg-java/java-package/blackdown-j2re1.4/remove	2005/01/24 23:07:38	1.2
@@ -1,10 +1,9 @@
-#! /bin/bash -e
-
-
 j2se_base="/usr/lib/j2re1.4-blackdown"
 
 if [ ! -e "$j2se_base/debian/info" ]; then
     exit 0
+else
+	. "$j2se_base/debian/info"
 fi
 
 # alternative <program>
@@ -18,17 +17,23 @@
 program_alternative rmid
 program_alternative rmiregistry
 
-
 plugin_dir="$j2se_base/plugin/i386"
 
+# In 1.4.2, plugins got 'lib' prepended
+if dpkg --compare-versions "$j2se_version" ge "1.4.2"; then
+	lib="lib"
+else
+	lib=""
+fi
+
 # netscape
 update-alternatives \
-    --remove "netscape-javaplugin.so" "$plugin_dir/netscape4/javaplugin.so"
+    --remove "netscape-javaplugin.so" "$plugin_dir/netscape4/${lib}javaplugin.so"
 
 # mozilla
 update-alternatives \
-    --remove "mozilla-javaplugin.so" "$plugin_dir/mozilla/javaplugin_oji.so"
+    --remove "mozilla-javaplugin.so" "$plugin_dir/mozilla/${lib}javaplugin_oji.so"
 
 # firefox
 update-alternatives \
-    --remove "firefox-javaplugin.so" "$plugin_dir/mozilla/javaplugin_oji.so"
+    --remove "firefox-javaplugin.so" "$plugin_dir/mozilla/${lib}javaplugin_oji.so"