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

[Hideki Yamane]

Author: henrich
Date: 2014-02-16 13:14:01 +0000 (Sun, 16 Feb 2014)
New Revision: 17777

Added:
   trunk/ant/debian/patches/0009-fix-NullPointerException-when-no-destdir-was-set.patch
Modified:
   trunk/ant/debian/changelog
   trunk/ant/debian/patches/series
Log:
fix DebianBug#735786


Modified: trunk/ant/debian/changelog
===================================================================
--- trunk/ant/debian/changelog	2014-02-14 05:08:29 UTC (rev 17776)
+++ trunk/ant/debian/changelog	2014-02-16 13:14:01 UTC (rev 17777)
@@ -1,3 +1,12 @@
+ant (1.9.3-2) unstable; urgency=medium
+
+  * Team upload
+  * debian/patches
+    - add 0009-fix-NullPointerException-when-no-destdir-was-set.patch:
+      pick up upstream fix for FTBFS <Closes: #735786>
+
+ -- Hideki Yamane <henrich at debian.org>  Sun, 16 Feb 2014 21:59:46 +0900
+
 ant (1.9.3-1) unstable; urgency=medium
 
   * New upstream release

Added: 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	                        (rev 0)
+++ trunk/ant/debian/patches/0009-fix-NullPointerException-when-no-destdir-was-set.patch	2014-02-16 13:14:01 UTC (rev 17777)
@@ -0,0 +1,18 @@
+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-02-14 05:08:29 UTC (rev 17776)
+++ trunk/ant/debian/patches/series	2014-02-16 13:14:01 UTC (rev 17777)
@@ -4,3 +4,4 @@
 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