diff -Nru fop-1.1.dfsg/debian/changelog fop-1.1.dfsg2/debian/changelog --- fop-1.1.dfsg/debian/changelog 2013-05-21 11:21:27.000000000 +0000 +++ fop-1.1.dfsg2/debian/changelog 2014-12-08 14:54:58.000000000 +0000 @@ -1,3 +1,18 @@ +fop (1:1.1.dfsg2-1ubuntu1) vivid; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Transition libservlet2.5-java -> libservlet3.0-java. + + -- James Page Mon, 08 Dec 2014 14:54:56 +0000 + +fop (1:1.1.dfsg2-1) unstable; urgency=medium + + * Team upload. + * Removed the non-free sRGB color profile and use the equivalent profile + from the icc-profiles-free package (Closes: #657281) + + -- Emmanuel Bourg Sun, 02 Nov 2014 17:20:55 +0100 + fop (1:1.1.dfsg-2ubuntu1) saucy; urgency=low * Merge from Debian unstable. Remaining changes: diff -Nru fop-1.1.dfsg/debian/control fop-1.1.dfsg2/debian/control --- fop-1.1.dfsg/debian/control 2013-05-17 08:44:21.000000000 +0000 +++ fop-1.1.dfsg2/debian/control 2014-11-02 22:10:51.000000000 +0000 @@ -47,7 +47,7 @@ libxtst6, libxmlgraphics-commons-java (>= 1.4), java-wrappers (>= 0.1.15), libxml-commons-external-java, ${misc:Depends} -Recommends: libsaxon-java +Recommends: libsaxon-java, icc-profiles-free Description: XML formatter driven by XSL Formatting Objects (XSL-FO.) FOP is a Java application that reads a formatting object tree and then turns it into a wide variety of output presentations (including AFP, diff -Nru fop-1.1.dfsg/debian/orig-tar.sh fop-1.1.dfsg2/debian/orig-tar.sh --- fop-1.1.dfsg/debian/orig-tar.sh 2013-05-16 15:42:01.000000000 +0000 +++ fop-1.1.dfsg2/debian/orig-tar.sh 2014-11-02 22:10:51.000000000 +0000 @@ -6,7 +6,7 @@ # clean up the upstream tarball tar -zxvf $3 -tar -czf $TAR --exclude '*/lib/*' $DIR +tar -czf $TAR --exclude '*/lib/*' --exclude '*/sRGB*.icm*' $DIR rm -rf $DIR $3 # move to directory 'tarballs' diff -Nru fop-1.1.dfsg/debian/patches/replace-sRGB-profile.patch fop-1.1.dfsg2/debian/patches/replace-sRGB-profile.patch --- fop-1.1.dfsg/debian/patches/replace-sRGB-profile.patch 1970-01-01 00:00:00.000000000 +0000 +++ fop-1.1.dfsg2/debian/patches/replace-sRGB-profile.patch 2014-11-02 16:18:31.000000000 +0000 @@ -0,0 +1,44 @@ +Description: Load the sRGB profile from the icc-profiles-free package +Author: Emmanuel Bourg +Forwarded: not-needed +Bug-Debian: https://bugs.debian.org/657281 +Bug: https://issues.apache.org/jira/browse/FOP-2025 +--- a/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java ++++ b/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java +@@ -21,6 +21,8 @@ + + import java.awt.color.ColorSpace; + import java.awt.color.ICC_Profile; ++import java.io.File; ++import java.io.FileInputStream; + import java.io.IOException; + import java.io.InputStream; + +@@ -135,11 +137,14 @@ + * @return the ICC stream with the sRGB profile + */ + public static PDFICCStream setupsRGBColorProfile(PDFDocument pdfDoc) { +- ICC_Profile profile; ++ ICC_Profile profile = null; + PDFICCStream sRGBProfile = pdfDoc.getFactory().makePDFICCStream(); +- InputStream in = PDFDocument.class.getResourceAsStream("sRGB Color Space Profile.icm"); +- if (in != null) { ++ // Load the sRGB profile installed by the icc-profiles-free package ++ File file = new File("/usr/share/color/icc/sRGB.icc"); ++ if (file.exists()) { ++ InputStream in = null; + try { ++ in = new FileInputStream(file); + profile = ColorProfileUtil.getICC_Profile(in); + } catch (IOException ioe) { + throw new RuntimeException( +@@ -147,7 +152,8 @@ + } finally { + IOUtils.closeQuietly(in); + } +- } else { ++ } ++ if (profile == null) { + // Fallback: Use the sRGB profile from the JRE (about 140KB) + profile = ColorProfileUtil.getICC_Profile(ColorSpace.CS_sRGB); + } diff -Nru fop-1.1.dfsg/debian/patches/series fop-1.1.dfsg2/debian/patches/series --- fop-1.1.dfsg/debian/patches/series 2013-05-16 15:42:01.000000000 +0000 +++ fop-1.1.dfsg2/debian/patches/series 2014-11-02 22:10:51.000000000 +0000 @@ -1,2 +1,3 @@ 04_fixqdoxbuildfailure.patch fixbuildxml.patch +replace-sRGB-profile.patch Binary files /tmp/uwdmQeCzpr/fop-1.1.dfsg/src/java/org/apache/fop/pdf/sRGB Color Space Profile.icm and /tmp/Jhp7LzoWJH/fop-1.1.dfsg2/src/java/org/apache/fop/pdf/sRGB Color Space Profile.icm differ diff -Nru fop-1.1.dfsg/src/java/org/apache/fop/pdf/sRGB Color Space Profile.icm.LICENSE.txt fop-1.1.dfsg2/src/java/org/apache/fop/pdf/sRGB Color Space Profile.icm.LICENSE.txt --- fop-1.1.dfsg/src/java/org/apache/fop/pdf/sRGB Color Space Profile.icm.LICENSE.txt 2012-10-16 15:47:36.000000000 +0000 +++ fop-1.1.dfsg2/src/java/org/apache/fop/pdf/sRGB Color Space Profile.icm.LICENSE.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Obtained from: http://www.srgb.com/usingsrgb.html - -The file "sRGB Color Space Profile.icm" is: -Copyright (c) 1998 Hewlett-Packard Company - -To anyone who acknowledges that the file "sRGB Color Space Profile.icm" -is provided "AS IS" WITH NO EXPRESS OR IMPLIED WARRANTY: -permission to use, copy and distribute this file for any purpose is hereby -granted without fee, provided that the file is not changed including the HP -copyright notice tag, and that the name of Hewlett-Packard Company not be -used in advertising or publicity pertaining to distribution of the software -without specific, written prior permission. Hewlett-Packard Company makes -no representations about the suitability of this software for any purpose. -