Package: fop
Version: 1:1.1.dfsg-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu saucy ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Merge from Debian unstable. Remaining changes:
- Transition libservlet2.5-java -> libservlet3.0-java.
Tomcat6/libservlet2.5-java will soon disappear in Jessie. The 3.0 API
is backwards compat for 2.5 so no further changes required.
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers raring-updates
APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500,
'raring-proposed'), (500, 'raring'), (100, 'raring-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.8.0-22-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru fop-1.1.dfsg/debian/changelog fop-1.1.dfsg/debian/changelog
diff -Nru fop-1.1.dfsg/debian/control fop-1.1.dfsg/debian/control
--- fop-1.1.dfsg/debian/control 2013-05-16 09:40:07.000000000 +0100
+++ fop-1.1.dfsg/debian/control 2013-05-21 12:33:13.000000000 +0100
@@ -11,7 +11,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),
+ libservlet3.0-java, libxml-commons-external-java, maven-repo-helper, libqdox-java (>= 1.12),
unzip
Standards-Version: 3.9.4
Homepage: http://xmlgraphics.apache.org/fop/
@@ -22,7 +22,7 @@
Architecture: all
Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libfop-java (= ${binary:Version})
Recommends: libsaxon-java
-Suggests: fop-doc, libservlet2.5-java
+Suggests: fop-doc, libservlet3.0-java
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/rules fop-1.1.dfsg/debian/rules
--- fop-1.1.dfsg/debian/rules 2012-01-10 17:38:17.000000000 +0000
+++ fop-1.1.dfsg/debian/rules 2013-05-16 16:42:01.000000000 +0100
@@ -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 # ant-junit junit xmlunit
DEB_ANT_BUILD_TARGET := package javadocs #junit #docs
DEB_ANT_CLEAN_TARGET := distclean
DEB_ANT_ARGS := -verbose
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>.
Please use
debian-j...@lists.debian.org for discussions and questions.
