[pkg-java] r19207 - in trunk/fop/debian: . patches

[Mathieu Malaterre]

Author: malat
Date: 2017-01-30 10:36:42 +0000 (Mon, 30 Jan 2017)
New Revision: 19207

Added:
   trunk/fop/debian/patches/javadoc_allow-script-in-comments.patch
Modified:
   trunk/fop/debian/changelog
   trunk/fop/debian/patches/series
Log:
Prepare 1:2.1-5 upload

Modified: trunk/fop/debian/changelog
===================================================================
--- trunk/fop/debian/changelog	2017-01-24 00:04:40 UTC (rev 19206)
+++ trunk/fop/debian/changelog	2017-01-30 10:36:42 UTC (rev 19207)
@@ -1,3 +1,10 @@
+fop (1:2.1-5) unstable; urgency=medium
+
+  * Fix FTBFS now that comments are parsed by javadoc. Closes: #852910
+    + debian/patches/javadoc_allow-script-in-comments.patch
+
+ -- Mathieu Malaterre <malat at debian.org>  Mon, 30 Jan 2017 11:36:02 +0100
+
 fop (1:2.1-4) unstable; urgency=medium
 
   * Team upload.

Added: trunk/fop/debian/patches/javadoc_allow-script-in-comments.patch
===================================================================
--- trunk/fop/debian/patches/javadoc_allow-script-in-comments.patch	                        (rev 0)
+++ trunk/fop/debian/patches/javadoc_allow-script-in-comments.patch	2017-01-30 10:36:42 UTC (rev 19207)
@@ -0,0 +1,19 @@
+Description: error: package javax.media.jai does not exist
+Author: Emmanuel Bourg <ebourg at apache.org>
+Origin: vendor, https://lists.debian.org/debian-java/2017/01/msg00015.html
+Bug-Debian: https://bugs.debian.org/852910
+Forwarded: not-needed
+Reviewed-By: Mathieu Malaterre <malat at debian.org>
+
+Index: fop-2.1/build.xml
+===================================================================
+--- fop-2.1.orig/build.xml
++++ fop-2.1/build.xml
+@@ -965,6 +965,7 @@ NOTE:
+       bottom="Copyright ${year} The Apache Software Foundation. All Rights Reserved."
+       encoding="UTF-8" docencoding="UTF-8" charset="UTF-8"
+       overview="${src.dir}/java/org/apache/fop/overview.html"
++      additionalparam="--allow-script-in-comments"
+       maxmemory="256M">
+       <header><![CDATA[${name} ${version}]]></header>
+       <footer><![CDATA[${name} ${version}]]></footer>

Modified: trunk/fop/debian/patches/series
===================================================================
--- trunk/fop/debian/patches/series	2017-01-24 00:04:40 UTC (rev 19206)
+++ trunk/fop/debian/patches/series	2017-01-30 10:36:42 UTC (rev 19207)
@@ -4,3 +4,4 @@
 hyph_stacksize.patch
 strip_user_host_from_manifest.patch
 javadoc_encoding.patch
+javadoc_allow-script-in-comments.patch