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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-19 16:32:35 +0000 (Fri, 19 Aug 2011)
New Revision: 14329

Modified:
   trunk/fop/debian/changelog
   trunk/fop/debian/control
   trunk/fop/debian/rules
Log:
Remove qdox

Modified: trunk/fop/debian/changelog
===================================================================
--- trunk/fop/debian/changelog	2011-08-19 14:55:58 UTC (rev 14328)
+++ trunk/fop/debian/changelog	2011-08-19 16:32:35 UTC (rev 14329)
@@ -15,6 +15,7 @@
   [ Mathieu Malaterre ]
   * Revert changelog numbering to please tar script
   * Fix JAVA_HOME value in debian/rules 
+  * Remove qdox from build. Closes: #638532
 
  -- Vincent Fourmond <fourmond at debian.org>  Mon, 06 Jun 2011 12:49:28 +0200
 

Modified: trunk/fop/debian/control
===================================================================
--- trunk/fop/debian/control	2011-08-19 14:55:58 UTC (rev 14328)
+++ trunk/fop/debian/control	2011-08-19 16:32:35 UTC (rev 14329)
@@ -13,8 +13,7 @@
  libavalon-framework-java (>=4.1.2-2), libxalan2-java,
  libxerces2-java, default-jdk, libcommons-io-java,
  libcommons-logging-java, junit, libxmlgraphics-commons-java (>= 1.4),
- libservlet2.4-java, libxml-commons-external-java, maven-repo-helper,
- libqdox-java
+ libservlet2.4-java, libxml-commons-external-java, maven-repo-helper
 Standards-Version: 3.9.2
 Homepage: http://xmlgraphics.apache.org/fop/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/fop

Modified: trunk/fop/debian/rules
===================================================================
--- trunk/fop/debian/rules	2011-08-19 14:55:58 UTC (rev 14328)
+++ trunk/fop/debian/rules	2011-08-19 16:32:35 UTC (rev 14329)
@@ -5,8 +5,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME            := /usr/lib/jvm/default-java
-#ANT_HOME             := /usr/share/ant
-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 qdox
+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
 DEB_ANT_BUILD_TARGET := package javadocs #docs
 DEB_ANT_CLEAN_TARGET := distclean
 DEB_ANT_ARGS := -verbose