[pkg-java] r3801 - in trunk/ant/debian: . patches

mkoch at alioth.debian.org mkoch at alioth.debian.org
Sun Jul 8 07:24:22 UTC 2007 

Author: mkoch
Date: 2007-07-08 07:24:22 +0000 (Sun, 08 Jul 2007)
New Revision: 3801

Added:
   trunk/ant/debian/patches/04_no_test-jars.patch
Removed:
   trunk/ant/debian/patches/03_SplashTaskPatch_b.patch
   trunk/ant/debian/patches/03_SplashTaskPatch_c.patch
   trunk/ant/debian/patches/04_UUMailerReflection.patch
   trunk/ant/debian/patches/05_TaskAvailabilityFix_ANT_PR38260.patch
Modified:
   trunk/ant/debian/README.Debian
   trunk/ant/debian/ant.links
   trunk/ant/debian/changelog
   trunk/ant/debian/patches/01_gjdoc_task.patch
   trunk/ant/debian/patches/01_javadoc_maxmemory.patch
   trunk/ant/debian/patches/03_SplashTaskPatch_a.patch
   trunk/ant/debian/rules
Log:
ant (1.7.0-1) unstable; urgency=low

  * New upstream version. Closes: #412716.
  * Updated debian/patches/01_gjdoc_task.patch.
  * Removed debian/patches/03_SplashTaskPatch_b.patch. Obsoleted.
  * Removed debian/patches/03_SplashTaskPatch_c.patch. Obsoleted.
  * Removed debian/patches/04_UUMailerReflection.patch. Obsoleted.
  * Removed debian/patches/05_TaskAvailabilityFix_ANT_PR38260.patch.
    Obsoleted.

 -- Michael Koch <konqueror at gmx.de>  Sat, 07 Jul 2007 09:13:08 -0100



Modified: trunk/ant/debian/README.Debian
===================================================================
--- trunk/ant/debian/README.Debian	2007-07-08 00:28:50 UTC (rev 3800)
+++ trunk/ant/debian/README.Debian	2007-07-08 07:24:22 UTC (rev 3801)
@@ -1,4 +1,4 @@
-Ant 1.6 for Debian
+Ant 1.7 for Debian
 ==================
 
   All JAR archives in /usr/share/ant/lib/ are appended to the classpath

Modified: trunk/ant/debian/ant.links
===================================================================
--- trunk/ant/debian/ant.links	2007-07-08 00:28:50 UTC (rev 3800)
+++ trunk/ant/debian/ant.links	2007-07-08 07:24:22 UTC (rev 3801)
@@ -1,5 +1,5 @@
 /usr/share/ant/bin/ant			/usr/bin/ant
-/usr/share/ant/lib/ant.jar		/usr/share/java/ant-1.6.jar
+/usr/share/ant/lib/ant.jar		/usr/share/java/ant-1.7.jar
 /usr/share/ant/lib/ant.jar		/usr/share/java/ant.jar
 /usr/share/ant/lib/ant-launcher.jar	/usr/share/java/ant-launcher.jar
 /usr/share/ant/lib/ant-bootstrap.jar	/usr/share/java/ant-bootstrap.jar

Modified: trunk/ant/debian/changelog
===================================================================
--- trunk/ant/debian/changelog	2007-07-08 00:28:50 UTC (rev 3800)
+++ trunk/ant/debian/changelog	2007-07-08 07:24:22 UTC (rev 3801)
@@ -1,3 +1,15 @@
+ant (1.7.0-1) unstable; urgency=low
+
+  * New upstream version. Closes: #412716.
+  * Updated debian/patches/01_gjdoc_task.patch.
+  * Removed debian/patches/03_SplashTaskPatch_b.patch. Obsoleted.
+  * Removed debian/patches/03_SplashTaskPatch_c.patch. Obsoleted.
+  * Removed debian/patches/04_UUMailerReflection.patch. Obsoleted.
+  * Removed debian/patches/05_TaskAvailabilityFix_ANT_PR38260.patch.
+    Obsoleted.
+
+ -- Michael Koch <konqueror at gmx.de>  Sat, 07 Jul 2007 09:13:08 -0100
+
 ant (1.6.5-9) unstable; urgency=low
 
   * Fixed generation of binary-arch only packages. Closes: #430662.

Modified: trunk/ant/debian/patches/01_gjdoc_task.patch
===================================================================
--- trunk/ant/debian/patches/01_gjdoc_task.patch	2007-07-08 00:28:50 UTC (rev 3800)
+++ trunk/ant/debian/patches/01_gjdoc_task.patch	2007-07-08 07:24:22 UTC (rev 3801)
@@ -1,14 +1,14 @@
 diff -uNr src.orig/main/org/apache/tools/ant/taskdefs/defaults.properties src/main/org/apache/tools/ant/taskdefs/defaults.properties
---- src.orig/main/org/apache/tools/ant/taskdefs/defaults.properties	2004-01-14 20:32:29.000000000 +0900
-+++ src/main/org/apache/tools/ant/taskdefs/defaults.properties	2004-01-14 20:33:04.000000000 +0900
-@@ -14,6 +14,7 @@
- unwar=org.apache.tools.ant.taskdefs.Expand
- echo=org.apache.tools.ant.taskdefs.Echo
+--- src/main/org/apache/tools/ant/taskdefs/defaults.properties.orig	2007-07-07 08:01:03.000000000 -0100
++++ src/main/org/apache/tools/ant/taskdefs/defaults.properties	2007-07-07 08:01:53.000000000 -0100
+@@ -40,6 +40,7 @@
+ java=org.apache.tools.ant.taskdefs.Java
+ javac=org.apache.tools.ant.taskdefs.Javac
  javadoc=org.apache.tools.ant.taskdefs.Javadoc
 +gjdoc=org.apache.tools.ant.taskdefs.Gjdoc
- zip=org.apache.tools.ant.taskdefs.Zip
- gzip=org.apache.tools.ant.taskdefs.GZip
- gunzip=org.apache.tools.ant.taskdefs.GUnzip
+ length=org.apache.tools.ant.taskdefs.Length
+ loadfile=org.apache.tools.ant.taskdefs.LoadFile
+ loadproperties=org.apache.tools.ant.taskdefs.LoadProperties
 diff -uNr src.orig/main/org/apache/tools/ant/taskdefs/Gjdoc.java src/main/org/apache/tools/ant/taskdefs/Gjdoc.java
 --- src.orig/main/org/apache/tools/ant/taskdefs/Gjdoc.java	1970-01-01 01:00:00.000000000 +0100
 +++ src/main/org/apache/tools/ant/taskdefs/Gjdoc.java	2005-05-21 16:28:09.000000000 +0200

Modified: trunk/ant/debian/patches/01_javadoc_maxmemory.patch
===================================================================
--- trunk/ant/debian/patches/01_javadoc_maxmemory.patch	2007-07-08 00:28:50 UTC (rev 3800)
+++ trunk/ant/debian/patches/01_javadoc_maxmemory.patch	2007-07-08 07:24:22 UTC (rev 3801)
@@ -1,11 +1,18 @@
---- build.xml.orig	2005-07-09 20:51:24.000000000 +0200
-+++ build.xml	2005-07-09 20:42:08.000000000 +0200
-@@ -1352,7 +1352,7 @@
-              version="true"
-              locale="en"
-              windowtitle="${Name} API"
--             doctitle="${Name}">
-+             doctitle="${Name}" maxmemory="256m">
+--- build.xml.orig	2007-07-07 08:07:25.000000000 -0100
++++ build.xml	2007-07-07 08:08:25.000000000 -0100
+@@ -1480,6 +1480,7 @@
+       version="true"
+       locale="en"
+       windowtitle="${Name} API"
++      maxmemory="256m"
+       doctitle="${Name}"
+       verbose="${javadoc.verbose}">
  
-       <packageset dir="${java.dir}"/>
+@@ -1512,6 +1513,7 @@
+       version="true"
+       locale="en"
+       windowtitle="${Name} Test Utilities"
++      maxmemory="256m"
+       doctitle="${Name}">
  
+       <!-- hide some meta information for javadoc -->

Modified: trunk/ant/debian/patches/03_SplashTaskPatch_a.patch
===================================================================
(Binary files differ)

Deleted: trunk/ant/debian/patches/03_SplashTaskPatch_b.patch
===================================================================
(Binary files differ)

Deleted: trunk/ant/debian/patches/03_SplashTaskPatch_c.patch
===================================================================
(Binary files differ)

Deleted: trunk/ant/debian/patches/04_UUMailerReflection.patch
===================================================================
(Binary files differ)

Added: trunk/ant/debian/patches/04_no_test-jars.patch
===================================================================
--- trunk/ant/debian/patches/04_no_test-jars.patch	                        (rev 0)
+++ trunk/ant/debian/patches/04_no_test-jars.patch	2007-07-08 07:24:22 UTC (rev 3801)
@@ -0,0 +1,11 @@
+--- build.xml.orig	2007-07-07 22:28:33.000000000 +0200
++++ build.xml	2007-07-07 22:28:55.000000000 +0200
+@@ -924,7 +924,7 @@
+        ===================================================================
+   -->
+   <target name="dist-lite"
+-    depends="jars,test-jar"
++    depends="jars"
+     description="--> creates a minimum distribution to run Apache Ant">
+ 
+     <mkdir dir="${dist.dir}"/>

Deleted: trunk/ant/debian/patches/05_TaskAvailabilityFix_ANT_PR38260.patch
===================================================================
(Binary files differ)

Modified: trunk/ant/debian/rules
===================================================================
--- trunk/ant/debian/rules	2007-07-08 00:28:50 UTC (rev 3800)
+++ trunk/ant/debian/rules	2007-07-08 07:24:22 UTC (rev 3801)
@@ -33,7 +33,7 @@
 build-ant: stamp-build-ant
 stamp-build-ant:
 	# doing bootstrapping
-	ln -sf /usr/share/java/jaxp-1.2.jar lib/xml-apis.jar
+	ln -sf /usr/share/java/xml-apis.jar lib/xml-apis.jar
 	ln -sf /usr/share/java/xercesImpl.jar lib/xercesImpl.jar
 	/bin/sh bootstrap.sh

More information about the pkg-java-commits mailing list