diff --git a/Alien/Package/Deb.pm b/Alien/Package/Deb.pm index 4ede110..7e4a79f 100644 --- a/Alien/Package/Deb.pm +++ b/Alien/Package/Deb.pm @@ -251,7 +251,7 @@ sub unpack { =item getpatch This method tries to find a patch file to use in the prep stage. If it -finds one, it returns it. Pass in a list of directories to search for +finds one, it returns it. Pass in a list of directories to search for patches in. =cut @@ -264,12 +264,12 @@ sub getpatch { foreach my $dir (@_) { push @patches, glob("$dir/".$this->name."_".$this->version."-".$this->release."*.diff.gz"); } - if (! @patches && $anypatch) { - # Try not matching the revision, see if that helps. + if (! @patches) { + # Try not matching the release, see if that helps. foreach my $dir (@_) { push @patches,glob("$dir/".$this->name."_".$this->version."*.diff.gz"); } - unless (@patches) { + if (@patches && $anypatch) { # Fallback to anything that matches the name. foreach my $dir (@_) { push @patches,glob("$dir/".$this->name."_*.diff.gz"); @@ -307,6 +307,21 @@ sub prep { if `find $dir -name "*.rej"`; system('find', '.', '-name', '*.orig', '-exec', 'rm', '{}', ';'); chmod 0755, "$dir/debian/rules"; + + # It's possible that the patch file changes the debian + # release or version. Parse changelog to detect that. + open (my $changelog, "<$dir/debian/changelog") || return; + my $line=<$changelog>; + if ($line=~/^[^ ]+\(([^)])\)\s/) { + my $version=$1; + if ($version=~/(.*)-(.*)/) { + $version=$1; + $this->release($2); + } + $this->version($1); + } + close $changelog; + return; } diff --git a/debian/changelog b/debian/changelog index 5b1b279..a5baf0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +alien (8.19) unstable; urgency=low + + * Added upsated jdk patches from Gerald Turner. + * Allow fallback to different debian revisions w/o --anypatch. + * Add a changelog parser so I can work out the built version of a package. + Ugh. Closes: #157971 + + -- Joey Hess Fri, 23 Aug 2002 19:58:36 -0400 + alien (8.18) unstable; urgency=low * Be stricter about which patch files to apply by default. For old behavior diff --git a/patches/j2sdk_1.4.0-1.diff b/patches/j2sdk_1.4.0_01-2.diff similarity index 73% rename from patches/j2sdk_1.4.0-1.diff rename to patches/j2sdk_1.4.0_01-2.diff index d27b6f3..0e2c6d1 100644 --- a/patches/j2sdk_1.4.0-1.diff +++ b/patches/j2sdk_1.4.0_01-2.diff @@ -1,15 +1,30 @@ ---- j2sdk-1.4.0.orig/debian/changelog -+++ j2sdk-1.4.0/debian/changelog -@@ -0,0 +1,7 @@ +--- j2sdk-1.4.0_01.orig/debian/changelog ++++ j2sdk-1.4.0_01/debian/changelog +@@ -0,0 +1,22 @@ ++j2sdk (1.4.0_01-2) experimental; urgency=low ++ ++ * Added java-common Depends ++ * Added java-virtual-machine, java2-runtime, java-compiler, and ++ java2-compiler Provides ++ * Added netscape and mozilla Suggests ++ ++ -- Gerald Turner Thu, 23 Aug 2002 09:07:09 -0700 ++ ++j2sdk (1.4.0_01-1) experimental; urgency=low ++ ++ * New upstream release ++ * Detection and installation of j2sdk-1_4_0-doc.zip (must be downloaded ++ and copied to the same directory where alien is executed) ++ ++ -- Gerald Turner Thu, 22 Aug 2002 15:44:54 -0700 ++ +j2sdk (1.4.0-1) experimental; urgency=low + + * Converted from .rpm format to .deb + + -- Gerald Turner Wed, 22 May 2002 12:46:34 -0700 -+ -+ ---- j2sdk-1.4.0.orig/debian/control -+++ j2sdk-1.4.0/debian/control +--- j2sdk-1.4.0_01.orig/debian/control ++++ j2sdk-1.4.0_01/debian/control @@ -0,0 +1,31 @@ +Source: j2sdk +Section: alien @@ -42,21 +57,21 @@ + graphical user interface. + . + (Converted from a rpm package by alien.) ---- j2sdk-1.4.0.orig/debian/copyright -+++ j2sdk-1.4.0/debian/copyright +--- j2sdk-1.4.0_01.orig/debian/copyright ++++ j2sdk-1.4.0_01/debian/copyright @@ -0,0 +1,35 @@ +This package was debianized by the alien program by converting -+a binary .rpm package on Wed, 22 May 2002 12:46:35 -0700 ++a binary .rpm package on Thu, 22 Aug 2002 15:44:54 -0700 + +Copyright: 1994-2001 Sun Microsystems, Inc. + +Information from the binary package: +Name : j2sdk Relocations: (not relocateable) -+Version : 1.4.0 Vendor: Sun Microsystems -+Release : fcs Build Date: Wed Jan 30 08:40:47 2002 ++Version : 1.4.0_01 Vendor: Sun Microsystems ++Release : fcs Build Date: Sun Apr 21 02:50:15 2002 +Install date: (not installed) Build Host: localhost.localdomain -+Group : Development/Tools Source RPM: j2sdk-1.4.0-fcs.src.rpm -+Size : 79382729 License: 1994-2001 Sun Microsystems, Inc. ++Group : Development/Tools Source RPM: j2sdk-1.4.0_01-fcs.src.rpm ++Size : 79734868 License: 1994-2001 Sun Microsystems, Inc. +Packager : Java Software +URL : http://java.sun.com/linux +Summary : Java(TM) 2 Software Development Kit, Standard Edition @@ -80,9 +95,9 @@ +appletviewer, these tools do not provide a +graphical user interface. + ---- j2sdk-1.4.0.orig/debian/rules -+++ j2sdk-1.4.0/debian/rules -@@ -0,0 +1,69 @@ +--- j2sdk-1.4.0_01.orig/debian/rules ++++ j2sdk-1.4.0_01/debian/rules +@@ -0,0 +1,76 @@ +#!/usr/bin/make -f +# debian/rules for alien + @@ -93,7 +108,6 @@ +export DH_COMPAT=3 + +PACKAGE=$(shell dh_listpackages) -+PKGFILES=$(shell ls -1 |grep -v debian) + +build: + dh_testdir @@ -111,18 +125,17 @@ + dh_clean -k + dh_installdirs + -+# Copy the packages's files, if any. -+ifneq "$(PKGFILES)" "" -+ cp -a $(PKGFILES) debian/$(PACKAGE) -+endif ++# Copy the packages's files. ++ find . -maxdepth 1 -mindepth 1 -not -name debian -print0 | \ ++ xargs -0 -r -i cp -a {} debian/$(PACKAGE) + +# +# If you need to move files around in debian/$(PACKAGE) or do some +# binary patching, do it here +# + -+ mv debian/$(PACKAGE)/usr/java/j2sdk1.4.0 \ -+ debian/$(PACKAGE)/usr/lib/j2sdk1.4 ++ mv debian/$(PACKAGE)/usr/java/j2sdk1.4.0_01 \ ++ debian/$(PACKAGE)/usr/lib/j2sdk1.4 + rmdir debian/$(PACKAGE)/usr/java + + mv debian/$(PACKAGE)/usr/lib/j2sdk1.4/man/* \ @@ -135,7 +148,16 @@ + + for i in `find debian/$(PACKAGE)/usr/share/man -type f` ; \ + do mv $$i `echo $$i | sed 's/\.\([^.]*\)$$/.j2sdk14.\1/'` ; \ -+ done ++ done ++ ++ if [ -f ../j2sdk-1_4_0-doc.zip ] ; then \ ++ unzip -q -d debian/$(PACKAGE)/usr/share/doc \ ++ ../j2sdk-1_4_0-doc.zip ; \ ++ mv debian/$(PACKAGE)/usr/share/doc/docs \ ++ debian/$(PACKAGE)/usr/share/doc/$(PACKAGE) ; \ ++ else \ ++ echo j2sdk-1_4_0-doc.zip not found, skipping documentation ; \ ++ fi + + dh_installdocs + dh_installchangelogs @@ -152,51 +174,15 @@ + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary ---- j2sdk-1.4.0.orig/debian/dirs -+++ j2sdk-1.4.0/debian/dirs -@@ -0,0 +1,3 @@ +--- j2sdk-1.4.0_01.orig/debian/dirs ++++ j2sdk-1.4.0_01/debian/dirs +@@ -0,0 +1,4 @@ ++usr/share/doc +usr/share/man +usr/lib/netscape/plugins-libc6 +usr/lib/mozilla/plugins ---- j2sdk-1.4.0.orig/debian/prerm -+++ j2sdk-1.4.0/debian/prerm -@@ -0,0 +1,34 @@ -+#!/bin/sh -+ -+case "`uname -m`" in -+ i[3-7]86 | ia32 | ia64) -+ ARCH=i386 -+ ;; -+ sparc*) -+ ARCH=sparc -+ ;; -+ *) -+ ARCH="`uname -m`" -+ ;; -+esac -+ -+if [ $1 = remove ] -+then -+ for i in appletviewer extcheck idlj jar jarsigner java javac \ -+ javadoc javah javap jdb keytool native2ascii orbd \ -+ policytool rmic rmid rmiregistry serialver servertool \ -+ tnameserv ControlPanel HtmlConverter -+ do -+ update-alternatives --remove $i /usr/lib/j2sdk1.4/bin/$i -+ done -+ -+ update-alternatives \ -+ --remove \ -+ javaplugin.so \ -+ /usr/lib/j2sdk1.4/jre/plugin/${ARCH}/ns4/javaplugin140.so -+ -+ update-alternatives \ -+ --remove \ -+ javaplugin_oji.so \ -+ /usr/lib/j2sdk1.4/jre/plugin/${ARCH}/ns610/javaplugin_oji140.so -+fi ---- j2sdk-1.4.0.orig/debian/postinst -+++ j2sdk-1.4.0/debian/postinst +--- j2sdk-1.4.0_01.orig/debian/postinst ++++ j2sdk-1.4.0_01/debian/postinst @@ -0,0 +1,75 @@ +#!/bin/sh + @@ -228,7 +214,7 @@ + /usr/bin/$i \ + $i \ + /usr/lib/j2sdk1.4/bin/$i \ -+ 1400 \ ++ 1401 \ + --slave \ + /usr/share/man/man1/$i.1.gz \ + $i.1.gz \ @@ -243,7 +229,7 @@ + /usr/bin/$i \ + $i \ + /usr/lib/j2sdk1.4/bin/$i \ -+ 1400 \ ++ 1401 \ + --slave \ + /usr/share/man/man1/$i.1.gz \ + $i.1.gz \ @@ -255,7 +241,7 @@ + /usr/bin/$i \ + $i \ + /usr/lib/j2sdk1.4/bin/$i \ -+ 1400 ++ 1401 + fi + done + @@ -263,13 +249,50 @@ + --install \ + /usr/lib/netscape/plugins-libc6/javaplugin.so \ + javaplugin.so \ -+ /usr/lib/j2sdk1.4/jre/plugin/${ARCH}/ns4/javaplugin140.so \ -+ 1400 ++ /usr/lib/j2sdk1.4/jre/plugin/${ARCH}/ns4/javaplugin.so \ ++ 1401 + + update-alternatives \ + --install \ + /usr/lib/mozilla/plugins/javaplugin_oji.so \ + javaplugin_oji.so \ -+ /usr/lib/j2sdk1.4/jre/plugin/${ARCH}/ns610/javaplugin_oji140.so \ -+ 1400 ++ /usr/lib/j2sdk1.4/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so \ ++ 1401 ++fi +--- j2sdk-1.4.0_01.orig/debian/prerm ++++ j2sdk-1.4.0_01/debian/prerm +@@ -0,0 +1,34 @@ ++#!/bin/sh ++ ++case "`uname -m`" in ++ i[3-7]86 | ia32 | ia64) ++ ARCH=i386 ++ ;; ++ sparc*) ++ ARCH=sparc ++ ;; ++ *) ++ ARCH="`uname -m`" ++ ;; ++esac ++ ++if [ $1 = remove ] ++then ++ for i in appletviewer extcheck idlj jar jarsigner java javac \ ++ javadoc javah javap jdb keytool native2ascii orbd \ ++ policytool rmic rmid rmiregistry serialver servertool \ ++ tnameserv ControlPanel HtmlConverter ++ do ++ update-alternatives --remove $i /usr/lib/j2sdk1.4/bin/$i ++ done ++ ++ update-alternatives \ ++ --remove \ ++ javaplugin.so \ ++ /usr/lib/j2sdk1.4/jre/plugin/${ARCH}/ns4/javaplugin.so ++ ++ update-alternatives \ ++ --remove \ ++ javaplugin_oji.so \ ++ /usr/lib/j2sdk1.4/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so +fi diff --git a/patches/j2sdk_1.4.1-2.diff b/patches/j2sdk_1.4.1-2.diff new file mode 100644 index 0000000..947d654 --- /dev/null +++ b/patches/j2sdk_1.4.1-2.diff @@ -0,0 +1,306 @@ +--- j2sdk-1.4.1.orig/debian/changelog ++++ j2sdk-1.4.1/debian/changelog +@@ -0,0 +1,30 @@ ++j2sdk (1.4.1-2) experimental; urgency=low ++ ++ * Added java-common Depends ++ * Added java-virtual-machine, java2-runtime, java-compiler, and ++ java2-compiler Provides ++ * Added netscape and mozilla Suggests ++ ++ -- Gerald Turner Thu, 23 Aug 2002 09:07:09 -0700 ++ ++j2sdk (1.4.1-1) experimental; urgency=low ++ ++ * New upstream release ++ * Detection and installation of j2sdk-1_4_1-rc-doc.zip (must be downloaded ++ and copied to the same directory where alien is executed) ++ ++ -- Gerald Turner Thu, 22 Aug 2002 16:22:33 -0700 ++ ++j2sdk (1.4.0_01-1) experimental; urgency=low ++ ++ * New upstream release ++ * Detection and installation of j2sdk-1_4_0-doc.zip (must be downloaded ++ and copied to the same directory where alien is executed) ++ ++ -- Gerald Turner Thu, 22 Aug 2002 15:44:54 -0700 ++ ++j2sdk (1.4.0-1) experimental; urgency=low ++ ++ * Converted from .rpm format to .deb ++ ++ -- Gerald Turner Wed, 22 May 2002 12:46:34 -0700 +--- j2sdk-1.4.1.orig/debian/control ++++ j2sdk-1.4.1/debian/control +@@ -0,0 +1,31 @@ ++Source: j2sdk ++Section: alien ++Priority: extra ++Maintainer: Gerald Turner ++ ++Package: j2sdk ++Architecture: i386 ++Depends: java-common, ${shlibs:Depends} ++Provides: java-virtual-machine, java2-runtime, java-compiler, java2-compiler ++Suggests: netscape | mozilla (>= 0.9.3+0-1) ++Description: Java(TM) 2 Software Development Kit, Standard Edition ++ The Java 2 SDK, Standard Edition includes the Java ++ Virtual Machine, core class libraries and tools used ++ by programmers to develop Java software applets and ++ applications. The SDK also provides the foundation ++ for IDE (Integrated Development Environment) tools ++ such as Sun's Forte for Java, Community Edition, ++ the Java(TM) 2 Platform, Enterprise Edition (J2EE), ++ Java-based application servers and more. ++ The Java 2 Software Development Kit, SDK, is a ++ development environment for building applications, ++ applets, and components that can be deployed on ++ the Java platform. The Java 2 SDK software includes ++ tools useful for developing and testing programs ++ written in the Java programming language and running ++ on the Java platform. These tools are designed to ++ be used from the command line. Except for ++ appletviewer, these tools do not provide a ++ graphical user interface. ++ . ++ (Converted from a rpm package by alien.) +--- j2sdk-1.4.1.orig/debian/copyright ++++ j2sdk-1.4.1/debian/copyright +@@ -0,0 +1,35 @@ ++This package was debianized by the alien program by converting ++a binary .rpm package on Thu, 22 Aug 2002 15:46:33 -0700 ++ ++Copyright: 1994-2001 Sun Microsystems, Inc. ++ ++Information from the binary package: ++Name : j2sdk Relocations: (not relocateable) ++Version : 1.4.1 Vendor: Sun Microsystems ++Release : rc Build Date: Thu Aug 8 03:24:51 2002 ++Install date: (not installed) Build Host: localhost.localdomain ++Group : Development/Tools Source RPM: j2sdk-1.4.1-rc.src.rpm ++Size : 83010311 License: 1994-2001 Sun Microsystems, Inc. ++Packager : Java Software ++URL : http://java.sun.com/linux ++Summary : Java(TM) 2 Software Development Kit, Standard Edition ++Description : ++The Java 2 SDK, Standard Edition includes the Java ++Virtual Machine, core class libraries and tools used ++by programmers to develop Java software applets and ++applications. The SDK also provides the foundation ++for IDE (Integrated Development Environment) tools ++such as Sun's Forte for Java, Community Edition, ++the Java(TM) 2 Platform, Enterprise Edition (J2EE), ++Java-based application servers and more. ++The Java 2 Software Development Kit, SDK, is a ++development environment for building applications, ++applets, and components that can be deployed on ++the Java platform. The Java 2 SDK software includes ++tools useful for developing and testing programs ++written in the Java programming language and running ++on the Java platform. These tools are designed to ++be used from the command line. Except for ++appletviewer, these tools do not provide a ++graphical user interface. ++ +--- j2sdk-1.4.1.orig/debian/rules ++++ j2sdk-1.4.1/debian/rules +@@ -0,0 +1,76 @@ ++#!/usr/bin/make -f ++# debian/rules for alien ++ ++# Uncomment this to turn on verbose mode. ++#export DH_VERBOSE=1 ++ ++# Use v3 compatability mode, so ldconfig gets added to maint scripts. ++export DH_COMPAT=3 ++ ++PACKAGE=$(shell dh_listpackages) ++ ++build: ++ dh_testdir ++ ++clean: ++ dh_testdir ++ dh_testroot ++ dh_clean ++ ++binary-indep: build ++ ++binary-arch: build ++ dh_testdir ++ dh_testroot ++ dh_clean -k ++ dh_installdirs ++ ++# Copy the packages's files. ++ find . -maxdepth 1 -mindepth 1 -not -name debian -print0 | \ ++ xargs -0 -r -i cp -a {} debian/$(PACKAGE) ++ ++# ++# If you need to move files around in debian/$(PACKAGE) or do some ++# binary patching, do it here ++# ++ ++ mv debian/$(PACKAGE)/usr/java/j2sdk1.4.1 \ ++ debian/$(PACKAGE)/usr/lib/j2sdk1.4 ++ rmdir debian/$(PACKAGE)/usr/java ++ ++ mv debian/$(PACKAGE)/usr/lib/j2sdk1.4/man/* \ ++ debian/$(PACKAGE)/usr/share/man ++ rmdir debian/$(PACKAGE)/usr/lib/j2sdk1.4/man ++ ++ rm debian/$(PACKAGE)/usr/share/man/ja ++ mv debian/$(PACKAGE)/usr/share/man/ja_JP.eucJP \ ++ debian/$(PACKAGE)/usr/share/man/ja ++ ++ for i in `find debian/$(PACKAGE)/usr/share/man -type f` ; \ ++ do mv $$i `echo $$i | sed 's/\.\([^.]*\)$$/.j2sdk14.\1/'` ; \ ++ done ++ ++ if [ -f ../j2sdk-1_4_1-rc-doc.zip ] ; then \ ++ unzip -q -d debian/$(PACKAGE)/usr/share/doc \ ++ ../j2sdk-1_4_1-rc-doc.zip ; \ ++ mv debian/$(PACKAGE)/usr/share/doc/docs \ ++ debian/$(PACKAGE)/usr/share/doc/$(PACKAGE) ; \ ++ else \ ++ echo j2sdk-1_4_1-rc-doc.zip not found, skipping documentation ; \ ++ fi ++ ++ dh_installdocs ++ dh_installchangelogs ++# This has been known to break on some wacky binaries. ++# dh_strip ++ dh_compress ++ dh_fixperms ++ dh_makeshlibs ++ dh_installdeb ++ -dh_shlibdeps ++ dh_gencontrol ++ dh_md5sums ++ dh_builddeb ++ ++binary: binary-indep binary-arch ++.PHONY: build clean binary-indep binary-arch binary +--- j2sdk-1.4.1.orig/debian/dirs ++++ j2sdk-1.4.1/debian/dirs +@@ -0,0 +1,4 @@ ++usr/share/doc ++usr/share/man ++usr/lib/netscape/plugins-libc6 ++usr/lib/mozilla/plugins +--- j2sdk-1.4.1.orig/debian/postinst ++++ j2sdk-1.4.1/debian/postinst +@@ -0,0 +1,75 @@ ++#!/bin/sh ++ ++case "`uname -m`" in ++ i[3-7]86 | ia32 | ia64) ++ ARCH=i386 ++ ;; ++ sparc*) ++ ARCH=sparc ++ ;; ++ *) ++ ARCH="`uname -m`" ++ ;; ++esac ++ ++if [ $1 = configure ] ++then ++ for i in appletviewer extcheck idlj jar jarsigner java javac javadoc \ ++ javah javap jdb keytool kinit klist ktab native2ascii orbd \ ++ policytool rmic rmid rmiregistry serialver servertool \ ++ tnameserv ControlPanel HtmlConverter ++ do ++ if [ -e /usr/share/man/man1/$i.j2sdk14.1.gz ] ++ then ++ if [ -e /usr/share/man/ja/man1/$i.j2sdk14.1.gz ] ++ then ++ update-alternatives \ ++ --install \ ++ /usr/bin/$i \ ++ $i \ ++ /usr/lib/j2sdk1.4/bin/$i \ ++ 1401 \ ++ --slave \ ++ /usr/share/man/man1/$i.1.gz \ ++ $i.1.gz \ ++ /usr/share/man/man1/$i.j2sdk14.1.gz \ ++ --slave \ ++ /usr/share/man/ja/man1/$i.1.gz \ ++ $i.ja.1.gz \ ++ /usr/share/man/ja/man1/$i.j2sdk14.1.gz ++ else ++ update-alternatives \ ++ --install \ ++ /usr/bin/$i \ ++ $i \ ++ /usr/lib/j2sdk1.4/bin/$i \ ++ 1401 \ ++ --slave \ ++ /usr/share/man/man1/$i.1.gz \ ++ $i.1.gz \ ++ /usr/share/man/man1/$i.j2sdk14.1.gz ++ fi ++ else ++ update-alternatives \ ++ --install \ ++ /usr/bin/$i \ ++ $i \ ++ /usr/lib/j2sdk1.4/bin/$i \ ++ 1401 ++ fi ++ done ++ ++ update-alternatives \ ++ --install \ ++ /usr/lib/netscape/plugins-libc6/javaplugin.so \ ++ javaplugin.so \ ++ /usr/lib/j2sdk1.4/jre/plugin/${ARCH}/ns4/javaplugin.so \ ++ 1401 ++ ++ update-alternatives \ ++ --install \ ++ /usr/lib/mozilla/plugins/javaplugin_oji.so \ ++ javaplugin_oji.so \ ++ /usr/lib/j2sdk1.4/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so \ ++ 1401 ++fi +--- j2sdk-1.4.1.orig/debian/prerm ++++ j2sdk-1.4.1/debian/prerm +@@ -0,0 +1,34 @@ ++#!/bin/sh ++ ++case "`uname -m`" in ++ i[3-7]86 | ia32 | ia64) ++ ARCH=i386 ++ ;; ++ sparc*) ++ ARCH=sparc ++ ;; ++ *) ++ ARCH="`uname -m`" ++ ;; ++esac ++ ++if [ $1 = remove ] ++then ++ for i in appletviewer extcheck idlj jar jarsigner java javac javadoc \ ++ javah javap jdb keytool kinit klist ktab native2ascii orbd \ ++ policytool rmic rmid rmiregistry serialver servertool \ ++ tnameserv ControlPanel HtmlConverter ++ do ++ update-alternatives --remove $i /usr/lib/j2sdk1.4/bin/$i ++ done ++ ++ update-alternatives \ ++ --remove \ ++ javaplugin.so \ ++ /usr/lib/j2sdk1.4/jre/plugin/${ARCH}/ns4/javaplugin.so ++ ++ update-alternatives \ ++ --remove \ ++ javaplugin_oji.so \ ++ /usr/lib/j2sdk1.4/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so ++fi