[pkg-java] r15222 - trunk/fop/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-10-21 23:08:39 +0000 (Fri, 21 Oct 2011)
New Revision: 15222

Modified:
   trunk/fop/debian/control
   trunk/fop/debian/copyright
   trunk/fop/debian/rules
Log:
Integrate patch from James Page

Modified: trunk/fop/debian/control
===================================================================
--- trunk/fop/debian/control	2011-10-19 19:54:39 UTC (rev 15221)
+++ trunk/fop/debian/control	2011-10-21 23:08:39 UTC (rev 15222)
@@ -13,7 +13,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 +29,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: trunk/fop/debian/copyright
===================================================================
--- trunk/fop/debian/copyright	2011-10-19 19:54:39 UTC (rev 15221)
+++ trunk/fop/debian/copyright	2011-10-21 23:08:39 UTC (rev 15222)
@@ -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: trunk/fop/debian/rules
===================================================================
--- trunk/fop/debian/rules	2011-10-19 19:54:39 UTC (rev 15221)
+++ trunk/fop/debian/rules	2011-10-21 23:08:39 UTC (rev 15222)
@@ -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