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

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-05-09 09:47:00 +0000 (Fri, 09 May 2014)
New Revision: 18125

Removed:
   trunk/ant/debian/patches/0009-fix-NullPointerException-when-no-destdir-was-set.patch
Modified:
   trunk/ant/debian/changelog
   trunk/ant/debian/patches/0002-do-not-build-test-jars.patch
   trunk/ant/debian/patches/0007-use-build.classpath.patch
   trunk/ant/debian/patches/series
Log:
New upstream release (1.9.4)
Refreshed the patches
Removed the patch for #735786 (Fixed upstream)



Modified: trunk/ant/debian/changelog
===================================================================
--- trunk/ant/debian/changelog	2014-05-08 05:21:07 UTC (rev 18124)
+++ trunk/ant/debian/changelog	2014-05-09 09:47:00 UTC (rev 18125)
@@ -1,3 +1,11 @@
+ant (1.9.4-1) unstable; urgency=medium
+
+  * New upstream release
+    - Refreshed the patches
+    - Removed the patch for #735786 (Fixed upstream)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 09 May 2014 11:46:04 +0200
+
 ant (1.9.3-2) unstable; urgency=medium
 
   * Team upload

Modified: trunk/ant/debian/patches/0002-do-not-build-test-jars.patch
===================================================================
--- trunk/ant/debian/patches/0002-do-not-build-test-jars.patch	2014-05-08 05:21:07 UTC (rev 18124)
+++ trunk/ant/debian/patches/0002-do-not-build-test-jars.patch	2014-05-09 09:47:00 UTC (rev 18125)
@@ -8,7 +8,7 @@
 
 --- a/build.xml
 +++ b/build.xml
-@@ -873,7 +873,7 @@
+@@ -896,7 +896,7 @@
         ===================================================================
    -->
    <target name="dist-lite"

Modified: trunk/ant/debian/patches/0007-use-build.classpath.patch
===================================================================
--- trunk/ant/debian/patches/0007-use-build.classpath.patch	2014-05-08 05:21:07 UTC (rev 18124)
+++ trunk/ant/debian/patches/0007-use-build.classpath.patch	2014-05-09 09:47:00 UTC (rev 18125)
@@ -8,7 +8,7 @@
 
 --- a/build.xml
 +++ b/build.xml
-@@ -122,7 +122,7 @@
+@@ -129,7 +129,7 @@
         ===================================================================
    -->
    <path id="classpath">

Deleted: trunk/ant/debian/patches/0009-fix-NullPointerException-when-no-destdir-was-set.patch
===================================================================
--- trunk/ant/debian/patches/0009-fix-NullPointerException-when-no-destdir-was-set.patch	2014-05-08 05:21:07 UTC (rev 18124)
+++ trunk/ant/debian/patches/0009-fix-NullPointerException-when-no-destdir-was-set.patch	2014-05-09 09:47:00 UTC (rev 18125)
@@ -1,18 +0,0 @@
-Description:  <javadoc> caused a NullPointerException when no destdir was set.
- see upstream Bugzilla Report 55949
-
-Original: upstream
-          http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javadoc.java?r1=1555019&r2=1555018&pathrev=1555019&view=patch
-Forwarded: not-needed
-
---- trunk/src/main/org/apache/tools/ant/taskdefs/Javadoc.java	2014/01/03 06:42:19	1555018
-+++ trunk/src/main/org/apache/tools/ant/taskdefs/Javadoc.java	2014/01/03 06:45:24	1555019
-@@ -2447,7 +2447,7 @@
-         if (!postProcessGeneratedJavadocs) {
-             return;
-         }
--        if (!destDir.isDirectory()) {
-+        if (destDir != null && !destDir.isDirectory()) {
-             log("No javadoc created, no need to post-process anything",
-                 Project.MSG_VERBOSE);
-             return;

Modified: trunk/ant/debian/patches/series
===================================================================
--- trunk/ant/debian/patches/series	2014-05-08 05:21:07 UTC (rev 18124)
+++ trunk/ant/debian/patches/series	2014-05-09 09:47:00 UTC (rev 18125)
@@ -4,4 +4,3 @@
 0006-fix-ANT_HOME-path.patch
 0007-use-build.classpath.patch
 0008-junit4-replace-assumeFalse.patch
-0009-fix-NullPointerException-when-no-destdir-was-set.patch