You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2007/08/09 10:24:47 UTC
svn commit: r564136 - /harmony/enhanced/trunk/debian/
Author: hindessm
Date: Thu Aug 9 01:24:46 2007
New Revision: 564136
URL: http://svn.apache.org/viewvc?view=rev&rev=564136
Log:
Changed package name.
Added:
harmony/enhanced/trunk/debian/harmony-5.0-hdk.dirs
- copied, changed from r563898, harmony/enhanced/trunk/debian/apache-harmony-hdk.dirs
harmony/enhanced/trunk/debian/harmony-5.0-jdk.dirs
- copied, changed from r563898, harmony/enhanced/trunk/debian/apache-harmony-jdk.dirs
harmony/enhanced/trunk/debian/harmony-5.0-jdk.links
- copied, changed from r563898, harmony/enhanced/trunk/debian/apache-harmony-jdk.links
harmony/enhanced/trunk/debian/harmony-5.0-jdk.postinst
- copied, changed from r563898, harmony/enhanced/trunk/debian/apache-harmony-jdk.postinst
harmony/enhanced/trunk/debian/harmony-5.0-jdk.prerm
- copied, changed from r563898, harmony/enhanced/trunk/debian/apache-harmony-jdk.prerm
harmony/enhanced/trunk/debian/harmony-5.0-jre.dirs
- copied, changed from r563898, harmony/enhanced/trunk/debian/apache-harmony-jre.dirs
harmony/enhanced/trunk/debian/harmony-5.0-jre.links
- copied, changed from r563898, harmony/enhanced/trunk/debian/apache-harmony-jre.links
harmony/enhanced/trunk/debian/harmony-5.0-jre.lintian
- copied, changed from r563898, harmony/enhanced/trunk/debian/apache-harmony-jre.lintian
harmony/enhanced/trunk/debian/harmony-5.0-jre.postinst
- copied, changed from r563898, harmony/enhanced/trunk/debian/apache-harmony-jre.postinst
harmony/enhanced/trunk/debian/harmony-5.0-jre.prerm
- copied, changed from r563898, harmony/enhanced/trunk/debian/apache-harmony-jre.prerm
Removed:
harmony/enhanced/trunk/debian/apache-harmony-hdk.dirs
harmony/enhanced/trunk/debian/apache-harmony-jdk.dirs
harmony/enhanced/trunk/debian/apache-harmony-jdk.links
harmony/enhanced/trunk/debian/apache-harmony-jdk.postinst
harmony/enhanced/trunk/debian/apache-harmony-jdk.prerm
harmony/enhanced/trunk/debian/apache-harmony-jre.dirs
harmony/enhanced/trunk/debian/apache-harmony-jre.links
harmony/enhanced/trunk/debian/apache-harmony-jre.lintian
harmony/enhanced/trunk/debian/apache-harmony-jre.postinst
harmony/enhanced/trunk/debian/apache-harmony-jre.prerm
Modified:
harmony/enhanced/trunk/debian/changelog
harmony/enhanced/trunk/debian/control
harmony/enhanced/trunk/debian/rules
Modified: harmony/enhanced/trunk/debian/changelog
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/changelog?view=diff&rev=564136&r1=564135&r2=564136
==============================================================================
--- harmony/enhanced/trunk/debian/changelog (original)
+++ harmony/enhanced/trunk/debian/changelog Thu Aug 9 01:24:46 2007
@@ -1,3 +1,9 @@
+harmony-5.0 (0.0r564135-1) unstable; urgency=low
+
+ * Changed package name.
+
+ -- Mark Hindess <ma...@googlemail.com> Thu, 9 Aug 2007 09:23:37 +0100
+
apache-harmony (0.0r563886-1) unstable; urgency=low
* Added hdk.
Modified: harmony/enhanced/trunk/debian/control
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/control?view=diff&rev=564136&r1=564135&r2=564136
==============================================================================
--- harmony/enhanced/trunk/debian/control (original)
+++ harmony/enhanced/trunk/debian/control Thu Aug 9 01:24:46 2007
@@ -5,22 +5,22 @@
Build-Depends: debhelper (>= 5)
Standards-Version: 3.7.2
-Package: apache-harmony-jre
+Package: harmony-5.0-jre
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: java-virtual-machine, java-runtime, java1-runtime, java2-runtime
Description: Apache Harmony JRE
<insert long description, indented with spaces>
-Package: apache-harmony-jdk
+Package: harmony-5.0-jdk
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, apache-harmony-jre
+Depends: ${shlibs:Depends}, ${misc:Depends}, harmony-5.0-jre
Provides: java-compiler, java2-compiler
Description: Apache Harmony JDK
<insert long description, indented with spaces>
-Package: apache-harmony-hdk
+Package: harmony-5.0-hdk
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, apache-harmony-jdk
+Depends: ${shlibs:Depends}, ${misc:Depends}, harmony-5.0-jdk
Description: Apache Harmony HDK
<insert long description, indented with spaces>
Copied: harmony/enhanced/trunk/debian/harmony-5.0-hdk.dirs (from r563898, harmony/enhanced/trunk/debian/apache-harmony-hdk.dirs)
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/harmony-5.0-hdk.dirs?view=diff&rev=564136&p1=harmony/enhanced/trunk/debian/apache-harmony-hdk.dirs&r1=563898&p2=harmony/enhanced/trunk/debian/harmony-5.0-hdk.dirs&r2=564136
==============================================================================
--- harmony/enhanced/trunk/debian/apache-harmony-hdk.dirs (original)
+++ harmony/enhanced/trunk/debian/harmony-5.0-hdk.dirs Thu Aug 9 01:24:46 2007
@@ -1 +1 @@
-usr/lib/apache-harmony-java5
+usr/lib/harmony-5.0
Copied: harmony/enhanced/trunk/debian/harmony-5.0-jdk.dirs (from r563898, harmony/enhanced/trunk/debian/apache-harmony-jdk.dirs)
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/harmony-5.0-jdk.dirs?view=diff&rev=564136&p1=harmony/enhanced/trunk/debian/apache-harmony-jdk.dirs&r1=563898&p2=harmony/enhanced/trunk/debian/harmony-5.0-jdk.dirs&r2=564136
==============================================================================
--- harmony/enhanced/trunk/debian/apache-harmony-jdk.dirs (original)
+++ harmony/enhanced/trunk/debian/harmony-5.0-jdk.dirs Thu Aug 9 01:24:46 2007
@@ -1 +1 @@
-usr/lib/apache-harmony-java5/jdk
+usr/lib/harmony-5.0/jdk
Copied: harmony/enhanced/trunk/debian/harmony-5.0-jdk.links (from r563898, harmony/enhanced/trunk/debian/apache-harmony-jdk.links)
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/harmony-5.0-jdk.links?view=diff&rev=564136&p1=harmony/enhanced/trunk/debian/apache-harmony-jdk.links&r1=563898&p2=harmony/enhanced/trunk/debian/harmony-5.0-jdk.links&r2=564136
==============================================================================
--- harmony/enhanced/trunk/debian/apache-harmony-jdk.links (original)
+++ harmony/enhanced/trunk/debian/harmony-5.0-jdk.links Thu Aug 9 01:24:46 2007
@@ -1,4 +1,4 @@
-/usr/lib/apache-harmony-java5/jdk/bin/jarsigner /usr/bin/jarsigner-harmony
-/usr/lib/apache-harmony-java5/jdk/bin/javac /usr/bin/javac-harmony
-/usr/lib/apache-harmony-java5/jdk/bin/javah /usr/bin/javah-harmony
-/usr/lib/apache-harmony-java5/jdk/bin/keytool /usr/bin/keytool-harmony
+/usr/lib/harmony-5.0/jdk/bin/jarsigner /usr/bin/jarsigner-harmony
+/usr/lib/harmony-5.0/jdk/bin/javac /usr/bin/javac-harmony
+/usr/lib/harmony-5.0/jdk/bin/javah /usr/bin/javah-harmony
+/usr/lib/harmony-5.0/jdk/bin/keytool /usr/bin/keytool-harmony
Copied: harmony/enhanced/trunk/debian/harmony-5.0-jdk.postinst (from r563898, harmony/enhanced/trunk/debian/apache-harmony-jdk.postinst)
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/harmony-5.0-jdk.postinst?view=diff&rev=564136&p1=harmony/enhanced/trunk/debian/apache-harmony-jdk.postinst&r1=563898&p2=harmony/enhanced/trunk/debian/harmony-5.0-jdk.postinst&r2=564136
==============================================================================
--- harmony/enhanced/trunk/debian/apache-harmony-jdk.postinst (original)
+++ harmony/enhanced/trunk/debian/harmony-5.0-jdk.postinst Thu Aug 9 01:24:46 2007
@@ -1,5 +1,5 @@
#!/bin/sh
-# postinst script for apache-harmony-jdk
+# postinst script for harmony-5.0-jdk
#
# see: dh_installdeb(1)
Copied: harmony/enhanced/trunk/debian/harmony-5.0-jdk.prerm (from r563898, harmony/enhanced/trunk/debian/apache-harmony-jdk.prerm)
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/harmony-5.0-jdk.prerm?view=diff&rev=564136&p1=harmony/enhanced/trunk/debian/apache-harmony-jdk.prerm&r1=563898&p2=harmony/enhanced/trunk/debian/harmony-5.0-jdk.prerm&r2=564136
==============================================================================
--- harmony/enhanced/trunk/debian/apache-harmony-jdk.prerm (original)
+++ harmony/enhanced/trunk/debian/harmony-5.0-jdk.prerm Thu Aug 9 01:24:46 2007
@@ -1,5 +1,5 @@
#!/bin/sh
-# prerm script for apache-harmony-jdk
+# prerm script for harmony-5.0-jdk
#
# see: dh_installdeb(1)
Copied: harmony/enhanced/trunk/debian/harmony-5.0-jre.dirs (from r563898, harmony/enhanced/trunk/debian/apache-harmony-jre.dirs)
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/harmony-5.0-jre.dirs?view=diff&rev=564136&p1=harmony/enhanced/trunk/debian/apache-harmony-jre.dirs&r1=563898&p2=harmony/enhanced/trunk/debian/harmony-5.0-jre.dirs&r2=564136
==============================================================================
--- harmony/enhanced/trunk/debian/apache-harmony-jre.dirs (original)
+++ harmony/enhanced/trunk/debian/harmony-5.0-jre.dirs Thu Aug 9 01:24:46 2007
@@ -1 +1 @@
-usr/lib/apache-harmony-java5/jdk/jre
+usr/lib/harmony-5.0/jdk/jre
Copied: harmony/enhanced/trunk/debian/harmony-5.0-jre.links (from r563898, harmony/enhanced/trunk/debian/apache-harmony-jre.links)
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/harmony-5.0-jre.links?view=diff&rev=564136&p1=harmony/enhanced/trunk/debian/apache-harmony-jre.links&r1=563898&p2=harmony/enhanced/trunk/debian/harmony-5.0-jre.links&r2=564136
==============================================================================
--- harmony/enhanced/trunk/debian/apache-harmony-jre.links (original)
+++ harmony/enhanced/trunk/debian/harmony-5.0-jre.links Thu Aug 9 01:24:46 2007
@@ -1 +1 @@
-/usr/lib/apache-harmony-java5/jdk/jre/bin/java /usr/bin/java-harmony
+/usr/lib/harmony-5.0/jdk/jre/bin/java /usr/bin/java-harmony
Copied: harmony/enhanced/trunk/debian/harmony-5.0-jre.lintian (from r563898, harmony/enhanced/trunk/debian/apache-harmony-jre.lintian)
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/harmony-5.0-jre.lintian?view=diff&rev=564136&p1=harmony/enhanced/trunk/debian/apache-harmony-jre.lintian&r1=563898&p2=harmony/enhanced/trunk/debian/harmony-5.0-jre.lintian&r2=564136
==============================================================================
--- harmony/enhanced/trunk/debian/apache-harmony-jre.lintian (original)
+++ harmony/enhanced/trunk/debian/harmony-5.0-jre.lintian Thu Aug 9 01:24:46 2007
@@ -1,2 +1,2 @@
-apache-harmony-jre: shlib-without-PT_GNU_STACK-section usr/lib/apache-harmony-java5/jdk/jre/bin/libicudata.so.34
-apache-harmony-jre: shared-lib-without-dependency-information ./usr/lib/apache-harmony-java5/jdk/jre/bin/libicudata.so.34
+harmony-5.0-jre: shlib-without-PT_GNU_STACK-section usr/lib/harmony-5.0/jdk/jre/bin/libicudata.so.34
+harmony-5.0-jre: shared-lib-without-dependency-information ./usr/lib/harmony-5.0/jdk/jre/bin/libicudata.so.34
Copied: harmony/enhanced/trunk/debian/harmony-5.0-jre.postinst (from r563898, harmony/enhanced/trunk/debian/apache-harmony-jre.postinst)
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/harmony-5.0-jre.postinst?view=diff&rev=564136&p1=harmony/enhanced/trunk/debian/apache-harmony-jre.postinst&r1=563898&p2=harmony/enhanced/trunk/debian/harmony-5.0-jre.postinst&r2=564136
==============================================================================
--- harmony/enhanced/trunk/debian/apache-harmony-jre.postinst (original)
+++ harmony/enhanced/trunk/debian/harmony-5.0-jre.postinst Thu Aug 9 01:24:46 2007
@@ -1,5 +1,5 @@
#!/bin/sh
-# postinst script for apache-harmony-jre
+# postinst script for harmony-5.0-jre
#
# see: dh_installdeb(1)
Copied: harmony/enhanced/trunk/debian/harmony-5.0-jre.prerm (from r563898, harmony/enhanced/trunk/debian/apache-harmony-jre.prerm)
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/harmony-5.0-jre.prerm?view=diff&rev=564136&p1=harmony/enhanced/trunk/debian/apache-harmony-jre.prerm&r1=563898&p2=harmony/enhanced/trunk/debian/harmony-5.0-jre.prerm&r2=564136
==============================================================================
--- harmony/enhanced/trunk/debian/apache-harmony-jre.prerm (original)
+++ harmony/enhanced/trunk/debian/harmony-5.0-jre.prerm Thu Aug 9 01:24:46 2007
@@ -1,5 +1,5 @@
#!/bin/sh
-# prerm script for apache-harmony-jre
+# prerm script for harmony-5.0-jre
#
# see: dh_installdeb(1)
Modified: harmony/enhanced/trunk/debian/rules
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/rules?view=diff&rev=564136&r1=564135&r2=564136
==============================================================================
--- harmony/enhanced/trunk/debian/rules (original)
+++ harmony/enhanced/trunk/debian/rules Thu Aug 9 01:24:46 2007
@@ -10,9 +10,9 @@
# Modified to make a template file for a multi-binary package with separated
# build-arch and build-indep targets by Bill Allombert 2001
-JREDIR=$(CURDIR)/debian/apache-harmony-jre
-JDKDIR=$(CURDIR)/debian/apache-harmony-jdk
-HDKDIR=$(CURDIR)/debian/apache-harmony-hdk
+JREDIR=$(CURDIR)/debian/harmony-5.0-jre
+JDKDIR=$(CURDIR)/debian/harmony-5.0-jdk
+HDKDIR=$(CURDIR)/debian/harmony-5.0-hdk
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -83,17 +83,17 @@
dh_clean -k -s --exclude ./working_classlib/modules/luni/src/main/native/fdlibm_dist/Makefile.orig --exclude ./working_classlib/modules/luni/src/main/native/fdlibm_dist/fdlibm.h.orig --exclude ./working_classlib/modules/luni/src/main/native/fdlibm_dist/s_lib_version.c.orig --exclude ./working_classlib/modules/archive/src/main/native/zlib_dist/Makefile.orig
dh_installdirs -s
- mkdir -p $(JREDIR)/usr/lib/apache-harmony-java5/jdk
- mv $(CURDIR)/target/hdk/jdk/jre $(JREDIR)/usr/lib/apache-harmony-java5/jdk
+ mkdir -p $(JREDIR)/usr/lib/harmony-5.0/jdk
+ mv $(CURDIR)/target/hdk/jdk/jre $(JREDIR)/usr/lib/harmony-5.0/jdk
mkdir -p $(JREDIR)/usr/share/lintian/overrides
- cp -pr $(CURDIR)/debian/apache-harmony-jre.lintian \
- $(JREDIR)/usr/share/lintian/overrides/apache-harmony-jre
+ cp -pr $(CURDIR)/debian/harmony-5.0-jre.lintian \
+ $(JREDIR)/usr/share/lintian/overrides/harmony-5.0-jre
- mkdir -p $(JDKDIR)/usr/lib/apache-harmony-java5
- mv $(CURDIR)/target/hdk/jdk $(JDKDIR)/usr/lib/apache-harmony-java5
+ mkdir -p $(JDKDIR)/usr/lib/harmony-5.0
+ mv $(CURDIR)/target/hdk/jdk $(JDKDIR)/usr/lib/harmony-5.0
mkdir -p $(HDKDIR)/usr/lib
- mv $(CURDIR)/target/hdk $(HDKDIR)/usr/lib/apache-harmony-java5
+ mv $(CURDIR)/target/hdk $(HDKDIR)/usr/lib/harmony-5.0
dh_install -s
# Must not depend on anything. This is to be called by