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

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-11-02 16:22:58 +0000 (Sun, 02 Nov 2014)
New Revision: 18588

Added:
   trunk/fop/debian/patches/replace-sRGB-profile.patch
Modified:
   trunk/fop/debian/changelog
   trunk/fop/debian/control
   trunk/fop/debian/orig-tar.sh
   trunk/fop/debian/patches/series
Log:
Removed the non-free sRGB color profile and use the equivalent profile from the icc-profiles-free package



Modified: trunk/fop/debian/changelog
===================================================================
--- trunk/fop/debian/changelog	2014-11-02 14:20:15 UTC (rev 18587)
+++ trunk/fop/debian/changelog	2014-11-02 16:22:58 UTC (rev 18588)
@@ -1,3 +1,11 @@
+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 <ebourg at apache.org>  Sun, 02 Nov 2014 17:20:55 +0100
+
 fop (1:1.1.dfsg-2) unstable; urgency=low
 
   * Upload to sid

Modified: trunk/fop/debian/control
===================================================================
--- trunk/fop/debian/control	2014-11-02 14:20:15 UTC (rev 18587)
+++ trunk/fop/debian/control	2014-11-02 16:22:58 UTC (rev 18588)
@@ -46,7 +46,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,

Modified: trunk/fop/debian/orig-tar.sh
===================================================================
--- trunk/fop/debian/orig-tar.sh	2014-11-02 14:20:15 UTC (rev 18587)
+++ trunk/fop/debian/orig-tar.sh	2014-11-02 16:22:58 UTC (rev 18588)
@@ -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'

Added: trunk/fop/debian/patches/replace-sRGB-profile.patch
===================================================================
--- trunk/fop/debian/patches/replace-sRGB-profile.patch	                        (rev 0)
+++ trunk/fop/debian/patches/replace-sRGB-profile.patch	2014-11-02 16:22:58 UTC (rev 18588)
@@ -0,0 +1,44 @@
+Description: Load the sRGB profile from the icc-profiles-free package
+Author: Emmanuel Bourg <ebourg at apache.org>
+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);
+         }

Modified: trunk/fop/debian/patches/series
===================================================================
--- trunk/fop/debian/patches/series	2014-11-02 14:20:15 UTC (rev 18587)
+++ trunk/fop/debian/patches/series	2014-11-02 16:22:58 UTC (rev 18588)
@@ -1,2 +1,3 @@
 04_fixqdoxbuildfailure.patch
 fixbuildxml.patch
+replace-sRGB-profile.patch