mlot/alien
1
0
Fork 0
mirror of https://github.com/Project-OSS-Revival/alien.git synced 2026-04-24 14:00:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Fixed changelog parsing regexp. Noticed by Gerald Turner who is sure

Browse Source 
turning up in this changelog a lot.
   * Updated j2sdk patch fixes some ControlPanel shell script
     incompatabilities. Closes: #200731
This commit is contained in:
joey
2003-07-12 18:36:25 +00:00
parent f43eea0d89
commit 302877790b
3 changed files with 44 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
debian/changelog vendored
View File

@@ -1,10 +1,11 @@
alien (8.34) unstable; urgency=low alien (8.34) unstable; urgency=low
UNRE
* Fixed changelog parsing regexp. Noticed by Gerald Turner who is sure * Fixed changelog parsing regexp. Noticed by Gerald Turner who is sure
turning up in this changelog a lot. turning up in this changelog a lot.
* Updated j2sdk patch fixes some ControlPanel shell script
incompatabilities. Closes: #200731
-- Joey Hess <joeyh@debian.org> Mon, 7 Jul 2003 19:23:33 -0400 -- Joey Hess <joeyh@debian.org> Sat, 12 Jul 2003 20:35:09 +0200
alien (8.33) unstable; urgency=low alien (8.33) unstable; urgency=low

2
debian/control vendored
View File

@@ -3,7 +3,7 @@ Section: admin
Priority: optional Priority: optional
Build-Depends-Indep: debhelper (>= 4), dpkg-dev (>= 1.9.0) Build-Depends-Indep: debhelper (>= 4), dpkg-dev (>= 1.9.0)
Maintainer: Joey Hess <joeyh@debian.org> Maintainer: Joey Hess <joeyh@debian.org>
Standards-Version: 3.5.10.0 Standards-Version: 3.6.0
Package: alien Package: alien
Architecture: all Architecture: all

53
patches/j2sdk_1.4.2-1.diff
View File

@@ -83,7 +83,7 @@
+fi +fi
--- j2sdk-1.4.2.orig/debian/rules --- j2sdk-1.4.2.orig/debian/rules
+++ j2sdk-1.4.2/debian/rules +++ j2sdk-1.4.2/debian/rules
@@ -0,0 +1,84 @@ @@ -0,0 +1,99 @@
+#!/usr/bin/make -f +#!/usr/bin/make -f
+# debian/rules for alien +# debian/rules for alien
+ +
@@ -95,6 +95,9 @@
+ +
+PACKAGE=$(shell dh_listpackages) +PACKAGE=$(shell dh_listpackages)
+ +
+JAVA_HOME := debian/$(PACKAGE)/usr/lib/j2sdk-1.4.2
+MAN_DIR := debian/$(PACKAGE)/usr/share/man
+
+build: +build:
+ dh_testdir + dh_testdir
+ +
@@ -119,30 +122,42 @@
+# If you need to move files around in debian/$(PACKAGE) or do some +# If you need to move files around in debian/$(PACKAGE) or do some
+# binary patching, do it here +# 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 + rmdir debian/$(PACKAGE)/usr/java
+ +
+ mv debian/$(PACKAGE)/usr/lib/j2sdk-1.4.2/man/* \ +# Move man pages to /usr/share/man
+ debian/$(PACKAGE)/usr/share/man + mv $(JAVA_HOME)/man/* $(MAN_DIR)
+ rmdir debian/$(PACKAGE)/usr/lib/j2sdk-1.4.2/man + rmdir $(JAVA_HOME)/man
+ +
+ rm debian/$(PACKAGE)/usr/share/man/ja +# Move Japanese man pages further
+ mv debian/$(PACKAGE)/usr/share/man/ja_JP.eucJP \ + rm $(MAN_DIR)/ja
+ debian/$(PACKAGE)/usr/share/man/ja + mv $(MAN_DIR)/ja_JP.eucJP $(MAN_DIR)/ja
+ + for i in `find $(MAN_DIR) -type f` ; \
+ for i in `find debian/$(PACKAGE)/usr/share/man -type f` ; \
+ do mv $$i `echo $$i | sed 's/\.\([^.]*\)$$/.j2sdk-1_4_2.\1/'` ; \ + do mv $$i `echo $$i | sed 's/\.\([^.]*\)$$/.j2sdk-1_4_2.\1/'` ; \
+ done + done
+ +
+ if [ -x debian/$(PACKAGE)/usr/lib/j2sdk-1.4.2/lib/unpack ] ; then \ +# Unpack tripple compressed jars that showed up in 1.4.2
+ for i in `find debian/$(PACKAGE)/usr/lib/j2sdk-1.4.2 \ + if [ -x $(JAVA_HOME)/lib/unpack ] ; then \
+ -name \*.pack` ; do \ + for i in `find $(JAVA_HOME) -name \*.pack` ; do \
+ debian/$(PACKAGE)/usr/lib/j2sdk-1.4.2/lib/unpack \ + $(JAVA_HOME)/lib/unpack \
+ $$i `dirname $$i`/`basename $$i .pack`.jar ; \ + $$i `dirname $$i`/`basename $$i .pack`.jar ; \
+ done ; \ + done ; \
+ fi + 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 \ + if [ -f ../j2sdk-1_4_2-doc.zip ] ; then \
+ unzip -q -d debian/$(PACKAGE)/usr/share/doc \ + unzip -q -d debian/$(PACKAGE)/usr/share/doc \
+ ../j2sdk-1_4_2-doc.zip ; \ + ../j2sdk-1_4_2-doc.zip ; \
@@ -170,7 +185,13 @@
+.PHONY: build clean binary-indep binary-arch binary +.PHONY: build clean binary-indep binary-arch binary
--- j2sdk-1.4.2.orig/debian/changelog --- j2sdk-1.4.2.orig/debian/changelog
+++ j2sdk-1.4.2/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 <gturner@newedgenetworks.com> Thu, 10 Jul 2003 09:59:23 -0700
+
+j2sdk (1:1.4.2-1) experimental; urgency=low +j2sdk (1:1.4.2-1) experimental; urgency=low
+ +
+ * alien echoes the wrong filename, "j2sdk_1.4.2-1_i386.deb generated", + * alien echoes the wrong filename, "j2sdk_1.4.2-1_i386.deb generated",