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/08 16:01:03 UTC
svn commit: r563886 - in /harmony/enhanced/trunk: ./ debian/
Author: hindessm
Date: Wed Aug 8 07:01:02 2007
New Revision: 563886
URL: http://svn.apache.org/viewvc?view=rev&rev=563886
Log:
Add hdk package.
Make hdk require jdk which in turn requires jre.
Added:
harmony/enhanced/trunk/debian/apache-harmony-hdk.dirs
Removed:
harmony/enhanced/trunk/debian/apache-harmony-jdk.lintian
Modified:
harmony/enhanced/trunk/ (props changed)
harmony/enhanced/trunk/debian/ (props changed)
harmony/enhanced/trunk/debian/apache-harmony-jdk.dirs
harmony/enhanced/trunk/debian/apache-harmony-jdk.links
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/changelog
harmony/enhanced/trunk/debian/control
harmony/enhanced/trunk/debian/copyright
harmony/enhanced/trunk/debian/rules
Propchange: harmony/enhanced/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 8 07:01:02 2007
@@ -1 +1,4 @@
target
+configure-stamp
+build-arch-stamp
+build-indep-stamp
Propchange: harmony/enhanced/trunk/debian/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 8 07:01:02 2007
@@ -0,0 +1,9 @@
+files
+apache-harmony-jre.postinst.debhelper
+apache-harmony-jre.postrm.debhelper
+apache-harmony-hdk.substvars
+apache-harmony-jdk.substvars
+apache-harmony-hdk
+apache-harmony-jdk
+apache-harmony-jre.substvars
+apache-harmony-jre
Added: harmony/enhanced/trunk/debian/apache-harmony-hdk.dirs
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/apache-harmony-hdk.dirs?view=auto&rev=563886
==============================================================================
--- harmony/enhanced/trunk/debian/apache-harmony-hdk.dirs (added)
+++ harmony/enhanced/trunk/debian/apache-harmony-hdk.dirs Wed Aug 8 07:01:02 2007
@@ -0,0 +1 @@
+usr/lib/apache-harmony-java5
Modified: harmony/enhanced/trunk/debian/apache-harmony-jdk.dirs
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/apache-harmony-jdk.dirs?view=diff&rev=563886&r1=563885&r2=563886
==============================================================================
--- harmony/enhanced/trunk/debian/apache-harmony-jdk.dirs (original)
+++ harmony/enhanced/trunk/debian/apache-harmony-jdk.dirs Wed Aug 8 07:01:02 2007
@@ -1 +1 @@
-/usr/lib/apache-harmony-jdk
+usr/lib/apache-harmony-java5/jdk
Modified: harmony/enhanced/trunk/debian/apache-harmony-jdk.links
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/apache-harmony-jdk.links?view=diff&rev=563886&r1=563885&r2=563886
==============================================================================
--- harmony/enhanced/trunk/debian/apache-harmony-jdk.links (original)
+++ harmony/enhanced/trunk/debian/apache-harmony-jdk.links Wed Aug 8 07:01:02 2007
@@ -1,5 +1,4 @@
-/usr/bin/jarsigner-harmony /usr/lib/apache-harmony-jdk/bin/jarsigner
-/usr/bin/java-harmony /usr/lib/apache-harmony-jdk/bin/java
-/usr/bin/javac-harmony /usr/lib/apache-harmony-jdk/bin/javac
-/usr/bin/javah-harmony /usr/lib/apache-harmony-jdk/bin/javah
-/usr/bin/keytool-harmony /usr/lib/apache-harmony-jdk/bin/keytool
+/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
Modified: harmony/enhanced/trunk/debian/apache-harmony-jre.dirs
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/apache-harmony-jre.dirs?view=diff&rev=563886&r1=563885&r2=563886
==============================================================================
--- harmony/enhanced/trunk/debian/apache-harmony-jre.dirs (original)
+++ harmony/enhanced/trunk/debian/apache-harmony-jre.dirs Wed Aug 8 07:01:02 2007
@@ -1 +1 @@
-/usr/lib/apache-harmony-jre
+usr/lib/apache-harmony-java5/jdk/jre
Modified: harmony/enhanced/trunk/debian/apache-harmony-jre.links
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/apache-harmony-jre.links?view=diff&rev=563886&r1=563885&r2=563886
==============================================================================
--- harmony/enhanced/trunk/debian/apache-harmony-jre.links (original)
+++ harmony/enhanced/trunk/debian/apache-harmony-jre.links Wed Aug 8 07:01:02 2007
@@ -1 +1 @@
-/usr/bin/java-harmony /usr/lib/apache-harmony-jre/bin/java
+/usr/lib/apache-harmony-java5/jdk/jre/bin/java /usr/bin/java-harmony
Modified: harmony/enhanced/trunk/debian/apache-harmony-jre.lintian
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/apache-harmony-jre.lintian?view=diff&rev=563886&r1=563885&r2=563886
==============================================================================
--- harmony/enhanced/trunk/debian/apache-harmony-jre.lintian (original)
+++ harmony/enhanced/trunk/debian/apache-harmony-jre.lintian Wed Aug 8 07:01:02 2007
@@ -1,2 +1,2 @@
-apache-harmony-jre: shlib-without-PT_GNU_STACK-section usr/lib/apache-harmony-jre/bin/libicudata.so.34
-apache-harmony-jre: shared-lib-without-dependency-information ./usr/lib/apache-harmony-jre/bin/libicudata.so.34
+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
Modified: harmony/enhanced/trunk/debian/changelog
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/changelog?view=diff&rev=563886&r1=563885&r2=563886
==============================================================================
--- harmony/enhanced/trunk/debian/changelog (original)
+++ harmony/enhanced/trunk/debian/changelog Wed Aug 8 07:01:02 2007
@@ -1,3 +1,11 @@
+apache-harmony (0.0r563886-1) unstable; urgency=low
+
+ * Added hdk.
+ * Make hdk require jdk which in turn requires jre.
+ * Add lintian overrides for icu libraries.
+
+ -- Mark Hindess <ma...@googlemail.com> Wed, 8 Aug 2007 14:58:28 +0100
+
apache-harmony (0.0r562079-1) unstable; urgency=low
* Initial attempt at Debian package. Still needs a lot of work.
Modified: harmony/enhanced/trunk/debian/control
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/control?view=diff&rev=563886&r1=563885&r2=563886
==============================================================================
--- harmony/enhanced/trunk/debian/control (original)
+++ harmony/enhanced/trunk/debian/control Wed Aug 8 07:01:02 2007
@@ -8,13 +8,19 @@
Package: apache-harmony-jre
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: apache-harmony-jdk
+Provides: java-virtual-machine, java-runtime, java1-runtime, java2-runtime
Description: Apache Harmony JRE
<insert long description, indented with spaces>
Package: apache-harmony-jdk
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: apache-harmony-jre
+Depends: ${shlibs:Depends}, ${misc:Depends}, apache-harmony-jre
+Provides: java-compiler, java2-compiler
Description: Apache Harmony JDK
+ <insert long description, indented with spaces>
+
+Package: apache-harmony-hdk
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, apache-harmony-jdk
+Description: Apache Harmony HDK
<insert long description, indented with spaces>
Modified: harmony/enhanced/trunk/debian/copyright
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/copyright?view=diff&rev=563886&r1=563885&r2=563886
==============================================================================
--- harmony/enhanced/trunk/debian/copyright (original)
+++ harmony/enhanced/trunk/debian/copyright Wed Aug 8 07:01:02 2007
@@ -4,7 +4,7 @@
It was downloaded from the Apache Harmony subversion repository. (See
http://harmony.apache.org/)
-Upstream Author(s):
+Upstream Authors:
The Apache Harmony team, see http://harmony.apache.org/contributors.html
for details.
Modified: harmony/enhanced/trunk/debian/rules
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/rules?view=diff&rev=563886&r1=563885&r2=563886
==============================================================================
--- harmony/enhanced/trunk/debian/rules (original)
+++ harmony/enhanced/trunk/debian/rules Wed Aug 8 07:01:02 2007
@@ -12,6 +12,7 @@
JREDIR=$(CURDIR)/debian/apache-harmony-jre
JDKDIR=$(CURDIR)/debian/apache-harmony-jdk
+HDKDIR=$(CURDIR)/debian/apache-harmony-hdk
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -82,22 +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
- # Add here commands to install the arch part of the package into
- # debian/tmp.
- # $(MAKE) DESTDIR=$(CURDIR)/debian/apache-harmony install
- mkdir -p $(JDKDIR)/usr/lib
- cp -pr $(CURDIR)/target/hdk/jdk/* \
- $(JDKDIR)/usr/lib/apache-harmony-jdk
- mkdir -p $(JDKDIR)/usr/share/lintian/overrides
- cp -pr $(CURDIR)/debian/apache-harmony-jdk.lintian \
- $(JDKDIR)/usr/share/lintian/overrides/apache-harmony-jdk
-
- mkdir -p $(JREDIR)/usr/lib
- cp -lpr $(JDKDIR)/usr/lib/apache-harmony-jdk/jre/* \
- $(JREDIR)/usr/lib/apache-harmony-jre
+ 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/share/lintian/overrides
cp -pr $(CURDIR)/debian/apache-harmony-jre.lintian \
$(JREDIR)/usr/share/lintian/overrides/apache-harmony-jre
+
+ mkdir -p $(JDKDIR)/usr/lib/apache-harmony-java5
+ mv $(CURDIR)/target/hdk/jdk $(JDKDIR)/usr/lib/apache-harmony-java5
+
+ mkdir -p $(HDKDIR)/usr/lib
+ mv $(CURDIR)/target/hdk $(HDKDIR)/usr/lib/apache-harmony-java5
dh_install -s
# Must not depend on anything. This is to be called by