Author: hindessm
Date: Thu Sep  3 11:56:26 2009
New Revision: 810903

URL: http://svn.apache.org/viewvc?rev=810903&view=rev
Log:
Improvements to debian packaging.

Added:
    harmony/enhanced/trunk/debian/patches/
    harmony/enhanced/trunk/debian/patches/01-ignore.suffix.on.samsa.tools.diff
Modified:
    harmony/enhanced/trunk/debian/changelog
    harmony/enhanced/trunk/debian/control
    harmony/enhanced/trunk/debian/harmony-5.0-jdk.links
    harmony/enhanced/trunk/debian/harmony-5.0-jdk.postinst
    harmony/enhanced/trunk/debian/harmony-5.0-jdk.prerm
    harmony/enhanced/trunk/debian/harmony-5.0-jre.links
    harmony/enhanced/trunk/debian/harmony-5.0-jre.postinst
    harmony/enhanced/trunk/debian/harmony-5.0-jre.prerm
    harmony/enhanced/trunk/debian/rules

Modified: harmony/enhanced/trunk/debian/changelog
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/changelog?rev=810903&r1=810902&r2=810903&view=diff
==============================================================================
--- harmony/enhanced/trunk/debian/changelog (original)
+++ harmony/enhanced/trunk/debian/changelog Thu Sep  3 11:56:26 2009
@@ -1,3 +1,15 @@
+harmony-5.0 (0.0r808406-1) unstable; urgency=low
+
+  * Milestone 11 release.
+
+ -- Mark Hindess <mark.hindess@googlemail.com>  Fri, 28 Aug 2009 05:56:51 +0100
+
+harmony-5.0 (0.0r782693-1) unstable; urgency=low
+
+  * Milestone 10 release.
+
+ -- Mark Hindess <mark.hindess@googlemail.com>  Tue,  9 Jun 2009 09:38:22 +0100
+
 harmony-5.0 (0.0r761593-1) unstable; urgency=low
 
   * Milestone 9 release.

Modified: harmony/enhanced/trunk/debian/control
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/control?rev=810903&r1=810902&r2=810903&view=diff
==============================================================================
--- harmony/enhanced/trunk/debian/control (original)
+++ harmony/enhanced/trunk/debian/control Thu Sep  3 11:56:26 2009
@@ -2,7 +2,7 @@
 Section: devel
 Priority: extra
 Maintainer: Mark Hindess <mark.hindess@googlemail.com>
-Build-Depends: debhelper (>= 5), ecj-bootstrap | libecj-java, ant, subversion, ant-optional, liblcms1-dev, libjpeg62-dev, libpng-dev, libxft-dev, libxml2-dev, libxtst-dev, libxext-dev
+Build-Depends: debhelper (>= 5), ecj-bootstrap | libecj-java, junit, ant (>= 1.7.0), subversion, ant-optional, liblcms1-dev, libjpeg62-dev, libpng-dev, libxft-dev, libxml2-dev, libxtst-dev, libxext-dev
 Standards-Version: 3.7.2
 
 Package: harmony-5.0-drlvm

Modified: harmony/enhanced/trunk/debian/harmony-5.0-jdk.links
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/harmony-5.0-jdk.links?rev=810903&r1=810902&r2=810903&view=diff
==============================================================================
--- harmony/enhanced/trunk/debian/harmony-5.0-jdk.links (original)
+++ harmony/enhanced/trunk/debian/harmony-5.0-jdk.links Thu Sep  3 11:56:26 2009
@@ -1,9 +1,10 @@
 /usr/lib/harmony-5.0/jdk/bin/appletviewer /usr/bin/appletviewer-harmony
+/usr/lib/harmony-5.0/jdk/bin/jar /usr/bin/jar-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/javadoc /usr/bin/javadoc-harmony
 /usr/lib/harmony-5.0/jdk/bin/javah /usr/bin/javah-harmony
 /usr/lib/harmony-5.0/jdk/bin/javap /usr/bin/javap-harmony
-/usr/lib/harmony-5.0/jdk/bin/keytool /usr/bin/keytool-harmony
-/usr/lib/harmony-5.0/jdk/bin/policytool /usr/bin/policytool-harmony
-/usr/lib/harmony-5.0/jdk/bin/unpack200 /usr/bin/unpack200-harmony
+/usr/lib/harmony-5.0/jdk/bin/rmic /usr/bin/rmic-harmony
+/usr/lib/harmony-5.0/jdk/bin/rmid /usr/bin/rmid-harmony
+/usr/lib/harmony-5.0/jdk/bin/rmiregistry /usr/bin/rmiregistry-harmony

Modified: harmony/enhanced/trunk/debian/harmony-5.0-jdk.postinst
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/harmony-5.0-jdk.postinst?rev=810903&r1=810902&r2=810903&view=diff
==============================================================================
--- harmony/enhanced/trunk/debian/harmony-5.0-jdk.postinst (original)
+++ harmony/enhanced/trunk/debian/harmony-5.0-jdk.postinst Thu Sep  3 11:56:26 2009
@@ -20,7 +20,8 @@
 
 case "$1" in
     configure)
-        for f in appletviewer jarsigner javac javadoc javah javap ; do
+        for f in appletviewer jar jarsigner javac javadoc javah javap \
+                 rmic rmid rmiregistry ; do
             update-alternatives \
                 --install /usr/bin/$f $f /usr/bin/$f-harmony 30 \
                 --slave /usr/share/man/man1/$f.1.gz $f.1.gz \

Modified: harmony/enhanced/trunk/debian/harmony-5.0-jdk.prerm
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/harmony-5.0-jdk.prerm?rev=810903&r1=810902&r2=810903&view=diff
==============================================================================
--- harmony/enhanced/trunk/debian/harmony-5.0-jdk.prerm (original)
+++ harmony/enhanced/trunk/debian/harmony-5.0-jdk.prerm Thu Sep  3 11:56:26 2009
@@ -19,7 +19,8 @@
 
 case "$1" in
     remove|deconfigure)
-        for f in appletviewer jarsigner javac javadoc javah javap ; do
+        for f in appletviewer jar jarsigner javac javadoc javah javap \
+                 rmic rmid rmiregistry ; do
             update-alternatives --remove $f /usr/bin/$f-harmony
         done
     ;;

Modified: harmony/enhanced/trunk/debian/harmony-5.0-jre.links
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/harmony-5.0-jre.links?rev=810903&r1=810902&r2=810903&view=diff
==============================================================================
--- harmony/enhanced/trunk/debian/harmony-5.0-jre.links (original)
+++ harmony/enhanced/trunk/debian/harmony-5.0-jre.links Thu Sep  3 11:56:26 2009
@@ -1 +1,5 @@
 /usr/lib/harmony-5.0/jdk/jre/bin/java /usr/bin/java-harmony
+/usr/lib/harmony-5.0/jdk/jre/bin/keytool /usr/bin/keytool-harmony
+/usr/lib/harmony-5.0/jdk/jre/bin/pack200 /usr/bin/pack200-harmony
+/usr/lib/harmony-5.0/jdk/jre/bin/policytool /usr/bin/policytool-harmony
+/usr/lib/harmony-5.0/jdk/jre/bin/unpack200 /usr/bin/unpack200-harmony

Modified: harmony/enhanced/trunk/debian/harmony-5.0-jre.postinst
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/harmony-5.0-jre.postinst?rev=810903&r1=810902&r2=810903&view=diff
==============================================================================
--- harmony/enhanced/trunk/debian/harmony-5.0-jre.postinst (original)
+++ harmony/enhanced/trunk/debian/harmony-5.0-jre.postinst Thu Sep  3 11:56:26 2009
@@ -20,7 +20,7 @@
 
 case "$1" in
     configure)
-        for f in java keytool policytool unpack200 ; do
+        for f in java keytool pack200 policytool unpack200 ; do
             update-alternatives \
                 --install /usr/bin/$f $f /usr/bin/$f-harmony 30 \
                 --slave /usr/share/man/man1/$f.1.gz $f.1.gz \

Modified: harmony/enhanced/trunk/debian/harmony-5.0-jre.prerm
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/harmony-5.0-jre.prerm?rev=810903&r1=810902&r2=810903&view=diff
==============================================================================
--- harmony/enhanced/trunk/debian/harmony-5.0-jre.prerm (original)
+++ harmony/enhanced/trunk/debian/harmony-5.0-jre.prerm Thu Sep  3 11:56:26 2009
@@ -19,7 +19,7 @@
 
 case "$1" in
     remove|deconfigure)
-        for f in java keytool policytool unpack200 ; do
+        for f in java keytool pack200 policytool unpack200 ; do
             update-alternatives --remove $f /usr/bin/$f-harmony
         done
     ;;

Added: harmony/enhanced/trunk/debian/patches/01-ignore.suffix.on.samsa.tools.diff
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/patches/01-ignore.suffix.on.samsa.tools.diff?rev=810903&view=auto
==============================================================================
--- harmony/enhanced/trunk/debian/patches/01-ignore.suffix.on.samsa.tools.diff (added)
+++ harmony/enhanced/trunk/debian/patches/01-ignore.suffix.on.samsa.tools.diff Thu Sep  3 11:56:26 2009
@@ -0,0 +1,15 @@
+Index: working_jdktools/modules/samsa/src/main/native/samsa/samsa.c
+===================================================================
+--- working_jdktools/modules/samsa/src/main/native/samsa/samsa.c	(revision 808406)
++++ working_jdktools/modules/samsa/src/main/native/samsa/samsa.c	(working copy)
+@@ -149,6 +149,10 @@
+         return 1;
+     }
+     
++    char *debian_suffix = strstr(toolName, "-harmony");
++    if (debian_suffix != NULL)
++      *debian_suffix = '\0';
++
+     isJavaw = strcmp(toolName, "javaw") == 0;
+ 
+     toolType = getToolType(root, toolName);

Modified: harmony/enhanced/trunk/debian/rules
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/rules?rev=810903&r1=810902&r2=810903&view=diff
==============================================================================
--- harmony/enhanced/trunk/debian/rules (original)
+++ harmony/enhanced/trunk/debian/rules Thu Sep  3 11:56:26 2009
@@ -40,6 +40,7 @@
 configure-stamp:
 	dh_testdir
 	# Add here commands to configure the package.
+	patch -p0 <debian/patches/01-ignore.suffix.on.samsa.tools.diff
 	touch configure-stamp