From 39d375510297eb6f5d536ee83905f1d2d299e429 Mon Sep 17 00:00:00 2001 From: joey Date: Tue, 1 Jul 2003 00:57:47 +0000 Subject: [PATCH] * Updated the j2sdk patch for version 1.4.2. (From Gerald Turner.) --- debian/changelog | 6 + debian/control | 2 +- ..._1.4.1_01-4.diff => j2sdk_1.4.1_02-5.diff} | 38 +- patches/j2sdk_1.4.2-6.diff | 355 ++++++++++++++++++ 4 files changed, 384 insertions(+), 17 deletions(-) rename patches/{j2sdk_1.4.1_01-4.diff => j2sdk_1.4.1_02-5.diff} (93%) create mode 100644 patches/j2sdk_1.4.2-6.diff diff --git a/debian/changelog b/debian/changelog index a3f2106..8c00275 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +alien (8.31) unstable; urgency=low + + * Updated the j2sdk patch for version 1.4.2. (From Gerald Turner.) + + -- Joey Hess Mon, 30 Jun 2003 20:55:10 -0400 + alien (8.30) unstable; urgency=low * Added -v to enable verbose mode, which lists each shell command diff --git a/debian/control b/debian/control index aa23a27..b8c533d 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Build-Depends-Indep: debhelper (>= 4), dpkg-dev (>= 1.9.0) Maintainer: Joey Hess -Standards-Version: 3.5.9.0 +Standards-Version: 3.5.10.0 Package: alien Architecture: all diff --git a/patches/j2sdk_1.4.1_01-4.diff b/patches/j2sdk_1.4.1_02-5.diff similarity index 93% rename from patches/j2sdk_1.4.1_01-4.diff rename to patches/j2sdk_1.4.1_02-5.diff index 7e57ab5..82b953a 100644 --- a/patches/j2sdk_1.4.1_01-4.diff +++ b/patches/j2sdk_1.4.1_02-5.diff @@ -1,12 +1,12 @@ ---- j2sdk-1.4.1_01.orig/debian/dirs -+++ j2sdk-1.4.1_01/debian/dirs +--- j2sdk-1.4.1_02.orig/debian/dirs ++++ j2sdk-1.4.1_02/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_01.orig/debian/control -+++ j2sdk-1.4.1_01/debian/control +--- j2sdk-1.4.1_02.orig/debian/control ++++ j2sdk-1.4.1_02/debian/control @@ -0,0 +1,31 @@ +Source: j2sdk +Section: alien @@ -39,8 +39,8 @@ + graphical user interface. + . + (Converted from a rpm package by alien.) ---- j2sdk-1.4.1_01.orig/debian/prerm -+++ j2sdk-1.4.1_01/debian/prerm +--- j2sdk-1.4.1_02.orig/debian/prerm ++++ j2sdk-1.4.1_02/debian/prerm @@ -0,0 +1,34 @@ +#!/bin/sh + @@ -76,8 +76,8 @@ + javaplugin_oji.so \ + /usr/lib/j2sdk1.4/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so +fi ---- j2sdk-1.4.1_01.orig/debian/rules -+++ j2sdk-1.4.1_01/debian/rules +--- j2sdk-1.4.1_02.orig/debian/rules ++++ j2sdk-1.4.1_02/debian/rules @@ -0,0 +1,76 @@ +#!/usr/bin/make -f +# debian/rules for alien @@ -115,7 +115,7 @@ +# binary patching, do it here +# + -+ mv debian/$(PACKAGE)/usr/java/j2sdk1.4.1_01 \ ++ mv debian/$(PACKAGE)/usr/java/j2sdk1.4.1_02 \ + debian/$(PACKAGE)/usr/lib/j2sdk1.4 + rmdir debian/$(PACKAGE)/usr/java + @@ -155,9 +155,15 @@ + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary ---- j2sdk-1.4.1_01.orig/debian/changelog -+++ j2sdk-1.4.1_01/debian/changelog -@@ -0,0 +1,44 @@ +--- j2sdk-1.4.1_02.orig/debian/changelog ++++ j2sdk-1.4.1_02/debian/changelog +@@ -0,0 +1,50 @@ ++j2sdk (1.4.1_02-5) experimental; urgency=low ++ ++ * New upstream release ++ ++ -- Gerald Turner Fri, 14 Mar 2003 14:43:45 -0800 ++ +j2sdk (1.4.1_01-4) experimental; urgency=low + + * New upstream release @@ -202,8 +208,8 @@ + * Converted from .rpm format to .deb + + -- Gerald Turner Wed, 22 May 2002 12:46:34 -0700 ---- j2sdk-1.4.1_01.orig/debian/postinst -+++ j2sdk-1.4.1_01/debian/postinst +--- j2sdk-1.4.1_02.orig/debian/postinst ++++ j2sdk-1.4.1_02/debian/postinst @@ -0,0 +1,75 @@ +#!/bin/sh + @@ -280,8 +286,8 @@ + /usr/lib/j2sdk1.4/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so \ + 1401 +fi ---- j2sdk-1.4.1_01.orig/debian/copyright -+++ j2sdk-1.4.1_01/debian/copyright +--- j2sdk-1.4.1_02.orig/debian/copyright ++++ j2sdk-1.4.1_02/debian/copyright @@ -0,0 +1,35 @@ +This package was debianized by the alien program by converting +a binary .rpm package on Tue, 14 Jan 2003 17:03:09 -0800 diff --git a/patches/j2sdk_1.4.2-6.diff b/patches/j2sdk_1.4.2-6.diff new file mode 100644 index 0000000..8d9c851 --- /dev/null +++ b/patches/j2sdk_1.4.2-6.diff @@ -0,0 +1,355 @@ +--- j2sdk-1.4.2.orig/debian/dirs ++++ j2sdk-1.4.2/debian/dirs +@@ -0,0 +1,4 @@ ++usr/share/doc ++usr/share/man ++usr/lib/netscape/plugins-libc6 ++usr/lib/mozilla/plugins +--- j2sdk-1.4.2.orig/debian/control ++++ j2sdk-1.4.2/debian/control +@@ -0,0 +1,31 @@ ++Source: j2sdk ++Section: alien ++Priority: extra ++Maintainer: Gerald Turner ++ ++Package: j2sdk1.4 ++Architecture: i386 ++Depends: java-common, ${shlibs:Depends} ++Provides: j2sdk1.4, j2re1.4, java-virtual-machine, java1-runtime, java2-runtime, java-compiler, java2-compiler ++Suggests: mozilla-browser (>= 1.2.1-10) | netscape ++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.2.orig/debian/prerm ++++ j2sdk-1.4.2/debian/prerm +@@ -0,0 +1,39 @@ ++#!/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 java-rmi.cgi javac \ ++ javadoc javah javap jdb keytool kinit klist ktab native2ascii \ ++ orbd policytool rmic rmid rmiregistry serialver servertool \ ++ tnameserv HtmlConverter ++ do ++ update-alternatives --remove $i /usr/lib/j2sdk1.4/bin/$i ++ done ++ ++ for i in ControlPanel ++ do ++ update-alternatives --remove $i /usr/lib/j2sdk1.4/jre/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-gcc32/libjavaplugin_oji.so ++fi +--- j2sdk-1.4.2.orig/debian/rules ++++ j2sdk-1.4.2/debian/rules +@@ -0,0 +1,84 @@ ++#!/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.2 \ ++ 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 [ -x debian/$(PACKAGE)/usr/lib/j2sdk1.4/lib/unpack ] ; then \ ++ for i in `find debian/$(PACKAGE)/usr/lib/j2sdk1.4 \ ++ -name \*.pack` ; do \ ++ debian/$(PACKAGE)/usr/lib/j2sdk1.4/lib/unpack \ ++ $$i `dirname $$i`/`basename $$i .pack`.jar ; \ ++ done ; \ ++ fi ++ ++ if [ -f ../j2sdk-1_4_2-doc.zip ] ; then \ ++ unzip -q -d debian/$(PACKAGE)/usr/share/doc \ ++ ../j2sdk-1_4_2-doc.zip ; \ ++ mv debian/$(PACKAGE)/usr/share/doc/docs \ ++ debian/$(PACKAGE)/usr/share/doc/$(PACKAGE) ; \ ++ else \ ++ echo j2sdk-1_4_2-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.2.orig/debian/changelog ++++ j2sdk-1.4.2/debian/changelog +@@ -0,0 +1,56 @@ ++j2sdk (1.4.2-6) experimental; urgency=low ++ ++ * New upstream release ++ ++ -- Gerald Turner Mon, 30 Jun 2003 15:46:47 -0700 ++ ++j2sdk (1.4.1_02-5) experimental; urgency=low ++ ++ * New upstream release ++ ++ -- Gerald Turner Fri, 14 Mar 2003 14:43:45 -0800 ++ ++j2sdk (1.4.1_01-4) experimental; urgency=low ++ ++ * New upstream release ++ ++ -- Gerald Turner Tue, 14 Jan 2003 17:03:09 -0800 ++ ++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.2.orig/debian/postinst ++++ j2sdk-1.4.2/debian/postinst +@@ -0,0 +1,85 @@ ++#!/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 java-rmi.cgi javac \ ++ javadoc javah javap jdb keytool kinit klist ktab native2ascii \ ++ orbd policytool rmic rmid rmiregistry serialver servertool \ ++ tnameserv 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 \ ++ 1420 \ ++ --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 \ ++ 1420 \ ++ --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 \ ++ 1420 ++ fi ++ done ++ ++ for i in ControlPanel ++ do ++ update-alternatives \ ++ --install \ ++ /usr/bin/$i \ ++ $i \ ++ /usr/lib/j2sdk1.4/jre/bin/$i \ ++ 1420 ++ done ++ ++ update-alternatives \ ++ --install \ ++ /usr/lib/netscape/plugins-libc6/javaplugin.so \ ++ javaplugin.so \ ++ /usr/lib/j2sdk1.4/jre/plugin/${ARCH}/ns4/javaplugin.so \ ++ 1420 ++ ++ update-alternatives \ ++ --install \ ++ /usr/lib/mozilla/plugins/javaplugin_oji.so \ ++ javaplugin_oji.so \ ++ /usr/lib/j2sdk1.4/jre/plugin/${ARCH}/ns610-gcc32/libjavaplugin_oji.so \ ++ 1420 ++fi +--- j2sdk-1.4.2.orig/debian/copyright ++++ j2sdk-1.4.2/debian/copyright +@@ -0,0 +1,35 @@ ++This package was debianized by the alien program by converting ++a binary .rpm package on Tue, 14 Jan 2003 17:03:09 -0800 ++ ++Copyright: 1994-2001 Sun Microsystems, Inc. ++ ++Information from the binary package: ++Name : j2sdk Relocations: (not relocateable) ++Version : 1.4.1_01 Vendor: Sun Microsystems ++Release : fcs Build Date: Mon Sep 30 03:18:37 2002 ++Install date: (not installed) Build Host: localhost.localdomain ++Group : Development/Tools Source RPM: j2sdk-1.4.1_01-fcs.src.rpm ++Size : 83017072 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. ++