From 13858b3a6831bb0def2a8501eac2b702e6afa9fe Mon Sep 17 00:00:00 2001 From: joey Date: Tue, 12 Nov 2002 19:15:30 +0000 Subject: [PATCH] updates --- debian/changelog | 7 + ...{j2sdk_1.4.1-2.diff => j2sdk_1.4.1-3.diff} | 240 +++++++++--------- 2 files changed, 131 insertions(+), 116 deletions(-) rename patches/{j2sdk_1.4.1-2.diff => j2sdk_1.4.1-3.diff} (94%) diff --git a/debian/changelog b/debian/changelog index 7a655b4..b13f510 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +alien (8.22) unstable; urgency=low + +UNRE + * Updated js2k patch from Gerald Turner. + + -- Joey Hess Sun, 27 Oct 2002 20:29:28 -0500 + alien (8.21) unstable; urgency=low * Pach from Erwan MAS that allows specification of the diff --git a/patches/j2sdk_1.4.1-2.diff b/patches/j2sdk_1.4.1-3.diff similarity index 94% rename from patches/j2sdk_1.4.1-2.diff rename to patches/j2sdk_1.4.1-3.diff index 947d654..618ff4d 100644 --- a/patches/j2sdk_1.4.1-2.diff +++ b/patches/j2sdk_1.4.1-3.diff @@ -1,36 +1,10 @@ ---- 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/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/control +++ j2sdk-1.4.1/debian/control @@ -0,0 +1,31 @@ @@ -65,44 +39,43 @@ + 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 +--- j2sdk-1.4.1.orig/debian/prerm ++++ j2sdk-1.4.1/debian/prerm +@@ -0,0 +1,34 @@ ++#!/bin/sh + -+Copyright: 1994-2001 Sun Microsystems, Inc. ++case "`uname -m`" in ++ i[3-7]86 | ia32 | ia64) ++ ARCH=i386 ++ ;; ++ sparc*) ++ ARCH=sparc ++ ;; ++ *) ++ ARCH="`uname -m`" ++ ;; ++esac + -+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. ++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 --- j2sdk-1.4.1.orig/debian/rules +++ j2sdk-1.4.1/debian/rules @@ -0,0 +1,76 @@ @@ -158,13 +131,13 @@ + 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 ; \ ++ if [ -f ../j2sdk-1_4_1-doc.zip ] ; then \ ++ unzip -q -d debian/$(PACKAGE)/usr/share/doc \ ++ ../j2sdk-1_4_1-doc.zip ; \ ++ mv debian/$(PACKAGE)/usr/share/doc/docs \ ++ debian/$(PACKAGE)/usr/share/doc/$(PACKAGE) ; \ ++ else \ ++ echo j2sdk-1_4_1-doc.zip not found, skipping documentation ; \ + fi + + dh_installdocs @@ -182,13 +155,47 @@ + +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/changelog ++++ j2sdk-1.4.1/debian/changelog +@@ -0,0 +1,38 @@ ++j2sdk (1.4.1-3) experimental; urgency=low ++ ++ * New upstream release ++ * Detection and installation of j2sdk-1_4_1-doc.zip (must be downloaded ++ and copied to the same directory where alien is executed) ++ ++ -- Gerald Turner Wed, 2 Oct 2002 16:41:24 -0700 ++ ++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/postinst +++ j2sdk-1.4.1/debian/postinst @@ -0,0 +1,75 @@ @@ -267,40 +274,41 @@ + /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 +--- 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 + -+case "`uname -m`" in -+ i[3-7]86 | ia32 | ia64) -+ ARCH=i386 -+ ;; -+ sparc*) -+ ARCH=sparc -+ ;; -+ *) -+ ARCH="`uname -m`" -+ ;; -+esac ++Copyright: 1994-2001 Sun Microsystems, Inc. + -+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 ++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. + -+ 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