Bug#646088: Migrate fop to use libservlet2.5-java

[James Page]

Package: fop
Version: 1:1.0.dfsg2-3
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256


fop 1.0 is compatible with libservlet2.5-java and we have to use this
in Ubuntu as libservlet2.4-java is not in main; it would be great if the
Debian package could reflect this change.

I also took the opportunity to tidy up a few other minor niggles

*** /tmp/tmpMmmd45
In Ubuntu, the attached patch was applied to achieve the following:

  * Merge from Debian testing, remaining changes:
    - debian/control: libservlet2.4-java -> libservlet2.5-java
    - debian/rules: DEB_JARS - servlet-api-2.4 ->  servlet-api-2.5 and
      removed ant-trax as not required with ant >= 1.8.2.
  * d/copyright: tidied up obsolete field names.

Thanks for considering the patch.


- -- System Information:
Debian Release: wheezy/sid
  APT prefers oneiric-updates
  APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 'oneiric-proposed'), (500, 'oneiric')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-12-generic (SMP w/8 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBCAAGBQJOoSsTAAoJEL/srsug59jDOswQAM+el3q4ECNJ8e/3K7LSAT+q
YzXAcHu3GzIlI2PX5HwUcjh/7I/l1Av4GEpNdeLOMn3QMFx+8ncEqvL8XdHHKF2+
ik34zGiUJxi8JFyJhjRw+cykIYmJlui/muElxdNyPAxd6PXseNcaRad2w3NH4q7D
1A5Yo9c0dG6BZ8iGYklJ43vVyFPHry3bqFc0VLv+6LgrfDLCdHGlTocgj/q7WyNr
I24IhxTzGysWVyyQ9OOrr/SfkuW5RX4LBTZscxENZpNdSYEo/aOHPhPpuJ+4SDqS
/ScPqUmv1X/b56uOK7zvx1q5fNEi7Mso6JAhhoklk0ovDOm7830vNwkFdOUrtvne
5jfdngGDLZz7fBFynDdlKXeLzznB9EyI+9oTqvcNXKgpNVpk0g6c5SifnDcPA3VQ
MmNm4Qtomg18nZvAMzKWrr3gGGrgkOx5y6bP1P9dzhsXjHSqH8X80gCljxszuA+o
yLxd+eOf4xPCakfcTWw4eylx+STcac2o53nXzWY+AX6An9Kv6KgsBos1tGZskjGC
mkqyDm9D8dDVZ/HRBeOtCw+xLSRv73rTNWBjKHXUVXkRTvo2U8KxNrBUA7qqlccg
ghL9fTyBlhfo2QU05U8NfOPHxwMfnDBBO6EJ+mKgNRyqbjvXqZduCnkU8IT/YjaH
HzZAx3QvbQ0p7g7Y6t7C
=KcQ6
-----END PGP SIGNATURE-----
-------------- next part --------------
=== modified file 'debian/control'
--- debian/control	2011-09-11 15:01:03 +0000
+++ debian/control	2011-10-21 08:13:48 +0000
@@ -13,7 +14,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.4),
- libservlet2.4-java, libxml-commons-external-java, maven-repo-helper, libqdox-java
+ libservlet2.5-java, libxml-commons-external-java, maven-repo-helper, libqdox-java
 Standards-Version: 3.9.2
 Homepage: http://xmlgraphics.apache.org/fop/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/fop
@@ -29,7 +30,7 @@
  java-wrappers (>= 0.1.15), libxml-commons-external-java,
  ${misc:Depends}
 Recommends: libsaxon-java
-Suggests: fop-doc, libservlet2.4-java
+Suggests: fop-doc, libservlet2.5-java
 Replaces: libfop-java
 Description: XML formatter driven by XSL Formatting Objects (XSL-FO.)
  FOP is a Java application that reads a formatting object tree and then

=== modified file 'debian/copyright'
--- debian/copyright	2010-02-21 16:25:33 +0000
+++ debian/copyright	2011-10-21 08:13:48 +0000
@@ -1,6 +1,6 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: fop
-Maintainer: James Tauber <jtauber at jtauber.com>
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: fop
+Upstream-Contact: James Tauber <jtauber at jtauber.com>
 Source: http://xmlgraphics.apache.org/fop/
 
 Copyright: 2005-2007, The Apache Software Foundation

=== modified file 'debian/rules'
--- debian/rules	2011-09-11 15:01:03 +0000
+++ debian/rules	2011-10-21 08:13:48 +0000
@@ -5,7 +5,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := $(ANT_HOME)/lib/ant-trax.jar batik-all xml-apis-ext batik-libs xml-apis avalon-framework xercesImpl xmlParserAPIs xalan2 junit commons-io commons-logging xmlgraphics-commons servlet-api-2.4 # 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-2.5 # ant-junit junit xmlunit
 DEB_ANT_BUILD_TARGET := package javadocs #junit #docs
 DEB_ANT_CLEAN_TARGET := distclean
 DEB_ANT_ARGS := -verbose