diffstat of debian/ for fop_1.1.dfsg-2 fop_1.1.dfsg-2ubuntu1 changelog | 20 +++++++++++++++++++- control | 7 ++++--- rules | 2 +- 3 files changed, 24 insertions(+), 5 deletions(-) diff -Nru fop-1.1.dfsg/debian/changelog fop-1.1.dfsg/debian/changelog --- fop-1.1.dfsg/debian/changelog 2013-05-16 08:49:59.000000000 +0000 +++ fop-1.1.dfsg/debian/changelog 2013-05-21 11:21:27.000000000 +0000 @@ -1,3 +1,10 @@ +fop (1:1.1.dfsg-2ubuntu1) saucy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Transition libservlet2.5-java -> libservlet3.0-java. + + -- James Page Tue, 21 May 2013 12:21:26 +0100 + fop (1:1.1.dfsg-2) unstable; urgency=low * Upload to sid @@ -23,6 +30,18 @@ -- Mathieu Malaterre Sat, 03 Nov 2012 15:35:23 +0100 +fop (1:1.0.dfsg2-6ubuntu1) quantal; urgency=low + + * Transition libservlet2.5-java -> libservlet3.0-java (LP: #1023405). + + -- James Page Thu, 12 Jul 2012 15:13:49 +0100 + +fop (1:1.0.dfsg2-6build1) quantal; urgency=low + + * No-change rebuild with openjdk-7 as default-jdk. + + -- James Page Fri, 18 May 2012 12:11:54 +0100 + fop (1:1.0.dfsg2-6) unstable; urgency=low [ Mathieu Malaterre ] @@ -482,4 +501,3 @@ -- Julio Maia Fri, 17 Sep 1999 00:38:11 -0300 - diff -Nru fop-1.1.dfsg/debian/control fop-1.1.dfsg/debian/control --- fop-1.1.dfsg/debian/control 2013-05-16 08:40:07.000000000 +0000 +++ fop-1.1.dfsg/debian/control 2013-05-17 08:44:21.000000000 +0000 @@ -1,7 +1,8 @@ Source: fop Section: text Priority: optional -Maintainer: Debian Java Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Java Maintainers Uploaders: Sylvestre Ledru , Torsten Werner , Mathieu Malaterre , @@ -11,7 +12,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 +23,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 15:42:01.000000000 +0000 @@ -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