[pkg-java] r18968 - in trunk/fop/debian: . patches
Mathieu Malaterre
malat at moszumanska.debian.org
Tue Feb 2 08:07:59 UTC 2016
Author: malat
Date: 2016-02-02 08:07:59 +0000 (Tue, 02 Feb 2016)
New Revision: 18968
Added:
trunk/fop/debian/UPDATE
Removed:
trunk/fop/debian/patches/bug799662.patch
Modified:
trunk/fop/debian/README.Debian
trunk/fop/debian/changelog
trunk/fop/debian/control
trunk/fop/debian/patches/replace-sRGB-profile.patch
trunk/fop/debian/patches/series
trunk/fop/debian/pom.xml
Log:
update to 2.1
Modified: trunk/fop/debian/README.Debian
===================================================================
--- trunk/fop/debian/README.Debian 2016-02-01 19:48:48 UTC (rev 18967)
+++ trunk/fop/debian/README.Debian 2016-02-02 08:07:59 UTC (rev 18968)
@@ -1,13 +1,17 @@
fop
---
-You can set the environment variable JAVA_OPTS with options that
-are passed to the java interpreter.
+The variables:
-fop 0.95.dfsg
--------------
+HEADLESS= # -Djava.awt.headless=true
+LOGCHOICE= # -Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
-I removed generated plan examples and all the jars in the lib directory
-This is managed by the script orig-tar.sh which is called by uscan.
+LOGLEVEL= # -Dorg.apache.commons.logging.simplelog.defaultlog=INFO
- -- Arnaud Vandyck <avdyk at debian.org>, Thu, 10 May 2007 12:46:33 +0200
+Can be overriden by user, using either:
+
+A file such as: /etc/fop.conf.d/*.conf
+
+or directly: $HOME/.foprc
+
+ -- Mathieu Malaterre <malat at debian.org> Tue, 02 Feb 2016 08:30:40 +0100
Added: trunk/fop/debian/UPDATE
===================================================================
--- trunk/fop/debian/UPDATE (rev 0)
+++ trunk/fop/debian/UPDATE 2016-02-02 08:07:59 UTC (rev 18968)
@@ -0,0 +1,22 @@
+MVN
+---
+
+You need to update debian/pom.xml using the latest from mvn:
+
+
+http://central.maven.org/maven2/org/apache/xmlgraphics/fop/2.1/fop-2.1.pom
+
+
+OFFO
+----
+
+When updating fop, you'll need to make sure to keep in sync with offo project.
+
+You'll need to download the latest source offo zip from:
+
+https://sourceforge.net/projects/offo/files/offo-hyphenation/
+
+Pay attention that you need to download the source zip file (hyph/*.xml), not
+the binary distribution containing the fop-hyph.jar file
+
+ -- Mathieu Malaterre <malat at debian.org> Tue, 02 Feb 2016 08:30:40 +0100
Modified: trunk/fop/debian/changelog
===================================================================
--- trunk/fop/debian/changelog 2016-02-01 19:48:48 UTC (rev 18967)
+++ trunk/fop/debian/changelog 2016-02-02 08:07:59 UTC (rev 18968)
@@ -1,3 +1,12 @@
+fop (1:2.1+dfsg-1) unstable; urgency=medium
+
+ * New upstream release
+ * Remove patch applied upstream:
+ - debian/patches/bug799662.patch
+ * Update offo. Closes: #805472
+
+ -- Mathieu Malaterre <malat at debian.org> Tue, 02 Feb 2016 09:06:50 +0100
+
fop (1:2.0+dfsg-5) unstable; urgency=medium
* Team upload.
Modified: trunk/fop/debian/control
===================================================================
--- trunk/fop/debian/control 2016-02-01 19:48:48 UTC (rev 18967)
+++ trunk/fop/debian/control 2016-02-02 08:07:59 UTC (rev 18968)
@@ -21,7 +21,7 @@
libxalan2-java,
libxerces2-java,
libxml-commons-external-java,
- libxmlgraphics-commons-java (>= 2.0.1),
+ libxmlgraphics-commons-java (>= 2.1),
libxmlunit-java,
maven-repo-helper,
unzip
@@ -62,7 +62,7 @@
libxalan2-java,
libxerces2-java,
libxml-commons-external-java,
- libxmlgraphics-commons-java (>= 1.4),
+ libxmlgraphics-commons-java (>= 2.1),
libxt6,
libxtst6,
${misc:Depends}
Deleted: trunk/fop/debian/patches/bug799662.patch
===================================================================
--- trunk/fop/debian/patches/bug799662.patch 2016-02-01 19:48:48 UTC (rev 18967)
+++ trunk/fop/debian/patches/bug799662.patch 2016-02-02 08:07:59 UTC (rev 18968)
@@ -1,26 +0,0 @@
-Description: Use proper encoding to remove warnings
-Author: Mathieu Malaterre <malat at debian.org>
-Forwarded: no
-
-Index: fop-2.0+dfsg/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
-===================================================================
---- fop-2.0+dfsg.orig/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
-+++ fop-2.0+dfsg/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
-@@ -393,7 +393,7 @@ public class ListItemLayoutManager exten
- int breakClass = EN_AUTO;
- KnuthElement endEl = elementLists[0].size() > 0 ? (KnuthElement) elementLists[0].get(end[0])
- : null;
-- Position originalLabelPosition = endEl != null ? endEl.getPosition().getPosition() : null;
-+ Position originalLabelPosition = (endEl != null && endEl.getPosition() != null) ? endEl.getPosition().getPosition() : null;
- if (endEl instanceof KnuthPenalty) {
- additionalPenaltyHeight = endEl.getWidth();
- stepPenalty = endEl.getPenalty() == -KnuthElement.INFINITE ? -KnuthElement.INFINITE : Math
-@@ -402,7 +402,7 @@ public class ListItemLayoutManager exten
- ((KnuthPenalty) endEl).getBreakClass());
- }
- endEl = elementLists[1].size() > 0 ? (KnuthElement) elementLists[1].get(end[1]) : null;
-- Position originalBodyPosition = endEl != null ? endEl.getPosition().getPosition() : null;
-+ Position originalBodyPosition = (endEl != null && endEl.getPosition() != null) ? endEl.getPosition().getPosition() : null;
- if (endEl instanceof KnuthPenalty) {
- additionalPenaltyHeight = Math.max(
- additionalPenaltyHeight, endEl.getWidth());
Modified: trunk/fop/debian/patches/replace-sRGB-profile.patch
===================================================================
--- trunk/fop/debian/patches/replace-sRGB-profile.patch 2016-02-01 19:48:48 UTC (rev 18967)
+++ trunk/fop/debian/patches/replace-sRGB-profile.patch 2016-02-02 08:07:59 UTC (rev 18968)
@@ -3,6 +3,7 @@
Forwarded: not-needed
Bug-Debian: https://bugs.debian.org/657281
Bug: https://issues.apache.org/jira/browse/FOP-2025
+
Index: fop-2.0/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java
===================================================================
--- fop-2.0.orig/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java
Modified: trunk/fop/debian/patches/series
===================================================================
--- trunk/fop/debian/patches/series 2016-02-01 19:48:48 UTC (rev 18967)
+++ trunk/fop/debian/patches/series 2016-02-02 08:07:59 UTC (rev 18968)
@@ -1,4 +1,3 @@
04_fixqdoxbuildfailure.patch
fixbuildxml.patch
replace-sRGB-profile.patch
-bug799662.patch
Modified: trunk/fop/debian/pom.xml
===================================================================
--- trunk/fop/debian/pom.xml 2016-02-01 19:48:48 UTC (rev 18967)
+++ trunk/fop/debian/pom.xml 2016-02-02 08:07:59 UTC (rev 18968)
@@ -25,7 +25,7 @@
<artifactId>fop</artifactId>
<packaging>jar</packaging>
<name>Apache FOP</name>
- <version>2.0</version>
+ <version>2.1</version>
<url>http://xmlgraphics.apache.org/fop/</url>
<description>Apache FOP (Formatting Objects Processor) is the world's first print formatter driven by XSL formatting objects (XSL-FO) and the world's first output independent formatter. It is a Java application that reads a formatting object (FO) tree and renders the resulting pages to a specified output. Output formats currently supported include PDF, PCL, PS, AFP, TIFF, PNG, SVG, XML (area tree representation), Print, AWT and TXT. The primary output target is PDF.</description>
<inceptionYear>1999</inceptionYear>
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>xmlgraphics-commons</artifactId>
- <version>2.0.1</version>
+ <version>2.1</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
@@ -132,12 +132,12 @@
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.2.0</version>
+ <version>4.3.1</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>4.2.0</version>
+ <version>4.3.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -148,7 +148,7 @@
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>2.7.0</version>
+ <version>2.7.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
More information about the pkg-java-commits
mailing list