diffstat of debian/ for fop_1.1.dfsg2-2 fop_1.1.dfsg2-2co3 changelog | 21 +++++++ control | 2 patches/allow-script-in-comments.patch | 10 +++ patches/fix-pdf-rendering.patch | 92 +++++++++++++++++++++++++++++++++ patches/series | 2 rules | 4 + 6 files changed, 129 insertions(+), 2 deletions(-) diff -Nru fop-1.1.dfsg2/debian/changelog fop-1.1.dfsg2/debian/changelog --- fop-1.1.dfsg2/debian/changelog 2015-07-11 19:37:06.000000000 +0000 +++ fop-1.1.dfsg2/debian/changelog 2017-12-05 09:11:10.000000000 +0000 @@ -1,3 +1,24 @@ +fop (1:1.1.dfsg2-2co3) 17.12; urgency=medium + + * allow-script-in-comments.patch: use --allow-script-in-comments to + avoid ftbfs error - JavaScript found in documentation comment. + + -- Andrew Lee (李健秋) Tue, 05 Dec 2017 17:11:10 +0800 + +fop (1:1.1.dfsg2-2co2) 17.03; urgency=medium + + * debian/{control,rules}: force build with openjdk-8. (Apertis: T3931) + + -- Andrew Lee (李健秋) Thu, 16 Mar 2017 05:22:59 +0800 + +fop (1:1.1.dfsg2-2co1) 16.06; urgency=medium + + * d/p/fix-pdf-rendering.patch: + - fix ftbfs updating mergeInto function parameters in + src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java + + -- Héctor Orón Martínez Mon, 18 Jul 2016 10:40:43 +0200 + fop (1:1.1.dfsg2-2) unstable; urgency=medium * Fix hyphenation issue. Closes: #780579 diff -Nru fop-1.1.dfsg2/debian/control fop-1.1.dfsg2/debian/control --- fop-1.1.dfsg2/debian/control 2015-07-11 19:37:06.000000000 +0000 +++ fop-1.1.dfsg2/debian/control 2017-03-15 21:22:22.000000000 +0000 @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5), cdbs (>= 0.4.27) Build-Depends-Indep: ant-optional (>= 1.8.2), libbatik-java (>= 1.7), libavalon-framework-java (>= 4.1.2-2), libxalan2-java, - libxerces2-java, default-jdk, libcommons-io-java, libxmlunit-java, + libxerces2-java, openjdk-8-jdk, libcommons-io-java, libxmlunit-java, libcommons-logging-java, junit, libxmlgraphics-commons-java (>= 1.5), libservlet2.5-java, libxml-commons-external-java, maven-repo-helper, libqdox-java (>= 1.12), unzip diff -Nru fop-1.1.dfsg2/debian/patches/allow-script-in-comments.patch fop-1.1.dfsg2/debian/patches/allow-script-in-comments.patch --- fop-1.1.dfsg2/debian/patches/allow-script-in-comments.patch 1970-01-01 00:00:00.000000000 +0000 +++ fop-1.1.dfsg2/debian/patches/allow-script-in-comments.patch 2017-12-05 09:11:01.000000000 +0000 @@ -0,0 +1,10 @@ +--- a/build.xml ++++ b/build.xml +@@ -951,6 +951,7 @@ + doctitle="Apache Formatting Objects Processor (FOP)" + bottom="Copyright ${year} The Apache Software Foundation. All Rights Reserved." + overview="${src.dir}/java/org/apache/fop/overview.html" ++ additionalparam="--allow-script-in-comments" + maxmemory="256M"> +
+
diff -Nru fop-1.1.dfsg2/debian/patches/fix-pdf-rendering.patch fop-1.1.dfsg2/debian/patches/fix-pdf-rendering.patch --- fop-1.1.dfsg2/debian/patches/fix-pdf-rendering.patch 1970-01-01 00:00:00.000000000 +0000 +++ fop-1.1.dfsg2/debian/patches/fix-pdf-rendering.patch 2016-07-18 09:24:13.000000000 +0000 @@ -0,0 +1,92 @@ +Description: update mergeInto function params + fop (1:1.1.dfsg2-2co1) 16.06; urgency=medium + . + * d/p/fix-pdf-rendering.patch: + - fix ftbfs updating mergeInto function parameters in + src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java +Author: Héctor Orón Martínez + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: upstream +Last-Update: <2016-07-18> + +Index: fop-1.1.dfsg2/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java +=================================================================== +--- fop-1.1.dfsg2.orig/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java 2016-07-18 10:42:15.000000000 +0200 ++++ fop-1.1.dfsg2/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java 2016-07-18 11:02:48.806604035 +0200 +@@ -25,7 +25,14 @@ + import java.io.InputStream; + import java.io.OutputStream; + import java.net.URL; ++import java.net.URI; ++import java.net.URISyntaxException; ++import java.util.ArrayList; ++import java.util.Date; ++import java.util.EnumMap; ++import java.util.List; + import java.util.Map; ++import java.util.TimeZone; + + import javax.xml.transform.Source; + import javax.xml.transform.stream.StreamSource; +@@ -36,7 +43,9 @@ + + import org.apache.xmlgraphics.image.loader.util.ImageUtil; + import org.apache.xmlgraphics.java2d.color.profile.ColorProfileUtil; ++import org.apache.xmlgraphics.util.DateFormatUtil; + import org.apache.xmlgraphics.xmp.Metadata; ++import org.apache.xmlgraphics.xmp.schemas.DublinCoreSchema; + import org.apache.xmlgraphics.xmp.schemas.XMPBasicAdapter; + import org.apache.xmlgraphics.xmp.schemas.XMPBasicSchema; + +@@ -353,7 +362,11 @@ + Metadata docXMP = metadata.getMetadata(); + Metadata fopXMP = PDFMetadata.createXMPFromPDFDocument(pdfDoc); + //Merge FOP's own metadata into the one from the XSL-FO document +- fopXMP.mergeInto(docXMP); ++ List exclude = new ArrayList(); ++ if (pdfDoc.getProfile().getPDFAMode().isPart1()) { ++ exclude.add(DublinCoreSchema.class); ++ } ++ fopXMP.mergeInto(docXMP,exclude); + XMPBasicAdapter xmpBasic = XMPBasicSchema.getAdapter(docXMP); + //Metadata was changed so update metadata date + xmpBasic.setMetadataDate(new java.util.Date()); +Index: fop-1.1.dfsg2/src/java/org/apache/fop/pdf/PDFAMode.java +=================================================================== +--- fop-1.1.dfsg2.orig/src/java/org/apache/fop/pdf/PDFAMode.java 2012-10-16 17:47:36.000000000 +0200 ++++ fop-1.1.dfsg2/src/java/org/apache/fop/pdf/PDFAMode.java 2016-07-18 11:24:09.063547126 +0200 +@@ -31,12 +31,15 @@ + + private String name; + ++ private final int part; ++ + /** + * Constructor to add a new named item. + * @param name Name of the item. + */ + private PDFAMode(String name) { + this.name = name; ++ this.part = 0; + } + + /** @return the name of the enum */ +@@ -45,6 +48,13 @@ + } + + /** ++ * Returns {@code true} if this enum corresponds to PDF/A-1 (ISO 19005-1). ++ */ ++ public boolean isPart1() { ++ return part == 1; ++ } ++ ++ /** + * Indicates whether this mode obeys the restrictions established by PDF/A-1a. + * @return true if this mode obeys the restrictions established by PDF/A-1a. + */ diff -Nru fop-1.1.dfsg2/debian/patches/series fop-1.1.dfsg2/debian/patches/series --- fop-1.1.dfsg2/debian/patches/series 2015-07-11 19:37:06.000000000 +0000 +++ fop-1.1.dfsg2/debian/patches/series 2017-12-05 09:10:28.000000000 +0000 @@ -1,3 +1,5 @@ 04_fixqdoxbuildfailure.patch fixbuildxml.patch replace-sRGB-profile.patch +fix-pdf-rendering.patch +allow-script-in-comments.patch diff -Nru fop-1.1.dfsg2/debian/rules fop-1.1.dfsg2/debian/rules --- fop-1.1.dfsg2/debian/rules 2015-07-11 19:37:06.000000000 +0000 +++ fop-1.1.dfsg2/debian/rules 2017-03-15 21:22:57.000000000 +0000 @@ -1,10 +1,12 @@ #!/usr/bin/make -f # debian/rules for FOP (uses CDBS) +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) + include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -JAVA_HOME := /usr/lib/jvm/default-java +JAVA_HOME := /usr/lib/jvm/java-8-openjdk-$(DEB_BUILD_ARCH) DEB_JARS := batik-all xml-apis-ext batik-libs xml-apis avalon-framework xercesImpl xmlParserAPIs xalan2 junit commons-io commons-logging xmlgraphics-commons servlet-api-2.5 # ant-junit junit xmlunit DEB_ANT_BUILD_TARGET := package javadocs #junit #docs DEB_ANT_CLEAN_TARGET := distclean