Your message dated Sun, 2 Nov 2014 17:40:28 +0000
with message-id <[email protected]>
and subject line Re: Bug#767770: unblock: fop/1:1.1.dfsg2-1
has caused the Debian Bug report #767770,
regarding unblock: fop/1:1.1.dfsg2-1
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
767770: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=767770
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: unblock
Please unblock package fop. The version 1:1.1.dfsg2-1 removes a non-free
icc profile (see #657281), the code has been patched to use the
equivalent profile from the icc-profiles-free package.
unblock fop/1:1.1.dfsg2-1
diff -Nru fop-1.1.dfsg/debian/changelog fop-1.1.dfsg2/debian/changelog
--- fop-1.1.dfsg/debian/changelog 2013-05-16 10:49:59.000000000 +0200
+++ fop-1.1.dfsg2/debian/changelog 2014-11-02 17:20:57.000000000 +0100
@@ -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 <[email protected]> Sun, 02 Nov 2014 17:20:55 +0100
+
fop (1:1.1.dfsg-2) unstable; urgency=low
* Upload to sid
diff -Nru fop-1.1.dfsg/debian/control fop-1.1.dfsg2/debian/control
--- fop-1.1.dfsg/debian/control 2013-05-16 10:40:07.000000000 +0200
+++ fop-1.1.dfsg2/debian/control 2014-11-02 16:29:09.000000000 +0100
@@ -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,
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 2011-08-19 16:11:11.000000000 +0200
+++ fop-1.1.dfsg2/debian/orig-tar.sh 2014-11-02 16:14:19.000000000 +0100
@@ -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
01:00:00.000000000 +0100
+++ fop-1.1.dfsg2/debian/patches/replace-sRGB-profile.patch 2014-11-02
17:18:31.000000000 +0100
@@ -0,0 +1,44 @@
+Description: Load the sRGB profile from the icc-profiles-free package
+Author: Emmanuel Bourg <[email protected]>
+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 2012-11-03 15:37:46.000000000 +0100
+++ fop-1.1.dfsg2/debian/patches/series 2014-11-02 16:35:51.000000000 +0100
@@ -1,2 +1,3 @@
04_fixqdoxbuildfailure.patch
fixbuildxml.patch
+replace-sRGB-profile.patch
Binary files /tmp/HjUPF97hX6/fop-1.1.dfsg/src/java/org/apache/fop/pdf/sRGB
Color Space Profile.icm and
/tmp/6UGwiSdNjE/fop-1.1.dfsg2/src/java/org/apache/fop/pdf/sRGB Color Space
Profile.icm differ
diff -Nru "/tmp/HjUPF97hX6/fop-1.1.dfsg/src/java/org/apache/fop/pdf/sRGB Color
Space Profile.icm.LICENSE.txt"
"/tmp/6UGwiSdNjE/fop-1.1.dfsg2/src/java/org/apache/fop/pdf/sRGB Color Space
Profile.icm.LICENSE.txt"
--- "/tmp/HjUPF97hX6/fop-1.1.dfsg/src/java/org/apache/fop/pdf/sRGB Color Space
Profile.icm.LICENSE.txt" 2012-10-16 17:47:36.000000000 +0200
+++ "/tmp/6UGwiSdNjE/fop-1.1.dfsg2/src/java/org/apache/fop/pdf/sRGB Color Space
Profile.icm.LICENSE.txt" 1970-01-01 01:00:00.000000000 +0100
@@ -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.
-
--- End Message ---
--- Begin Message ---
On Sun, Nov 02, 2014 at 06:04:45PM +0100, Emmanuel Bourg wrote:
> Please unblock package fop. The version 1:1.1.dfsg2-1 removes a non-free
> icc profile (see #657281), the code has been patched to use the
> equivalent profile from the icc-profiles-free package.
Unblocked.
Thanks,
--
Jonathan Wiltshire [email protected]
Debian Developer http://people.debian.org/~jmw
4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC 74C3 5394 479D D352 4C51
signature.asc
Description: Digital signature
--- End Message ---
