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

[Vincent Fourmond]

Author: fourmond
Date: 2011-06-06 10:57:02 +0000 (Mon, 06 Jun 2011)
New Revision: 13759

Modified:
   trunk/fop/debian/changelog
   trunk/fop/debian/control
   trunk/fop/debian/rules
Log:
[fop] Small progresses, but it looks like we hit an incompatibility in the behaviour of libqdox-java

Modified: trunk/fop/debian/changelog
===================================================================
--- trunk/fop/debian/changelog	2011-06-06 09:16:58 UTC (rev 13758)
+++ trunk/fop/debian/changelog	2011-06-06 10:57:02 UTC (rev 13759)
@@ -1,13 +1,19 @@
-fop (1:1.0.dfsg-1) unstable; urgency=low
+fop (1:1.0.dfsg+cleaned-1) unstable; urgency=low
 
-  * Vincent Fourmond removed from uploaders.
+  [ Sylvestre Ledru ]
   * Upload to unstable
   * Dependency on libxp removed (Closes: #623639)
   * Standards-Version updated to version 3.9.2
   * Description updated. Thanks to Ivan Shmakov (Closes: #604008)
 
- -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 08 May 2011 15:59:22 +0200
+  [ Vincent Fourmond ]
+  * NativeTextHandler is now properly redefined (closes: #626069)
+  * Reupload with a tarball cleaned of upstream JAR files (closes: #625869)
+    - add a lib/build directory as dirty workaround for a missing dir
+    - add libqdox-java as build dependency
 
+ -- Vincent Fourmond <fourmond at debian.org>  Mon, 06 Jun 2011 12:49:28 +0200
+
 fop (1:1.0.dfsg-3) experimental; urgency=low
 
   * Upload with the explicit dependency against xmlgraphics-commons on the fop

Modified: trunk/fop/debian/control
===================================================================
--- trunk/fop/debian/control	2011-06-06 09:16:58 UTC (rev 13758)
+++ trunk/fop/debian/control	2011-06-06 10:57:02 UTC (rev 13759)
@@ -3,14 +3,18 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
-Uploaders: Michael Koch <konqueror at gmx.de>, Sylvestre Ledru <sylvestre at debian.org>,
- Torsten Werner <twerner at debian.org>, Mathieu Malaterre <mathieu.malaterre at gmail.com>
+Uploaders: Michael Koch <konqueror at gmx.de>, 
+           Sylvestre Ledru <sylvestre at debian.org>,
+           Torsten Werner <twerner at debian.org>,
+           Mathieu Malaterre <mathieu.malaterre at gmail.com>,
+           Vincent Fourmond <fourmond at debian.org>
 Build-Depends: debhelper (>= 5), cdbs (>= 0.4.27)
 Build-Depends-Indep: ant-optional, libbatik-java (>= 1.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
+ libservlet2.4-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

Modified: trunk/fop/debian/rules
===================================================================
--- trunk/fop/debian/rules	2011-06-06 09:16:58 UTC (rev 13758)
+++ trunk/fop/debian/rules	2011-06-06 10:57:02 UTC (rev 13759)
@@ -6,7 +6,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
-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_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_ANT_BUILD_TARGET := package javadocs #docs
 DEB_ANT_CLEAN_TARGET := distclean
 DEB_ANT_ARGS := -verbose
@@ -39,6 +39,7 @@
 
 clean::
 	-rm -Rf build
+	mkdir -p lib/build
 
 get-orig-source:
 	uscan --force-download --rename