[pkg-java] r18779 - in trunk/fop/debian: . patches
Mathieu Malaterre
malat at moszumanska.debian.org
Thu Jul 16 20:08:02 UTC 2015
Author: malat
Date: 2015-07-16 20:08:02 +0000 (Thu, 16 Jul 2015)
New Revision: 18779
Modified:
trunk/fop/debian/changelog
trunk/fop/debian/control
trunk/fop/debian/copyright
trunk/fop/debian/fop.sh
trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch
trunk/fop/debian/patches/fixbuildxml.patch
trunk/fop/debian/patches/replace-sRGB-profile.patch
trunk/fop/debian/pom.xml
trunk/fop/debian/rules
trunk/fop/debian/watch
Log:
update fop package
Modified: trunk/fop/debian/changelog
===================================================================
--- trunk/fop/debian/changelog 2015-07-16 19:18:39 UTC (rev 18778)
+++ trunk/fop/debian/changelog 2015-07-16 20:08:02 UTC (rev 18779)
@@ -1,3 +1,14 @@
+fop (1:2.0+dfsg-1) experimental; urgency=medium
+
+ * New upstream. Closes: #792132
+ * Transition to libservlet3.0-java. Closes: #709178
+ * Bump Std-Vers to 3.9.6, no changes needed
+ * Remove old Breaks/Replace (oldstable version)
+ * Update d/watch to use d/copyright File-Excluded
+ * Fix some lintian warnings
+
+ -- Mathieu Malaterre <malat at debian.org> Thu, 16 Jul 2015 21:55:30 +0200
+
fop (1:1.1.dfsg2-2) unstable; urgency=medium
* Fix hyphenation issue. Closes: #780579
Modified: trunk/fop/debian/control
===================================================================
--- trunk/fop/debian/control 2015-07-16 19:18:39 UTC (rev 18778)
+++ trunk/fop/debian/control 2015-07-16 20:08:02 UTC (rev 18779)
@@ -6,24 +6,37 @@
Torsten Werner <twerner at debian.org>,
Mathieu Malaterre <malat at debian.org>,
Vincent Fourmond <fourmond at debian.org>
-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,
- libcommons-logging-java, junit, libxmlgraphics-commons-java (>= 1.5),
- libservlet2.5-java, libxml-commons-external-java, maven-repo-helper, libqdox-java (>= 1.12),
- unzip
-Standards-Version: 3.9.4
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 5)
+Build-Depends-Indep: ant-optional (>= 1.8.2),
+ default-jdk,
+ junit,
+ libavalon-framework-java (>= 4.1.2-2),
+ libbatik-java (>= 1.8),
+ libcommons-io-java,
+ libcommons-logging-java,
+ libfontbox-java,
+ libqdox-java (>= 1.12),
+ libservlet3.0-java,
+ libxalan2-java,
+ libxerces2-java,
+ libxml-commons-external-java,
+ libxmlgraphics-commons-java (>= 2.0.1),
+ libxmlunit-java,
+ maven-repo-helper,
+ unzip
+Standards-Version: 3.9.6
Homepage: http://xmlgraphics.apache.org/fop/
-Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/fop
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/fop
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/fop/
Package: fop
Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libfop-java (= ${binary:Version})
+Depends: default-jre-headless | java2-runtime-headless,
+ libfop-java (= ${binary:Version}),
+ ${misc:Depends}
Recommends: libsaxon-java
-Suggests: fop-doc, libservlet2.5-java
-Description: XML formatter driven by XSL Formatting Objects (XSL-FO.)
+Suggests: fop-doc
+Description: XML formatter driven by XSL Formatting Objects (XSL-FO.) - app
FOP is a Java application that reads a formatting object tree and then
turns it into a wide variety of output presentations (including AFP,
PCL, PDF, PNG, PostScript, RTF, TIFF, and plain text), or displays
@@ -38,16 +51,22 @@
Package: libfop-java
Section: java
Architecture: all
-Replaces: fop (<< 1:1.0.dfsg2-6)
-Breaks: fop (<< 1:1.0.dfsg2-6)
-Depends: libxerces2-java, libxalan2-java, libbsf-java,
- libavalon-framework-java (>=4.1.2-2), libbatik-java (>= 1.7),
- libcommons-io-java, libcommons-logging-java, libxt6,
- libxtst6, libxmlgraphics-commons-java (>= 1.4),
- java-wrappers (>= 0.1.15), libxml-commons-external-java,
- ${misc:Depends}
-Recommends: libsaxon-java, icc-profiles-free
-Description: XML formatter driven by XSL Formatting Objects (XSL-FO.)
+Depends: java-wrappers (>= 0.1.15),
+ libavalon-framework-java (>= 4.1.2-2),
+ libbatik-java (>= 1.8),
+ libbsf-java,
+ libcommons-io-java,
+ libcommons-logging-java,
+ libfontbox-java,
+ libxalan2-java,
+ libxerces2-java,
+ libxml-commons-external-java,
+ libxmlgraphics-commons-java (>= 1.4),
+ libxt6,
+ libxtst6,
+ ${misc:Depends}
+Recommends: icc-profiles-free, libsaxon-java
+Description: XML formatter driven by XSL Formatting Objects (XSL-FO.) - libs
FOP is a Java application that reads a formatting object tree and then
turns it into a wide variety of output presentations (including AFP,
PCL, PDF, PNG, PostScript, RTF, TIFF, and plain text), or displays
@@ -63,8 +82,8 @@
Section: doc
Architecture: all
Replaces: libfop-java-doc
-Depends: ${misc:Depends}
-Description: XML formatter driven by XSL Formatting Objects (doc)
+Depends: ${misc:Depends}
+Description: XML formatter driven by XSL Formatting Objects (doc) - doc
FOP is a Java application that reads a formatting object tree and then
turns it into a wide variety of output presentations (including AFP,
PCL, PDF, PNG, PostScript, RTF, TIFF, and plain text), or displays
Modified: trunk/fop/debian/copyright
===================================================================
--- trunk/fop/debian/copyright 2015-07-16 19:18:39 UTC (rev 18778)
+++ trunk/fop/debian/copyright 2015-07-16 20:08:02 UTC (rev 18779)
@@ -1,28 +1,30 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: fop
Upstream-Contact: James Tauber <jtauber at jtauber.com>
Source: http://xmlgraphics.apache.org/fop/
+Files-Excluded: lib/* */sRGB*.icm*
+Files: *
Copyright: 2005-2007, The Apache Software Foundation
-License: Apache Software License version 2.0
+License: Apache
On Debian systems the full text of the Apache Software License version
2.0 can be found in the `/usr/share/common-licenses/Apache-2.0' file.
Files: debian/*
Copyright: 2001-2010, Ola Lundqvist <opal at debian.org>
-License: Apache Software License version 2.0
+License: Apache
On Debian systems the full text of the Apache Software License version
2.0 can be found in the `/usr/share/common-licenses/Apache-2.0' file.
Files: debian/pom.xml
Copyright: 2005-2007, The Apache Software Foundation
-License: Apache Software License version 2.0
+License: Apache
pom.xml file has been downloaded from
http://mirrors.ibiblio.org/pub/mirrors/maven2/org/apache/xmlgraphics/fop/0.95/fop-0.95.pom
On Debian systems the full text of the Apache Software License version
2.0 can be found in the `/usr/share/common-licenses/Apache-2.0' file.
-Files: debian/offo-hyphenation_v2.0.zip
+Files: debian/offo-hyphenation_v2.1.zip
Copyright: Copyright © 2004–2010 OFFO,
Copyright 2004-2005 Janis Vilims, jvilims at apollo.lv,
Copyright 1996, 1997 Jörg Knappen and Terry Mart,
@@ -52,7 +54,7 @@
Copyright 1993,1994,1998,1999 Bernd Raichle/DANTE e.V.
Comment:
This file contains TeX hyphenation patterns in XML format. It was downloaded from
- http://sourceforge.net/projects/offo/files/offo-hyphenation/2.0/offo-hyphenation_v2.0.zip
+ http://sourceforge.net/projects/offo/files/offo-hyphenation/2.1/offo-hyphenation_v2.1.zip
The same data in a format usable by TeX is shipped in the package texlive-base
in /usr/share/texmf-texlive/tex/generic/hyph-utf8/patterns/. These are covered
by multiple licenses, all of which are free licenses, and different
@@ -60,7 +62,7 @@
code, the incompatibilities of these licenses does not pose a problem. A more
though explanation of the TeX licensing situation can be found in
/usr/share/doc/texlive-base/copyright.
-License:
+License: LGPL
LaTeX Project Public License, version 1 or later
LaTeX Project Public License, version 1.3 or later
LaTeX Project Public License, version 1.2 or later
@@ -68,5 +70,3 @@
GPL-2
GPL-2+
GPL-3
-
-
Modified: trunk/fop/debian/fop.sh
===================================================================
--- trunk/fop/debian/fop.sh 2015-07-16 19:18:39 UTC (rev 18778)
+++ trunk/fop/debian/fop.sh 2015-07-16 20:08:02 UTC (rev 18779)
@@ -36,7 +36,7 @@
find_jars commons-io avalon-framework serializer xalan2 xml-apis
find_jars batik-all commons-logging xercesImpl xmlgraphics-commons
-find_jars xml-apis-ext
+find_jars xml-apis-ext fontbox
# We load the hyphenation jar at the request of the user.
if [ "$FOP_HYPHENATION_PATH" ]; then
@@ -45,7 +45,7 @@
find_jars /usr/share/fop/fop-hyph.jar
find_jars fop
-LOG_OPTION=-Dorg.apache.commons.logging.Log=org.apache.fop.util.CommandLineLogger
+# LOG_OPTION=-Dorg.apache.commons.logging.Log=org.apache.fop.util.CommandLineLogger
# LOG_DEBUG_OPTION=-Dlog4j.debug
run_java $HEADLESS $LOG_OPTION org.apache.fop.cli.Main "$@"
Modified: trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch
===================================================================
--- trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch 2015-07-16 19:18:39 UTC (rev 18778)
+++ trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch 2015-07-16 20:08:02 UTC (rev 18779)
@@ -1,9 +1,9 @@
Fix a lintian issue: add class-path
-Index: fop-1.1/build.xml
+Index: fop-2.0/build.xml
===================================================================
---- fop-1.1.orig/build.xml 2012-10-16 17:47:36.000000000 +0200
-+++ fop-1.1/build.xml 2012-11-03 14:58:00.773621554 +0100
-@@ -477,7 +477,7 @@
+--- fop-2.0.orig/build.xml
++++ fop-2.0/build.xml
+@@ -479,7 +479,7 @@ list of possible build targets.
<pathconvert property="manifest.classpath" dirsep="/" pathsep=" " refid="libs-build-classpath">
<map from="${basedir}${file.separator}lib${file.separator}" to=""/>
</pathconvert>
@@ -12,9 +12,9 @@
<manifest>
<attribute name="Main-Class" value="org.apache.fop.cli.Main"/>
<attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/>
-Index: fop-1.1/fop.mf
+Index: fop-2.0/fop.mf
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ fop-1.1/fop.mf 2012-11-03 14:58:00.773621554 +0100
+--- /dev/null
++++ fop-2.0/fop.mf
@@ -0,0 +1 @@
+Class-Path: xercesImpl.jar xalan2.jar bsf.jar avalon-framework.jar batik.jar commons-io.jar commons-logging.jar xmlgraphics-commons.jar xml-commons-external.jar
Modified: trunk/fop/debian/patches/fixbuildxml.patch
===================================================================
--- trunk/fop/debian/patches/fixbuildxml.patch 2015-07-16 19:18:39 UTC (rev 18778)
+++ trunk/fop/debian/patches/fixbuildxml.patch 2015-07-16 20:08:02 UTC (rev 18779)
@@ -2,9 +2,11 @@
Author: Mathieu Malaterre <malat at debian.org>
Forwarded: no
---- fop-1.1.dfsg.orig/build.xml
-+++ fop-1.1.dfsg/build.xml
-@@ -156,6 +156,7 @@ list of possible build targets.
+Index: fop-2.0/build.xml
+===================================================================
+--- fop-2.0.orig/build.xml
++++ fop-2.0/build.xml
+@@ -157,6 +157,7 @@ list of possible build targets.
<property name="javac.deprecation" value="on"/>
<property name="javac.source" value="1.5"/>
<property name="javac.target" value="1.5"/>
Modified: trunk/fop/debian/patches/replace-sRGB-profile.patch
===================================================================
--- trunk/fop/debian/patches/replace-sRGB-profile.patch 2015-07-16 19:18:39 UTC (rev 18778)
+++ trunk/fop/debian/patches/replace-sRGB-profile.patch 2015-07-16 20:08:02 UTC (rev 18779)
@@ -3,9 +3,11 @@
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 @@
+Index: fop-2.0/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java
+===================================================================
+--- fop-2.0.orig/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java
++++ fop-2.0/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java
+@@ -21,6 +21,8 @@ package org.apache.fop.pdf;
import java.awt.color.ColorSpace;
import java.awt.color.ICC_Profile;
@@ -13,8 +15,8 @@
+import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-
-@@ -135,11 +137,14 @@
+ import java.util.Set;
+@@ -136,11 +138,14 @@ public class PDFICCBasedColorSpace exten
* @return the ICC stream with the sRGB profile
*/
public static PDFICCStream setupsRGBColorProfile(PDFDocument pdfDoc) {
@@ -32,7 +34,7 @@
profile = ColorProfileUtil.getICC_Profile(in);
} catch (IOException ioe) {
throw new RuntimeException(
-@@ -147,7 +152,8 @@
+@@ -148,7 +153,8 @@ public class PDFICCBasedColorSpace exten
} finally {
IOUtils.closeQuietly(in);
}
Modified: trunk/fop/debian/pom.xml
===================================================================
--- trunk/fop/debian/pom.xml 2015-07-16 19:18:39 UTC (rev 18778)
+++ trunk/fop/debian/pom.xml 2015-07-16 20:08:02 UTC (rev 18779)
@@ -19,13 +19,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-http://maven.apache.org/maven-v4_0_0.xsd">
+http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop</artifactId>
<packaging>jar</packaging>
<name>Apache FOP</name>
- <version>1.0</version>
+ <version>2.0</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>
@@ -59,43 +59,48 @@
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/?root=Apache-SVN</url>
+ <url>http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/?root=Apache-SVN</url>
</scm>
<organization>
<name>Apache Software Foundation</name>
<url>http://www.apache.org/</url>
</organization>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>7</version>
+ </parent>
<dependencies>
<!-- XML Graphics -->
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>xmlgraphics-commons</artifactId>
- <version>1.4</version>
+ <version>2.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-svg-dom</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-bridge</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-awt-util</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-gvt</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-transcoder</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
<exclusions>
<exclusion>
<groupId>org.apache.xmlgraphics</groupId>
@@ -106,12 +111,12 @@
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-extension</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-ext</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
</dependency>
<!-- other dependencies -->
<dependency>
@@ -125,11 +130,16 @@
<version>1.3.1</version>
</dependency>
<dependency>
- <groupId>org.apache.avalon.framework</groupId>
+ <groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.3.1</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>4.2.0</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.2</version>
Modified: trunk/fop/debian/rules
===================================================================
--- trunk/fop/debian/rules 2015-07-16 19:18:39 UTC (rev 18778)
+++ trunk/fop/debian/rules 2015-07-16 20:08:02 UTC (rev 18779)
@@ -5,7 +5,7 @@
include /usr/share/cdbs/1/class/ant.mk
JAVA_HOME := /usr/lib/jvm/default-java
-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_JARS := batik-all xml-apis-ext batik-libs xml-apis avalon-framework xercesImpl xmlParserAPIs xalan2 junit commons-io commons-logging xmlgraphics-commons servlet-api-3.0 fontbox # ant-junit junit xmlunit
DEB_ANT_BUILD_TARGET := package javadocs #junit #docs
DEB_ANT_CLEAN_TARGET := distclean
DEB_ANT_ARGS := -verbose
Modified: trunk/fop/debian/watch
===================================================================
--- trunk/fop/debian/watch 2015-07-16 19:18:39 UTC (rev 18778)
+++ trunk/fop/debian/watch 2015-07-16 20:08:02 UTC (rev 18779)
@@ -1,4 +1,3 @@
version=3
-opts=dversionmangle=s/(\d)[\+\.\-~](?:dfsg|debian|ds|repack)\.?\d*$/$1/,uversionmangle=s/(\db?)[_\-\.](src)$/$1/ \
-http://www.apache.org/dist/xmlgraphics/fop/source/fop[\-\._]?(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz) \
-debian debian/orig-tar.sh
+opts=dversionmangle=s/\+(debian|dfsg|ds|deb)(\.\d+)?$// \
+http://www.apache.org/dist/xmlgraphics/fop/source/fop[\-\._]?(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)
More information about the pkg-java-commits
mailing list