[pkg-java] r14516 - in trunk/fop/debian: . patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Sun Aug 28 12:44:52 UTC 2011
Author: malat-guest
Date: 2011-08-28 12:44:52 +0000 (Sun, 28 Aug 2011)
New Revision: 14516
Modified:
trunk/fop/debian/changelog
trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch
trunk/fop/debian/patches/dump_exception.patch
trunk/fop/debian/rules
Log:
Fix recent regression
Modified: trunk/fop/debian/changelog
===================================================================
--- trunk/fop/debian/changelog 2011-08-28 10:34:23 UTC (rev 14515)
+++ trunk/fop/debian/changelog 2011-08-28 12:44:52 UTC (rev 14516)
@@ -1,7 +1,7 @@
-fop (1:1.0.dfsg2-2) UNRELEASED; urgency=low
+fop (1:1.0.dfsg2-2) unstable; urgency=low
[ Mathieu Malaterre ]
- * Install event-model.xml. Closes: #639162
+ * Fix issue with qdox. Closes: #639162
- Also dump exception for verbosity
[ Miguel Landaeta ]
Modified: trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch
===================================================================
--- trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch 2011-08-28 10:34:23 UTC (rev 14515)
+++ trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch 2011-08-28 12:44:52 UTC (rev 14516)
@@ -1,29 +1,8 @@
-This patch fixes a build issue with qdox 1.12
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: http://rlandmann.fedorapeople.org/fop/qdox-build.patch
-Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=51705
-Bug-Debian: http://bugs.debian.org/638532
-Forwarded: http://www.mail-archive.com/fop-users%40xmlgraphics.apache.org/msg17438.html
-
+Fix a lintian issue: add class-path
Index: fop-1.0/build.xml
===================================================================
--- fop-1.0.orig/build.xml 2010-07-12 21:34:37.000000000 +0200
+++ fop-1.0/build.xml 2011-08-26 15:15:10.000000000 +0200
-@@ -149,8 +149,8 @@
- <property name="javac.debug" value="on"/>
- <property name="javac.optimize" value="off"/>
- <property name="javac.deprecation" value="on"/>
-- <property name="javac.source" value="1.4"/>
-- <property name="javac.target" value="1.4"/>
-+ <property name="javac.source" value="1.5"/>
-+ <property name="javac.target" value="1.5"/>
- <property name="javac.fork" value="no"/>
- <property name="junit.fork" value="on"/>
- <property name="junit.haltonfailure" value="off"/>
@@ -517,7 +517,7 @@
<pathconvert property="manifest.classpath" dirsep="/" pathsep=" " refid="libs-build-classpath">
<map from="${basedir}${file.separator}lib${file.separator}" to=""/>
@@ -37,86 +16,5 @@
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ fop-1.0/fop.mf 2011-08-26 15:15:10.000000000 +0200
-@@ -0,0 +1,2 @@
+@@ -0,0 +1,1 @@
+Class-Path: xercesImpl.jar xalan2.jar bsf.jar avalon-framework.jar batik.jar commons-io.jar commons-logging.jar xmlgraphics-commons.jar xml-commons-external.jar
-+
-Index: fop-1.0/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java
-===================================================================
---- fop-1.0.orig/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java 2010-07-12 21:34:46.000000000 +0200
-+++ fop-1.0/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java 2011-08-26 15:15:57.000000000 +0200
-@@ -15,13 +15,12 @@
- * limitations under the License.
- */
-
--/* $Id: EventProducerCollector.java 932502 2010-04-09 16:48:27Z vhennebert $ */
-+/* $Id: EventProducerCollector.java 1066078 2011-02-01 16:04:41Z jeremias $ */
-
- package org.apache.fop.tools;
-
- import java.io.File;
- import java.io.IOException;
--import java.util.ArrayList;
- import java.util.Collections;
- import java.util.List;
- import java.util.Map;
-@@ -47,10 +46,10 @@
- class EventProducerCollector {
-
- private static final String CLASSNAME_EVENT_PRODUCER = EventProducer.class.getName();
-- private static final Map PRIMITIVE_MAP;
-+ private static final Map<String, Class<?>> PRIMITIVE_MAP;
-
- static {
-- Map m = new java.util.HashMap();
-+ Map <String, Class<?>> m = new java.util.HashMap<String, Class<?>>();
- m.put("boolean", Boolean.class);
- m.put("byte", Byte.class);
- m.put("char", Character.class);
-@@ -63,7 +62,7 @@
- }
-
- private DocletTagFactory tagFactory;
-- private List models = new ArrayList();
-+ private List<EventModel> models = new java.util.ArrayList<EventModel>();
-
- /**
- * Creates a new EventProducerCollector.
-@@ -139,10 +138,15 @@
- throws EventConventionException, ClassNotFoundException {
- JavaClass clazz = method.getParentClass();
- //Check EventProducer conventions
-- if (!method.getReturns().isVoid()) {
-+ try {
-+ if (!method.getReturnType().isVoid()) {
- throw new EventConventionException("All methods of interface "
- + clazz.getFullyQualifiedName() + " must have return type 'void'!");
- }
-+ } catch ( java.lang.NullPointerException e ) {
-+ System.err.printf("Exception %s %s\n", e.toString(), clazz.toString());
-+ e.printStackTrace();
-+ }
- String methodSig = clazz.getFullyQualifiedName() + "." + method.getCallSignature();
- JavaParameter[] params = method.getParameters();
- if (params.length < 1) {
-@@ -168,10 +172,10 @@
- if (params.length > 1) {
- for (int j = 1, cj = params.length; j < cj; j++) {
- JavaParameter p = params[j];
-- Class type;
-+ Class<?> type;
- JavaClass pClass = p.getType().getJavaClass();
- if (p.getType().isPrimitive()) {
-- type = (Class)PRIMITIVE_MAP.get(pClass.getName());
-+ type = PRIMITIVE_MAP.get(pClass.getName());
- if (type == null) {
- throw new UnsupportedOperationException(
- "Primitive datatype not supported: " + pClass.getName());
-@@ -197,7 +201,7 @@
- * Returns the event model that has been accumulated.
- * @return the event model.
- */
-- public List getModels() {
-+ public List<EventModel> getModels() {
- return this.models;
- }
-
Modified: trunk/fop/debian/patches/dump_exception.patch
===================================================================
--- trunk/fop/debian/patches/dump_exception.patch 2011-08-28 10:34:23 UTC (rev 14515)
+++ trunk/fop/debian/patches/dump_exception.patch 2011-08-28 12:44:52 UTC (rev 14516)
@@ -7,7 +7,7 @@
System.exit(0);
}
} catch (Exception e) {
-+ System.err.printf("Exception %s\n", e.toString());
++ System.out.println("Exception: "+ e.toString());
+ e.printStackTrace();
if (options != null) {
options.getLogger().error("Exception", e);
Modified: trunk/fop/debian/rules
===================================================================
--- trunk/fop/debian/rules 2011-08-28 10:34:23 UTC (rev 14515)
+++ trunk/fop/debian/rules 2011-08-28 12:44:52 UTC (rev 14516)
@@ -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 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
@@ -13,6 +13,11 @@
DOCD=debian/fop-doc/usr/share/doc/fop-doc
+pre-build::
+ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=639162#24
+ # For this reason qdox is not listed in DEB_JARS
+ test -h /usr/share/java/qdox.jar && cp -L /usr/share/java/qdox.jar lib/build
+
install/fop::
mh_installpom -pfop $(CURDIR)/debian/pom.xml
mh_installjar -pfop -l $(CURDIR)/debian/pom.xml \
More information about the pkg-java-commits
mailing list