From 302877790be0ae2bf3b728d0490e68f395acab9d Mon Sep 17 00:00:00 2001 From: joey Date: Sat, 12 Jul 2003 18:36:25 +0000 Subject: [PATCH] * Fixed changelog parsing regexp. Noticed by Gerald Turner who is sure turning up in this changelog a lot. * Updated j2sdk patch fixes some ControlPanel shell script incompatabilities. Closes: #200731 --- debian/changelog | 5 ++-- debian/control | 2 +- patches/j2sdk_1.4.2-1.diff | 59 ++++++++++++++++++++++++++------------ 3 files changed, 44 insertions(+), 22 deletions(-) diff --git a/debian/changelog b/debian/changelog index 59bc7c3..1e306cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ alien (8.34) unstable; urgency=low -UNRE * Fixed changelog parsing regexp. Noticed by Gerald Turner who is sure turning up in this changelog a lot. + * Updated j2sdk patch fixes some ControlPanel shell script + incompatabilities. Closes: #200731 - -- Joey Hess Mon, 7 Jul 2003 19:23:33 -0400 + -- Joey Hess Sat, 12 Jul 2003 20:35:09 +0200 alien (8.33) unstable; urgency=low diff --git a/debian/control b/debian/control index b8c533d..bf0436e 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.10.0 +Standards-Version: 3.6.0 Package: alien Architecture: all diff --git a/patches/j2sdk_1.4.2-1.diff b/patches/j2sdk_1.4.2-1.diff index 7461169..d60f06e 100644 --- a/patches/j2sdk_1.4.2-1.diff +++ b/patches/j2sdk_1.4.2-1.diff @@ -83,7 +83,7 @@ +fi --- j2sdk-1.4.2.orig/debian/rules +++ j2sdk-1.4.2/debian/rules -@@ -0,0 +1,84 @@ +@@ -0,0 +1,99 @@ +#!/usr/bin/make -f +# debian/rules for alien + @@ -95,6 +95,9 @@ + +PACKAGE=$(shell dh_listpackages) + ++JAVA_HOME := debian/$(PACKAGE)/usr/lib/j2sdk-1.4.2 ++MAN_DIR := debian/$(PACKAGE)/usr/share/man ++ +build: + dh_testdir + @@ -119,30 +122,42 @@ +# 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/j2sdk-1.4.2 ++ ++# Move RPM contents to a proper debian/blackdown directory ++ mv debian/$(PACKAGE)/usr/java/j2sdk1.4.2 $(JAVA_HOME) + rmdir debian/$(PACKAGE)/usr/java + -+ mv debian/$(PACKAGE)/usr/lib/j2sdk-1.4.2/man/* \ -+ debian/$(PACKAGE)/usr/share/man -+ rmdir debian/$(PACKAGE)/usr/lib/j2sdk-1.4.2/man ++# Move man pages to /usr/share/man ++ mv $(JAVA_HOME)/man/* $(MAN_DIR) ++ rmdir $(JAVA_HOME)/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/\.\([^.]*\)$$/.j2sdk-1_4_2.\1/'` ; \ ++# Move Japanese man pages further ++ rm $(MAN_DIR)/ja ++ mv $(MAN_DIR)/ja_JP.eucJP $(MAN_DIR)/ja ++ for i in `find $(MAN_DIR) -type f` ; \ ++ do mv $$i `echo $$i | sed 's/\.\([^.]*\)$$/.j2sdk-1_4_2.\1/'` ; \ + done + -+ if [ -x debian/$(PACKAGE)/usr/lib/j2sdk-1.4.2/lib/unpack ] ; then \ -+ for i in `find debian/$(PACKAGE)/usr/lib/j2sdk-1.4.2 \ -+ -name \*.pack` ; do \ -+ debian/$(PACKAGE)/usr/lib/j2sdk-1.4.2/lib/unpack \ -+ $$i `dirname $$i`/`basename $$i .pack`.jar ; \ -+ done ; \ ++# Unpack tripple compressed jars that showed up in 1.4.2 ++ if [ -x $(JAVA_HOME)/lib/unpack ] ; then \ ++ for i in `find $(JAVA_HOME) -name \*.pack` ; do \ ++ $(JAVA_HOME)/lib/unpack \ ++ $$i `dirname $$i`/`basename $$i .pack`.jar ; \ ++ done ; \ + fi + ++# Fix ControlPanel shell script incompatibilities ++ if [ -f $(JAVA_HOME)/jre/bin/ControlPanel ] ; then \ ++ sed "s/\/usr\/bin\/ls/\/bin\/ls/g; \ ++ s/expr \(.*\) : '^/expr \1 : '/;" \ ++ $(JAVA_HOME)/jre/bin/ControlPanel \ ++ > $(JAVA_HOME)/jre/bin/ControlPanel.tmp ; \ ++ mv $(JAVA_HOME)/jre/bin/ControlPanel.tmp \ ++ $(JAVA_HOME)/jre/bin/ControlPanel ; \ ++ chmod 755 $(JAVA_HOME)/jre/bin/ControlPanel ; \ ++ fi ++ ++# Include optional documentation + if [ -f ../j2sdk-1_4_2-doc.zip ] ; then \ + unzip -q -d debian/$(PACKAGE)/usr/share/doc \ + ../j2sdk-1_4_2-doc.zip ; \ @@ -170,7 +185,13 @@ +.PHONY: build clean binary-indep binary-arch binary --- j2sdk-1.4.2.orig/debian/changelog +++ j2sdk-1.4.2/debian/changelog -@@ -0,0 +1,68 @@ +@@ -0,0 +1,74 @@ ++j2sdk (2:1.4.2-1) experimental; urgency=low ++ ++ * Fix ControlPanel shell script incompatibilities. Closes: #200731 ++ ++ -- Gerald Turner Thu, 10 Jul 2003 09:59:23 -0700 ++ +j2sdk (1:1.4.2-1) experimental; urgency=low + + * alien echoes the wrong filename, "j2sdk_1.4.2-1_i386.deb generated",