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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-19 14:11:11 + (Fri, 19 Aug 2011)
New Revision: 14327

Modified:
   trunk/fop/debian/changelog
   trunk/fop/debian/orig-tar.sh
   trunk/fop/debian/rules
Log:
minor cleanup

Modified: trunk/fop/debian/changelog
===
--- trunk/fop/debian/changelog  2011-08-19 05:21:57 UTC (rev 14326)
+++ trunk/fop/debian/changelog  2011-08-19 14:11:11 UTC (rev 14327)
@@ -1,4 +1,4 @@
-fop (1:1.0.dfsg+cleaned-1) unstable; urgency=low
+fop (1:1.0.dfsg-4) unstable; urgency=low
 
   [ Sylvestre Ledru ]
   * Upload to unstable
@@ -12,6 +12,10 @@
 - add a lib/build directory as dirty workaround for a missing dir
 - add libqdox-java as build dependency
 
+  [ Mathieu Malaterre ]
+  * Revert changelog numbering to please tar script
+  * Fix JAVA_HOME value in debian/rules 
+
  -- Vincent Fourmond   Mon, 06 Jun 2011 12:49:28 +0200
 
 fop (1:1.0.dfsg-3) experimental; urgency=low

Modified: trunk/fop/debian/orig-tar.sh
===
--- trunk/fop/debian/orig-tar.sh2011-08-19 05:21:57 UTC (rev 14326)
+++ trunk/fop/debian/orig-tar.sh2011-08-19 14:11:11 UTC (rev 14327)
@@ -15,4 +15,3 @@
 mv $TAR $origDir
 echo "moved $TAR to $origDir"
 fi
-

Modified: trunk/fop/debian/rules
===
--- trunk/fop/debian/rules  2011-08-19 05:21:57 UTC (rev 14326)
+++ trunk/fop/debian/rules  2011-08-19 14:11:11 UTC (rev 14327)
@@ -2,10 +2,10 @@
 # debian/rules for FOP (uses CDBS)
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-# include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME:= /usr/lib/jvm/java-6-openjdk
+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_ANT_BUILD_TARGET := package javadocs #docs
 DEB_ANT_CLEAN_TARGET := distclean


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Bug#638532: org.apache.fop.tools.EventProducerCollector.createMethodModel(EventProducerCollector.java:142)

[Mathieu Malaterre]

Package: fop
Version: 1.0.dfsg-3
Severity: normal


fop fails to compiles with:

BUILD FAILED
/tmp/buildd/fop-1.0.dfsg/build.xml:374: java.lang.NullPointerException
at 
org.apache.fop.tools.EventProducerCollector.createMethodModel(EventProducerCollector.java:142)
at 
org.apache.fop.tools.EventProducerCollector.processEventProducerInterface(EventProducerCollector.java:130)
at 
org.apache.fop.tools.EventProducerCollector.scanFile(EventProducerCollector.java:100)
at 
org.apache.fop.tools.EventProducerCollectorTask.processFileSets(EventProducerCollectorTask.java:213)
at 
org.apache.fop.tools.EventProducerCollectorTask.execute(EventProducerCollectorTask.java:69)
at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:291)
at sun.reflect.GeneratedMethodAccessor7.invoke(Unknown Source)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:616)
at 
org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:106)
at org.apache.tools.ant.Task.perform(Task.java:348)
at org.apache.tools.ant.Target.execute(Target.java:390)
at org.apache.tools.ant.Target.performTasks(Target.java:411)
at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1399)
at org.apache.tools.ant.Project.executeTarget(Project.java:1368)
at 
org.apache.tools.ant.helper.DefaultExecutor.executeTargets(DefaultExecutor.java:41)
at org.apache.tools.ant.Project.executeTargets(Project.java:1251)
at org.apache.tools.ant.Main.runBuild(Main.java:809)
at org.apache.tools.ant.Main.startAnt(Main.java:217)
at org.apache.tools.ant.Main.start(Main.java:180)
at org.apache.tools.ant.Main.main(Main.java:268)


-- System Information:
Debian Release: 6.0.1
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'stable'), (200, 'testing'), (100, 
'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-19 16:32:35 + (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   Mon, 06 Jun 2011 12:49:28 +0200
 

Modified: trunk/fop/debian/control
===
--- trunk/fop/debian/control2011-08-19 14:55:58 UTC (rev 14328)
+++ trunk/fop/debian/control2011-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


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Bug#638532:

[Mathieu Malaterre]

Looks like RH are getting the same odd behavior:

https://bugzilla.redhat.com/show_bug.cgi?id=689930

-- 
Mathieu



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#638532:

[Mathieu Malaterre]

RHEL seems to be using this patch to work around this issue.
--- src/codegen/java/org/apache/fop/tools/EventProducerCollector.java.sav	2010-07-12 22:34:46.0 +0300
+++ src/codegen/java/org/apache/fop/tools/EventProducerCollector.java	2011-03-10 16:59:50.680483330 +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 @@ import com.thoughtworks.qdox.model.Type;
 class EventProducerCollector {
 
 private static final String CLASSNAME_EVENT_PRODUCER = EventProducer.class.getName();
-private static final Map PRIMITIVE_MAP;
+private static final Map> PRIMITIVE_MAP;
 
 static {
-Map m = new java.util.HashMap();
+Map > m = new java.util.HashMap>();
 m.put("boolean", Boolean.class);
 m.put("byte", Byte.class);
 m.put("char", Character.class);
@@ -63,7 +62,7 @@ class EventProducerCollector {
 }
 
 private DocletTagFactory tagFactory;
-private List models = new ArrayList();
+private List models = new java.util.ArrayList();
 
 /**
  * Creates a new EventProducerCollector.
@@ -123,6 +122,9 @@ class EventProducerCollector {
  */
 protected void processEventProducerInterface(JavaClass clazz)
 throws EventConventionException, ClassNotFoundException {
+	if (clazz.getParentClass() == null || clazz.getParentClass().getName().equals("java.lang.Object")) {
+		return;
+	}
 EventProducerModel prodMeta = new EventProducerModel(clazz.getFullyQualifiedName());
 JavaMethod[] methods = clazz.getMethods(true);
 for (int i = 0, c = methods.length; i < c; i++) {
@@ -139,7 +141,7 @@ class EventProducerCollector {
 throws EventConventionException, ClassNotFoundException {
 JavaClass clazz = method.getParentClass();
 //Check EventProducer conventions
-if (!method.getReturns().isVoid()) {
+if (!method.getReturnType().isVoid()) {
 throw new EventConventionException("All methods of interface "
 + clazz.getFullyQualifiedName() + " must have return type 'void'!");
 }
@@ -168,10 +170,10 @@ class EventProducerCollector {
 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 +199,7 @@ class EventProducerCollector {
  * Returns the event model that has been accumulated.
  * @return the event model.
  */
-public List getModels() {
+public List getModels() {
 return this.models;
 }
 
__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#638532:

[Mathieu Malaterre]

On Mon, Aug 22, 2011 at 4:13 PM, Sylvestre Ledru  wrote:
> Le lundi 22 août 2011 à 16:05 +0200, Mathieu Malaterre a écrit :
>> RHEL seems to be using this patch to work around this issue.
> Well done
> Could you try to apply it to see how it goes ?

Actually it nows fails with:

[javac] 
/home/mathieu/debian/pkg-java/trunk/fop/fop-1.0/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java:49:
generics are not supported in -source 1.4
[javac] (use -source 5 or higher to enable generics)
[javac] private static final Map> PRIMITIVE_MAP;
[javac] ^
[javac] 1 error

BUILD FAILED
/home/mathieu/debian/pkg-java/trunk/fop/fop-1.0/build.xml:354: Compile
failed; see the compiler error output for details.
at org.apache.tools.ant.taskdefs.Javac.compile(Javac.java:1113)
at org.apache.tools.ant.taskdefs.Javac.execute(Javac.java:906)


I could not figure out -yet- if this patch is due to an internal
change of qdox on Fedora/RHEL or this is indeed related to our current
issue.


-- 
Mathieu



__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-22 14:24:45 + (Mon, 22 Aug 2011)
New Revision: 14387

Modified:
   trunk/fop/debian/pom.xml
Log:
We need xmlgraphics-commons 1.4 now

Modified: trunk/fop/debian/pom.xml
===
--- trunk/fop/debian/pom.xml2011-08-22 12:50:46 UTC (rev 14386)
+++ trunk/fop/debian/pom.xml2011-08-22 14:24:45 UTC (rev 14387)
@@ -70,7 +70,7 @@
 
   org.apache.xmlgraphics
   xmlgraphics-commons
-  1.3.1
+  1.4
 
 
   org.apache.xmlgraphics


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-22 14:30:22 + (Mon, 22 Aug 2011)
New Revision: 14388

Modified:
   trunk/fop/debian/control
   trunk/fop/debian/rules
Log:
reactivate qdox

Modified: trunk/fop/debian/control
===
--- trunk/fop/debian/control2011-08-22 14:24:45 UTC (rev 14387)
+++ trunk/fop/debian/control2011-08-22 14:30:22 UTC (rev 14388)
@@ -13,7 +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
+ 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-08-22 14:24:45 UTC (rev 14387)
+++ trunk/fop/debian/rules  2011-08-22 14:30:22 UTC (rev 14388)
@@ -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
+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


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r14389 - trunk/fop/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-22 14:31:16 + (Mon, 22 Aug 2011)
New Revision: 14389

Added:
   trunk/fop/debian/patches/debian-changes-1:1.0.dfsg-4
Modified:
   trunk/fop/debian/patches/series
Log:
Adding patch to get qdox 1.12 to work

Added: trunk/fop/debian/patches/debian-changes-1:1.0.dfsg-4
===
--- trunk/fop/debian/patches/debian-changes-1:1.0.dfsg-4
(rev 0)
+++ trunk/fop/debian/patches/debian-changes-1:1.0.dfsg-42011-08-22 
14:31:16 UTC (rev 14389)
@@ -0,0 +1,345 @@
+Description: Upstream changes introduced in version 1:1.0.dfsg-4
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ fop (1:1.0.dfsg-4) unstable; urgency=low
+ .
+   [ 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)
+ .
+   [ 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
+ .
+   [ Mathieu Malaterre ]
+   * Revert changelog numbering to please tar script
+   * Fix JAVA_HOME value in debian/rules
+   * Remove qdox from build. Closes: #638532
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Vincent Fourmond 
+Bug-Debian: http://bugs.debian.org/604008
+Bug-Debian: http://bugs.debian.org/623639
+Bug-Debian: http://bugs.debian.org/625869
+Bug-Debian: http://bugs.debian.org/626069
+Bug-Debian: http://bugs.debian.org/638532
+
+---
+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: , 
+Bug: 
+Bug-Debian: http://bugs.debian.org/
+Bug-Ubuntu: https://launchpad.net/bugs/
+Forwarded: 
+Reviewed-By: 
+Last-Update: 
+
+--- fop-1.0.dfsg.orig/build.xml
 fop-1.0.dfsg/build.xml
+@@ -149,8 +149,8 @@ list of possible build targets.
+   
+   
+   
+-  
+-  
++  
++  
+   
+   
+   
+--- /dev/null
 
fop-1.0.dfsg/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java.old
+@@ -0,0 +1,204 @@
++/*
++ * Licensed to the Apache Software Foundation (ASF) under one or more
++ * contributor license agreements.  See the NOTICE file distributed with
++ * this work for additional information regarding copyright ownership.
++ * The ASF licenses this file to You under the Apache License, Version 2.0
++ * (the "License"); you may not use this file except in compliance with
++ * the License.  You may obtain a copy of the License at
++ *
++ *  http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
++
++/* $Id: EventProducerCollector.java 932502 2010-04-09 16:48:27Z vhennebert $ 
*/
++
++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;
++
++import org.apache.fop.events.EventProducer;
++import org.apache.fop.events.model.EventMethodModel;
++import org.apache.fop.events.model.EventModel;
++import org.apache.fop.events.model.EventProducerModel;
++import org.apache.fop.events.model.EventSeverity;
++
++import com.thoughtworks.qdox.JavaDocBuilder;
++import com.thoughtworks.qdox.model.DefaultDocletTagFactory;
++import com.thoughtworks.qdox.model.DocletTag;
++import com.thoughtworks.qdox.model.DocletTagFactory;
++import com.thoughtworks.qdox.model.JavaClass;
++import com.thoughtworks.qdox.model.JavaMethod;
++import com.thoughtworks.qdox.model.JavaParameter;
++import com.thoughtworks.qdox.model.Type;
++
++/**
++ * Finds EventProducer interfaces and builds the event model for them.
++ */
++class EventProducerCollector {
++
++private static final String CLASSNAME_EVENT_PRODUCER = 
EventProducer.class.getName();
++private static final Map PRIMITIVE_MAP;
++
++static {
++Map m = new java.util.HashMap();
++m.put("boolean", Boolean.class);
++m.put("byte", Byte.class);
++m.put("char", Character.class);
++m.put("short", Short.class);
++m.put("int", Integer.class);
++m.put("long", Long.class);
++m.put(&q

[pkg-java] r14390 - trunk/fop/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-22 14:45:22 + (Mon, 22 Aug 2011)
New Revision: 14390

Modified:
   trunk/fop/debian/patches/debian-changes-1:1.0.dfsg-4
Log:
Need to add a Class-Path to please lintian

Modified: trunk/fop/debian/patches/debian-changes-1:1.0.dfsg-4
===
--- trunk/fop/debian/patches/debian-changes-1:1.0.dfsg-42011-08-22 
14:31:16 UTC (rev 14389)
+++ trunk/fop/debian/patches/debian-changes-1:1.0.dfsg-42011-08-22 
14:45:22 UTC (rev 14390)
@@ -56,7 +56,21 @@



+@@ -517,7 +517,7 @@ list of possible build targets.
+ 
+   
+ 
+-
++
+   
+ 
+ 
 --- /dev/null
 fop-1.0.dfsg/fop.mf
+@@ -0,0 +1,2 @@
++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
++
+--- /dev/null
 +++ 
fop-1.0.dfsg/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java.old
 @@ -0,0 +1,204 @@
 +/*


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-22 14:50:10 + (Mon, 22 Aug 2011)
New Revision: 14391

Modified:
   trunk/fop/debian/control
Log:
Fix lintian description-starts-with-package-name

Modified: trunk/fop/debian/control
===
--- trunk/fop/debian/control2011-08-22 14:45:22 UTC (rev 14390)
+++ trunk/fop/debian/control2011-08-22 14:50:10 UTC (rev 14391)
@@ -31,7 +31,7 @@
 Recommends: libsaxon-java
 Suggests: fop-doc, libservlet2.4-java
 Replaces: libfop-java
-Description: FOP is an XML formatter driven by XSL Formatting Objects (XSL-FO.)
+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,
  PCL, PDF, PNG, PostScript, RTF, TIFF, and plain text), or displays
@@ -46,7 +46,7 @@
 Architecture: all
 Replaces: libfop-java-doc
 Depends:  ${misc:Depends}
-Description: FOP is an XML formatter driven by XSL Formatting Objects (doc)
+Description: XML formatter driven by XSL Formatting Objects (doc)
  FOP is a Java application that reads a formatting object tree and then
  turns it into a wide variety of output presentations (including AFP,
  PCL, PDF, PNG, PostScript, RTF, TIFF, and plain text), or displays


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r14392 - trunk/fop/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-22 14:51:56 + (Mon, 22 Aug 2011)
New Revision: 14392

Added:
   trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch
Removed:
   trunk/fop/debian/patches/series
Log:
try renaming patch to please lintian

Added: trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch
===
--- trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch   
(rev 0)
+++ trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch   2011-08-22 
14:51:56 UTC (rev 14392)
@@ -0,0 +1,345 @@
+Description: Upstream changes introduced in version 1:1.0.dfsg-4
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ fop (1:1.0.dfsg-4) unstable; urgency=low
+ .
+   [ 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)
+ .
+   [ 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
+ .
+   [ Mathieu Malaterre ]
+   * Revert changelog numbering to please tar script
+   * Fix JAVA_HOME value in debian/rules
+   * Remove qdox from build. Closes: #638532
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Vincent Fourmond 
+Bug-Debian: http://bugs.debian.org/604008
+Bug-Debian: http://bugs.debian.org/623639
+Bug-Debian: http://bugs.debian.org/625869
+Bug-Debian: http://bugs.debian.org/626069
+Bug-Debian: http://bugs.debian.org/638532
+
+---
+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: , 
+Bug: 
+Bug-Debian: http://bugs.debian.org/
+Bug-Ubuntu: https://launchpad.net/bugs/
+Forwarded: 
+Reviewed-By: 
+Last-Update: 
+
+--- fop-1.0.dfsg.orig/build.xml
 fop-1.0.dfsg/build.xml
+@@ -149,8 +149,8 @@ list of possible build targets.
+   
+   
+   
+-  
+-  
++  
++  
+   
+   
+   
+--- /dev/null
 
fop-1.0.dfsg/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java.old
+@@ -0,0 +1,204 @@
++/*
++ * Licensed to the Apache Software Foundation (ASF) under one or more
++ * contributor license agreements.  See the NOTICE file distributed with
++ * this work for additional information regarding copyright ownership.
++ * The ASF licenses this file to You under the Apache License, Version 2.0
++ * (the "License"); you may not use this file except in compliance with
++ * the License.  You may obtain a copy of the License at
++ *
++ *  http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
++
++/* $Id: EventProducerCollector.java 932502 2010-04-09 16:48:27Z vhennebert $ 
*/
++
++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;
++
++import org.apache.fop.events.EventProducer;
++import org.apache.fop.events.model.EventMethodModel;
++import org.apache.fop.events.model.EventModel;
++import org.apache.fop.events.model.EventProducerModel;
++import org.apache.fop.events.model.EventSeverity;
++
++import com.thoughtworks.qdox.JavaDocBuilder;
++import com.thoughtworks.qdox.model.DefaultDocletTagFactory;
++import com.thoughtworks.qdox.model.DocletTag;
++import com.thoughtworks.qdox.model.DocletTagFactory;
++import com.thoughtworks.qdox.model.JavaClass;
++import com.thoughtworks.qdox.model.JavaMethod;
++import com.thoughtworks.qdox.model.JavaParameter;
++import com.thoughtworks.qdox.model.Type;
++
++/**
++ * Finds EventProducer interfaces and builds the event model for them.
++ */
++class EventProducerCollector {
++
++private static final String CLASSNAME_EVENT_PRODUCER = 
EventProducer.class.getName();
++private static final Map PRIMITIVE_MAP;
++
++static {
++Map m = new java.util.HashMap();
++m.put("boolean", Boolean.class);
++m.put("byte", Byte.class);
++m.put("char", Character.class);
++m.put("short", Short.class);
++m.put("int", Integer.class);
++m.put("long", Long.class);
++m.put(&q

[pkg-java] r14393 - trunk/fop/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-22 14:54:54 + (Mon, 22 Aug 2011)
New Revision: 14393

Removed:
   trunk/fop/debian/patches/debian-changes-1:1.0.dfsg-4
Modified:
   trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch
Log:
Forgot piece of patch

Modified: trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch
===
--- trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch   2011-08-22 
14:51:56 UTC (rev 14392)
+++ trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch   2011-08-22 
14:54:54 UTC (rev 14393)
@@ -56,7 +56,21 @@



+@@ -517,7 +517,7 @@ list of possible build targets.
+ 
+   
+ 
+-
++
+   
+ 
+ 
 --- /dev/null
 fop-1.0.dfsg/fop.mf
+@@ -0,0 +1,2 @@
++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
++
+--- /dev/null
 +++ 
fop-1.0.dfsg/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java.old
 @@ -0,0 +1,204 @@
 +/*

Deleted: trunk/fop/debian/patches/debian-changes-1:1.0.dfsg-4
===
--- trunk/fop/debian/patches/debian-changes-1:1.0.dfsg-42011-08-22 
14:51:56 UTC (rev 14392)
+++ trunk/fop/debian/patches/debian-changes-1:1.0.dfsg-42011-08-22 
14:54:54 UTC (rev 14393)
@@ -1,359 +0,0 @@
-Description: Upstream changes introduced in version 1:1.0.dfsg-4
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- fop (1:1.0.dfsg-4) unstable; urgency=low
- .
-   [ 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)
- .
-   [ 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
- .
-   [ Mathieu Malaterre ]
-   * Revert changelog numbering to please tar script
-   * Fix JAVA_HOME value in debian/rules
-   * Remove qdox from build. Closes: #638532
- .
- The person named in the Author field signed this changelog entry.
-Author: Vincent Fourmond 
-Bug-Debian: http://bugs.debian.org/604008
-Bug-Debian: http://bugs.debian.org/623639
-Bug-Debian: http://bugs.debian.org/625869
-Bug-Debian: http://bugs.debian.org/626069
-Bug-Debian: http://bugs.debian.org/638532
-

-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: , 
-Bug: 
-Bug-Debian: http://bugs.debian.org/
-Bug-Ubuntu: https://launchpad.net/bugs/
-Forwarded: 
-Reviewed-By: 
-Last-Update: 
-
 fop-1.0.dfsg.orig/build.xml
-+++ fop-1.0.dfsg/build.xml
-@@ -149,8 +149,8 @@ list of possible build targets.
-   
-   
-   
--  
--  
-+  
-+  
-   
-   
-   
-@@ -517,7 +517,7 @@ list of possible build targets.
- 
-   
- 
--
-+
-   
- 
- 
 /dev/null
-+++ fop-1.0.dfsg/fop.mf
-@@ -0,0 +1,2 @@
-+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
-+
 /dev/null
-+++ 
fop-1.0.dfsg/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java.old
-@@ -0,0 +1,204 @@
-+/*
-+ * Licensed to the Apache Software Foundation (ASF) under one or more
-+ * contributor license agreements.  See the NOTICE file distributed with
-+ * this work for additional information regarding copyright ownership.
-+ * The ASF licenses this file to You under the Apache License, Version 2.0
-+ * (the "License"); you may not use this file except in compliance with
-+ * the License.  You may obtain a copy of the License at
-+ *
-+ *  http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+
-+/* $Id: EventProducerCollector.java 932502 2010-04-09 16:48:27Z vhennebert $ 
*/
-+
-+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;
-+
-+import org.apache.fop.events.EventProducer;
-+import org.apache.fop.events.model.E

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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-22 14:57:03 + (Mon, 22 Aug 2011)
New Revision: 14394

Modified:
   trunk/fop/debian/changelog
Log:
Tweak changelog desc

Modified: trunk/fop/debian/changelog
===
--- trunk/fop/debian/changelog  2011-08-22 14:54:54 UTC (rev 14393)
+++ trunk/fop/debian/changelog  2011-08-22 14:57:03 UTC (rev 14394)
@@ -15,7 +15,7 @@
   [ Mathieu Malaterre ]
   * Revert changelog numbering to please tar script
   * Fix JAVA_HOME value in debian/rules 
-  * Remove qdox from build. Closes: #638532
+  * Fix qdox 1.12 build failure. Closes: #638532
 
  -- Vincent Fourmond   Mon, 06 Jun 2011 12:49:28 +0200
 


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r14395 - trunk/fop/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-22 15:00:53 + (Mon, 22 Aug 2011)
New Revision: 14395

Added:
   trunk/fop/debian/patches/series
Log:
revert and add empty file

Added: trunk/fop/debian/patches/series
===

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-22 15:01:38 + (Mon, 22 Aug 2011)
New Revision: 14396

Removed:
   trunk/fop/debian/NEWS.Debian
Log:
Remove file

Deleted: trunk/fop/debian/NEWS.Debian
===
--- trunk/fop/debian/NEWS.Debian2011-08-22 15:00:53 UTC (rev 14395)
+++ trunk/fop/debian/NEWS.Debian2011-08-22 15:01:38 UTC (rev 14396)
@@ -1,7 +0,0 @@
-fop (0.93.dfsg.1-1) unstable; urgency=low
-
-  * fop shell script comes with java.awt.headless set to true.
-  * fop has been built with jdk6 (ibm), JAI and JIMI support.
-
- -- Arnaud Vandyck   Thu, 10 May 2007 12:50:20 +0200
-


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r14397 - trunk/fop/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-22 15:15:23 + (Mon, 22 Aug 2011)
New Revision: 14397

Modified:
   trunk/fop/debian/patches/series
Log:
Need to list patch

Modified: trunk/fop/debian/patches/series
===
--- trunk/fop/debian/patches/series 2011-08-22 15:01:38 UTC (rev 14396)
+++ trunk/fop/debian/patches/series 2011-08-22 15:15:23 UTC (rev 14397)
@@ -0,0 +1 @@
+04_fixqdoxbuildfailure.patch


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

fop 1.0 ready

[Mathieu Malaterre]

Dear all,

  I believe fop 1.0 is now in good shape to be uploaded to unstable.
Whoever is doing the upload need to do a *source* upload. It looks
like make -f ./debian/rules get-orig-source is broken or does not
produce proper tarball.

Thanks,
-- 
Mathieu

__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

[pkg-java] r14399 - trunk/fop/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-22 15:49:46 + (Mon, 22 Aug 2011)
New Revision: 14399

Modified:
   trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch
Log:
Cleanup patch

Modified: trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch
===
--- trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch   2011-08-22 
15:40:35 UTC (rev 14398)
+++ trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch   2011-08-22 
15:49:46 UTC (rev 14399)
@@ -1,47 +1,13 @@
-Description: Upstream changes introduced in version 1:1.0.dfsg-4
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- fop (1:1.0.dfsg-4) unstable; urgency=low
- .
-   [ 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)
- .
-   [ 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
- .
-   [ Mathieu Malaterre ]
-   * Revert changelog numbering to please tar script
-   * Fix JAVA_HOME value in debian/rules
-   * Remove qdox from build. Closes: #638532
- .
- The person named in the Author field signed this changelog entry.
-Author: Vincent Fourmond 
-Bug-Debian: http://bugs.debian.org/604008
-Bug-Debian: http://bugs.debian.org/623639
-Bug-Debian: http://bugs.debian.org/625869
-Bug-Debian: http://bugs.debian.org/626069
-Bug-Debian: http://bugs.debian.org/638532
-
+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: , 
-Bug: 
-Bug-Debian: http://bugs.debian.org/
-Bug-Ubuntu: https://launchpad.net/bugs/
-Forwarded: 
-Reviewed-By: 
-Last-Update: 
+Origin: http://rlandmann.fedorapeople.org/fop/qdox-build.patch
+Bug: https://bugzilla.redhat.com/show_bug.cgi?id=689930
+Bug-Debian: http://bugs.debian.org/638532
+Forwarded: 
http://www.mail-archive.com/fop-users%40xmlgraphics.apache.org/msg17438.html
 
 --- fop-1.0.dfsg.orig/build.xml
 +++ fop-1.0.dfsg/build.xml
@@ -70,213 +36,6 @@
 @@ -0,0 +1,2 @@
 +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
 +
 /dev/null
-+++ 
fop-1.0.dfsg/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java.old
-@@ -0,0 +1,204 @@
-+/*
-+ * Licensed to the Apache Software Foundation (ASF) under one or more
-+ * contributor license agreements.  See the NOTICE file distributed with
-+ * this work for additional information regarding copyright ownership.
-+ * The ASF licenses this file to You under the Apache License, Version 2.0
-+ * (the "License"); you may not use this file except in compliance with
-+ * the License.  You may obtain a copy of the License at
-+ *
-+ *  http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+
-+/* $Id: EventProducerCollector.java 932502 2010-04-09 16:48:27Z vhennebert $ 
*/
-+
-+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;
-+
-+import org.apache.fop.events.EventProducer;
-+import org.apache.fop.events.model.EventMethodModel;
-+import org.apache.fop.events.model.EventModel;
-+import org.apache.fop.events.model.EventProducerModel;
-+import org.apache.fop.events.model.EventSeverity;
-+
-+import com.thoughtworks.qdox.JavaDocBuilder;
-+import com.thoughtworks.qdox.model.DefaultDocletTagFactory;
-+import com.thoughtworks.qdox.model.DocletTag;
-+import com.thoughtworks.qdox.model.DocletTagFactory;
-+import com.thoughtworks.qdox.model.JavaClass;
-+import com.thoughtworks.qdox.model.JavaMethod;
-+import com.thoughtworks.qdox.model.JavaParameter;
-+import com.thoughtworks.qdox.model.Type;
-+
-+/**
-+ * Finds EventProducer interfaces and builds the event model for them.
-+ */
-+class EventProducerCollector {
-+
-+private static final String CLASSNAME_EVENT_PRODUCER = 
EventProducer.class.getName();
-+private static final Map PRIMITIVE_MAP;
-+
-+static {
-+Map 

[pkg-java] r14400 - trunk/fop/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-22 15:58:12 + (Mon, 22 Aug 2011)
New Revision: 14400

Modified:
   trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch
Log:
report bug upstream properly

Modified: trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch
===
--- trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch   2011-08-22 
15:49:46 UTC (rev 14399)
+++ trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch   2011-08-22 
15:58:12 UTC (rev 14400)
@@ -5,7 +5,7 @@
 are templates for supplementary fields that you might want to add:
 
 Origin: http://rlandmann.fedorapeople.org/fop/qdox-build.patch
-Bug: https://bugzilla.redhat.com/show_bug.cgi?id=689930
+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
 


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r14486 - in trunk/fop/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-25 13:36:56 + (Thu, 25 Aug 2011)
New Revision: 14486

Added:
   trunk/fop/debian/patches/dump_exception.patch
Modified:
   trunk/fop/debian/changelog
   trunk/fop/debian/patches/series
Log:
Start working on new bugs

Modified: trunk/fop/debian/changelog
===
--- trunk/fop/debian/changelog  2011-08-25 13:29:17 UTC (rev 14485)
+++ trunk/fop/debian/changelog  2011-08-25 13:36:56 UTC (rev 14486)
@@ -1,3 +1,10 @@
+fop (1:1.0.dfsg2-2) UNRELEASED; urgency=low
+
+  * Install event-model.xml. Closes: #639162
+- Also dump exception for verbosity
+
+ -- Mathieu Malaterre   Thu, 25 Aug 2011 15:35:55 
+0200
+
 fop (1:1.0.dfsg2-1) unstable; urgency=low
 
   [ Sylvestre Ledru ]

Added: trunk/fop/debian/patches/dump_exception.patch
===
--- trunk/fop/debian/patches/dump_exception.patch   
(rev 0)
+++ trunk/fop/debian/patches/dump_exception.patch   2011-08-25 13:36:56 UTC 
(rev 14486)
@@ -0,0 +1,14 @@
+Dump exception, as suggest on bug #639162
+Index: fop-1.0/src/java/org/apache/fop/cli/Main.java
+===
+--- fop-1.0.orig/src/java/org/apache/fop/cli/Main.java 2011-08-25 
15:34:31.0 +0200
 fop-1.0/src/java/org/apache/fop/cli/Main.java  2011-08-25 
15:34:49.0 +0200
+@@ -186,6 +186,8 @@
+ System.exit(0);
+ }
+ } catch (Exception e) {
++  System.err.printf("Exception %s\n", e.toString());
++  e.printStackTrace();
+ if (options != null) {
+ options.getLogger().error("Exception", e);
+ if (options.getOutputFile() != null) {

Modified: trunk/fop/debian/patches/series
===
--- trunk/fop/debian/patches/series 2011-08-25 13:29:17 UTC (rev 14485)
+++ trunk/fop/debian/patches/series 2011-08-25 13:36:56 UTC (rev 14486)
@@ -1 +1,2 @@
 04_fixqdoxbuildfailure.patch
+dump_exception.patch


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Bug#639162:

[Mathieu Malaterre]

Confirmed.

Went to:
http://pkgs.org/fedora-rawhide/fedora-i386/fop-javadoc-1.0-16.fc16.noarch.rpm.html

   wget 
http://download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/fop-1.0-16.fc16.src.rpm
   alien --to-tgz fop-1.0-16.fc16.src.rpm
   tar xvfz fop-1.0.tgz

fop in fedora is shipped with event-model.tgz, I could not figure out
-yet- where they are coming from

-- 
Mathieu



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

[pkg-java] r14500 - trunk/fop/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-26 11:55:23 + (Fri, 26 Aug 2011)
New Revision: 14500

Modified:
   trunk/fop/debian/patches/dump_exception.patch
Log:
Use directly change from fop/svn

Modified: trunk/fop/debian/patches/dump_exception.patch
===
--- trunk/fop/debian/patches/dump_exception.patch   2011-08-26 09:59:10 UTC 
(rev 14499)
+++ trunk/fop/debian/patches/dump_exception.patch   2011-08-26 11:55:23 UTC 
(rev 14500)
@@ -1,8 +1,8 @@
 Dump exception, as suggest on bug #639162
 Index: fop-1.0/src/java/org/apache/fop/cli/Main.java
 ===
 fop-1.0.orig/src/java/org/apache/fop/cli/Main.java 2011-08-25 
15:34:31.0 +0200
-+++ fop-1.0/src/java/org/apache/fop/cli/Main.java  2011-08-25 
15:34:49.0 +0200
+--- fop-1.0.orig/src/java/org/apache/fop/cli/Main.java 2010-07-12 
21:34:44.0 +0200
 fop-1.0/src/java/org/apache/fop/cli/Main.java  2011-08-26 
13:53:12.0 +0200
 @@ -186,6 +186,8 @@
  System.exit(0);
  }
@@ -12,3 +12,17 @@
  if (options != null) {
  options.getLogger().error("Exception", e);
  if (options.getOutputFile() != null) {
+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  
   2011-08-26 13:53:23.0 +0200
 fop-1.0/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java  
2011-08-26 13:53:38.0 +0200
+@@ -122,9 +122,6 @@
+  */
+ protected void processEventProducerInterface(JavaClass clazz)
+ throws EventConventionException, ClassNotFoundException {
+-  if (clazz.getParentClass() == null || 
clazz.getParentClass().getName().equals("java.lang.Object")) {
+-  return;
+-  }
+ EventProducerModel prodMeta = new 
EventProducerModel(clazz.getFullyQualifiedName());
+ JavaMethod[] methods = clazz.getMethods(true);
+ for (int i = 0, c = methods.length; i < c; i++) {


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r14501 - trunk/fop/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-26 12:35:53 + (Fri, 26 Aug 2011)
New Revision: 14501

Modified:
   trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch
Log:
Refresh patch

Modified: trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch
===
--- trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch   2011-08-26 
11:55:23 UTC (rev 14500)
+++ trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch   2011-08-26 
12:35:53 UTC (rev 14501)
@@ -9,9 +9,11 @@
 Bug-Debian: http://bugs.debian.org/638532
 Forwarded: 
http://www.mail-archive.com/fop-users%40xmlgraphics.apache.org/msg17438.html
 
 fop-1.0.dfsg.orig/build.xml
-+++ fop-1.0.dfsg/build.xml
-@@ -149,8 +149,8 @@ list of possible build targets.
+Index: fop-1.0/build.xml
+===
+--- fop-1.0.orig/build.xml 2010-07-12 21:34:37.0 +0200
 fop-1.0/build.xml  2011-08-26 14:35:27.0 +0200
+@@ -149,8 +149,8 @@



@@ -22,7 +24,7 @@



-@@ -517,7 +517,7 @@ list of possible build targets.
+@@ -517,7 +517,7 @@
  

  
@@ -31,13 +33,17 @@

  
  
 /dev/null
-+++ fop-1.0.dfsg/fop.mf
+Index: fop-1.0/fop.mf
+===
+--- /dev/null  1970-01-01 00:00:00.0 +
 fop-1.0/fop.mf 2011-08-26 14:35:27.0 +0200
 @@ -0,0 +1,2 @@
 +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
 +
 
fop-1.0.dfsg.orig/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java
-+++ 
fop-1.0.dfsg/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java
+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.0 +0200
 fop-1.0/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java  
2011-08-26 14:35:39.0 +0200
 @@ -15,13 +15,12 @@
   * limitations under the License.
   */
@@ -53,7 +59,7 @@
  import java.util.Collections;
  import java.util.List;
  import java.util.Map;
-@@ -47,10 +46,10 @@ import com.thoughtworks.qdox.model.Type;
+@@ -47,10 +46,10 @@
  class EventProducerCollector {
  
  private static final String CLASSNAME_EVENT_PRODUCER = 
EventProducer.class.getName();
@@ -66,7 +72,7 @@
  m.put("boolean", Boolean.class);
  m.put("byte", Byte.class);
  m.put("char", Character.class);
-@@ -63,7 +62,7 @@ class EventProducerCollector {
+@@ -63,7 +62,7 @@
  }
  
  private DocletTagFactory tagFactory;
@@ -75,17 +81,7 @@
  
  /**
   * Creates a new EventProducerCollector.
-@@ -123,6 +122,9 @@ class EventProducerCollector {
-  */
- protected void processEventProducerInterface(JavaClass clazz)
- throws EventConventionException, ClassNotFoundException {
-+  if (clazz.getParentClass() == null || 
clazz.getParentClass().getName().equals("java.lang.Object")) {
-+  return;
-+  }
- EventProducerModel prodMeta = new 
EventProducerModel(clazz.getFullyQualifiedName());
- JavaMethod[] methods = clazz.getMethods(true);
- for (int i = 0, c = methods.length; i < c; i++) {
-@@ -139,7 +141,7 @@ class EventProducerCollector {
+@@ -139,7 +138,7 @@
  throws EventConventionException, ClassNotFoundException {
  JavaClass clazz = method.getParentClass();
  //Check EventProducer conventions
@@ -94,7 +90,7 @@
  throw new EventConventionException("All methods of interface "
  + clazz.getFullyQualifiedName() + " must have return type 
'void'!");
  }
-@@ -168,10 +170,10 @@ class EventProducerCollector {
+@@ -168,10 +167,10 @@
  if (params.length > 1) {
  for (int j = 1, cj = params.length; j < cj; j++) {
  JavaParameter p = params[j];
@@ -107,7 +103,7 @@
  if (type == null) {
  throw new UnsupportedOperationException(
  "Primitive datatype not supported: " + 
pClass.getName());
-@@ -197,7 +199,7 @@ class EventProducerCollector {
+@@ -197,7 +196,7 @@
   * Returns the event model that has been accumulated.
   * @return the event model.
   */


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Bug#639162:

[Mathieu Malaterre]

qdox has been updated in this commit:

http://svn.eu.apache.org/viewvc?view=revision&revision=1066078

current fop/debian package properly integrate patch from:

http://svn.eu.apache.org/viewvc/xmlgraphics/fop/trunk/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java?r1=1066078&r2=1066077&pathrev=1066078

However there is still something quite not right yet

-- 
Mathieu



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

[pkg-java] r14502 - trunk/fop/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-26 12:41:07 + (Fri, 26 Aug 2011)
New Revision: 14502

Modified:
   trunk/fop/debian/patches/dump_exception.patch
Log:
cleanup patch

Modified: trunk/fop/debian/patches/dump_exception.patch
===
--- trunk/fop/debian/patches/dump_exception.patch   2011-08-26 12:35:53 UTC 
(rev 14501)
+++ trunk/fop/debian/patches/dump_exception.patch   2011-08-26 12:41:07 UTC 
(rev 14502)
@@ -2,7 +2,7 @@
 Index: fop-1.0/src/java/org/apache/fop/cli/Main.java
 ===
 --- fop-1.0.orig/src/java/org/apache/fop/cli/Main.java 2010-07-12 
21:34:44.0 +0200
-+++ fop-1.0/src/java/org/apache/fop/cli/Main.java  2011-08-26 
13:53:12.0 +0200
 fop-1.0/src/java/org/apache/fop/cli/Main.java  2011-08-26 
14:40:54.0 +0200
 @@ -186,6 +186,8 @@
  System.exit(0);
  }
@@ -12,17 +12,3 @@
  if (options != null) {
  options.getLogger().error("Exception", e);
  if (options.getOutputFile() != null) {
-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  
   2011-08-26 13:53:23.0 +0200
-+++ fop-1.0/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java  
2011-08-26 13:53:38.0 +0200
-@@ -122,9 +122,6 @@
-  */
- protected void processEventProducerInterface(JavaClass clazz)
- throws EventConventionException, ClassNotFoundException {
--  if (clazz.getParentClass() == null || 
clazz.getParentClass().getName().equals("java.lang.Object")) {
--  return;
--  }
- EventProducerModel prodMeta = new 
EventProducerModel(clazz.getFullyQualifiedName());
- JavaMethod[] methods = clazz.getMethods(true);
- for (int i = 0, c = methods.length; i < c; i++) {


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r14503 - trunk/fop/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-26 13:17:21 + (Fri, 26 Aug 2011)
New Revision: 14503

Modified:
   trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch
Log:
add exception

Modified: trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch
===
--- trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch   2011-08-26 
12:41:07 UTC (rev 14502)
+++ trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch   2011-08-26 
13:17:21 UTC (rev 14503)
@@ -12,7 +12,7 @@
 Index: fop-1.0/build.xml
 ===
 --- fop-1.0.orig/build.xml 2010-07-12 21:34:37.0 +0200
-+++ fop-1.0/build.xml  2011-08-26 14:35:27.0 +0200
 fop-1.0/build.xml  2011-08-26 15:15:10.0 +0200
 @@ -149,8 +149,8 @@


@@ -36,14 +36,14 @@
 Index: fop-1.0/fop.mf
 ===
 --- /dev/null  1970-01-01 00:00:00.0 +
-+++ fop-1.0/fop.mf 2011-08-26 14:35:27.0 +0200
 fop-1.0/fop.mf 2011-08-26 15:15:10.0 +0200
 @@ -0,0 +1,2 @@
 +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.0 +0200
-+++ fop-1.0/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java  
2011-08-26 14:35:39.0 +0200
 fop-1.0/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java  
2011-08-26 15:15:57.0 +0200
 @@ -15,13 +15,12 @@
   * limitations under the License.
   */
@@ -81,16 +81,24 @@
  
  /**
   * Creates a new EventProducerCollector.
-@@ -139,7 +138,7 @@
+@@ -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'!");
  }
-@@ -168,10 +167,10 @@
++} 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];
@@ -103,7 +111,7 @@
  if (type == null) {
  throw new UnsupportedOperationException(
  "Primitive datatype not supported: " + 
pClass.getName());
-@@ -197,7 +196,7 @@
+@@ -197,7 +201,7 @@
   * Returns the event model that has been accumulated.
   * @return the event model.
   */


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Bug#639162: Fwd: Building fop from source using qdox 1.11

[Mathieu Malaterre]

For reference.


-- Forwarded message --
From: Simon Pepping
Date: Sat, Aug 27, 2011 at 8:50 PM
Subject: Re: Building fop from source using qdox 1.11


It is an interesting observation that fop can be compiled with
qdox-1.12 in the lib/build directory, but not in the CLASSPATH
variable. It even works with FOP's own jar files:

CLASSPATH=lib/build/qdox-1.6.3.jar ant clean resourcegen

in fop-1.0 fails, while

ant clean resourcegen

succeeds. The same error can be provoked in fop's development version.
This problem is not a problem of qdox version, but of the way ant
deals with the CLASSPATH variable, and the way qdox reacts to that.
Somehow it does not have the effect of simply placing those jars in
front of the classpath constructed in the build script.

I cannot tell you how you should set your CLASSPATH variable for a
variant build environment. It all depends on your requirements. If you
wish to build fop with fop's build script but with jar files in the
system, you might best edit the classpath variables in the build
script: libs-build-classpath, libs-tools-build-classpath,
libs-run-classpath. A quick scan of the build script suggests that
almost all classpaths are constructed using these variables, plus the
build directories created by earlier stages of the build. Exceptions
are javadocs, which also uses ${java.class.path}, and findbugs, which
uses ${libs-findbugs}.

Simon

On Fri, Aug 26, 2011 at 11:46:39PM +0200, Mathieu Malaterre wrote:
> Hi Simon,
>
>   Great we are making some progress. Since you are using debian, this
> will be even easier. Try the attached script.
>
>   If you are on a debian machine with:
>
> $ apt-cache policy libqdox-java
> libqdox-java:
>   Installed: 1.12-1
>
>   You should quickly discover that indeed qdox-1.12 from debian allows
> proper compilation of fop, *if and only if* copied to lib/build.
>
>   When using the second version (via export CLASSPATH), one indeed get
> the error you have seen. I could even reproduce the error using some
> precompile qdox jar file:
>
> mkdir /tmp/cp
> cd /tmp/cp
> wget 
> http://mirrors.ibiblio.org/pub/mirrors/maven2/com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar
> export CLASSPATH=/tmp/cp/qdox-1.12.jar
>
> leads also to the exact same error (*).
>
> So now the question, is how did I misread the instructions from:
>
> http://xmlgraphics.apache.org/fop/1.0/compiling.html#env-classpath
>
> How should I be setting up my CLASSPATH to compile fop ?
>
> Thanks again very much for your time,
>
>
> (*)
> BUILD FAILED
> /tmp/clean/fop-1.0/build.xml:374: java.lang.NullPointerException
>       at 
> org.apache.fop.tools.EventProducerCollector.createMethodModel(EventProducerCollector.java:142)
>       at 
> org.apache.fop.tools.EventProducerCollector.processEventProducerInterface(EventProducerCollector.java:130)
>       at 
> org.apache.fop.tools.EventProducerCollector.scanFile(EventProducerCollector.java:100)
>       at 
> org.apache.fop.tools.EventProducerCollectorTask.processFileSets(EventProducerCollectorTask.java:213)
>       at 
> org.apache.fop.tools.EventProducerCollectorTask.execute(EventProducerCollectorTask.java:69)
>       at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:291)
>       at sun.reflect.GeneratedMethodAccessor7.invoke(Unknown Source)
>       at 
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>       at java.lang.reflect.Method.invoke(Method.java:616)
>       at 
> org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:106)
>       at org.apache.tools.ant.Task.perform(Task.java:348)
>       at org.apache.tools.ant.Target.execute(Target.java:390)
>       at org.apache.tools.ant.Target.performTasks(Target.java:411)
>       at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1360)
>       at org.apache.tools.ant.Project.executeTarget(Project.java:1329)
>       at 
> org.apache.tools.ant.helper.DefaultExecutor.executeTargets(DefaultExecutor.java:41)
>       at org.apache.tools.ant.Project.executeTargets(Project.java:1212)
>       at org.apache.tools.ant.Main.runBuild(Main.java:801)
>       at org.apache.tools.ant.Main.startAnt(Main.java:218)
>       at org.apache.tools.ant.launch.Launcher.run(Launcher.java:280)
>       at org.apache.tools.ant.launch.Launcher.main(Launcher.java:109)



__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#638532:

[Mathieu Malaterre]

The patch for this bug was reverted, this causes side effects much
worse. See bug #639162

Proper fix is now described at:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=639162#24

-- 
Mathieu



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

[pkg-java] r14516 - in trunk/fop/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-28 12:44:52 + (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.0 +0200
 +++ fop-1.0/build.xml  2011-08-26 15:15:10.0 +0200
-@@ -149,8 +149,8 @@
-   
-   
-   
--  
--  
-+  
-+  
-   
-   
-   
 @@ -517,7 +517,7 @@
  

@@ -37,86 +16,5 @@
 ===
 --- /dev/null  1970-01-01 00:00:00.0 +
 +++ fop-1.0/fop.mf 2011-08-26 15:15:10.0 +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.0 +0200
-+++ fop-1.0/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java  
2011-08-26 15:15:57.0 +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> PRIMITIVE_MAP;
- 
- static {
--Map m = new java.util.HashMap();
-+Map > m = new java.util.HashMap>();
- 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 models = new java.util.ArrayList();
- 
- /**
-  * 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 @@
- 

Bug#639683: fop does not run any tests

[Mathieu Malaterre]

Package: fop
Version: 1:1.0.dfsg2-2
Severity: normal


The current fop packaging does not run any of the tests.

It would be nice to run them

-- System Information:
Debian Release: 6.0.1
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'stable'), (200, 'testing'), (100, 
'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages fop depends on:
ii  default-jre-headle 1:1.6-40  Standard Java or Java compatible R
ii  gcj-4.4-jre-headle 4.4.5-2   Java runtime environment using GIJ
ii  gcj-jre-headless [ 4:4.4.5-1 Java runtime environment using GIJ
ii  java-wrappers  0.1.16wrappers for java executables
ii  libavalon-framewor 4.2.0-7   Common framework for Java server a
ii  libbatik-java  1.7-6 xml.apache.org SVG Library
ii  libbsf-java1:2.4.0-4 Bean Scripting Framework to suppor
ii  libcommons-io-java 1.4-3 Common useful IO related classes
ii  libcommons-logging 1.1.1-8   commmon wrapper interface for seve
ii  libxalan2-java 2.7.1-5   XSL Transformations (XSLT) process
ii  libxerces2-java2.9.1-4.1 Validating XML parser for Java wit
ii  libxml-commons-ext 1.3.05-2  XML Commons external code - DOM, S
ii  libxmlgraphics-com 1.4.dfsg-3reusable components used by Batik 
ii  libxt6 1:1.0.7-1 X11 toolkit intrinsics library
ii  libxtst6   2:1.1.0-3 X11 Testing -- Record extension li
ii  openjdk-6-jre-head 6b18-1.8.3-2+squeeze1 OpenJDK Java runtime, using Hotspo
ii  sun-java6-jre [jav 6.26-0squeeze1Sun Java(TM) Runtime Environment (

Versions of packages fop recommends:
ii  libsaxon-java 1:6.5.5-6  The Saxon XSLT Processor

Versions of packages fop suggests:
pn  fop-doc(no description available)
ii  libservlet2.4-java5.0.30-12  Servlet 2.4 and JSP 2.0 Java libra

-- no debconf information



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#639683: Fwd: Building fop from source using qdox 1.11

[Mathieu Malaterre]

fop's team seems interested in feedback from tests.


-- Forwarded message --
From: Simon Pepping
Date: Mon, Aug 29, 2011 at 1:37 PM
Subject: Re: Building fop from source using qdox 1.11
To: fop-us...@xmlgraphics.apache.org


I see that you resolved the problem by copying qdox.jar from
/usr/share/java to lib/build before the build process. I installed the
resulting package fop_1.0.dfsg2-2 and ran it on a few test files. The
result was OK.

It would be good if alternative builds of fop would run a number of
our junit tests. The fop team should look into this to formulate a
recommendation.

Simon



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#580333:

[Mathieu Malaterre]

fixed 580333 1:1.0.dfsg2-2
thanks

I cannot reproduce this issue with current fop from unstable. Closing.

Thanks



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#613808:

[Mathieu Malaterre]

fixed 613808 1:1.0.dfsg2-2
tags 613808 moreinfo
thanks

I cannot reproduce this issue with current fop from unstable. Could
you confirm ?

Thanks



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#566484:

[Mathieu Malaterre]

fixed 566484 1:1.0.dfsg2-2
thanks

I can get version using fop -version in fop 1.0. fop -v is now documented as:

  -vrun in verbose mode (currently simply print FOP
version and continue)

$ fop -version
FOP Version 1.0


-- 
Mathieu



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

[pkg-java] r14747 - in trunk: . net-luminis-build-plugin net-luminis-build-plugin/debian net-luminis-build-plugin/debian/patches net-luminis-build-plugin/debian/source

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-07 16:58:16 + (Wed, 07 Sep 2011)
New Revision: 14747

Added:
   trunk/net-luminis-build-plugin/
   trunk/net-luminis-build-plugin/debian/
   trunk/net-luminis-build-plugin/debian/changelog
   trunk/net-luminis-build-plugin/debian/compat
   trunk/net-luminis-build-plugin/debian/control
   trunk/net-luminis-build-plugin/debian/copyright
   trunk/net-luminis-build-plugin/debian/get-orig-source
   trunk/net-luminis-build-plugin/debian/libnet-luminis-build-plugin-java.jlibs
   trunk/net-luminis-build-plugin/debian/patches/
   trunk/net-luminis-build-plugin/debian/patches/series
   trunk/net-luminis-build-plugin/debian/rules
   trunk/net-luminis-build-plugin/debian/source/
   trunk/net-luminis-build-plugin/debian/source/format
   trunk/net-luminis-build-plugin/debian/watch
Log:
first pass

Added: trunk/net-luminis-build-plugin/debian/changelog
===
--- trunk/net-luminis-build-plugin/debian/changelog 
(rev 0)
+++ trunk/net-luminis-build-plugin/debian/changelog 2011-09-07 16:58:16 UTC 
(rev 14747)
@@ -0,0 +1,5 @@
+net-luminis-build-plugin (0.2.0-1) unstable; urgency=low
+
+  * Initial Debian Upload (Closes: #??)
+
+ -- Mathieu Malaterre   Wed, 07 Sep 2011 18:48:30 
+0200

Added: trunk/net-luminis-build-plugin/debian/compat
===
--- trunk/net-luminis-build-plugin/debian/compat
(rev 0)
+++ trunk/net-luminis-build-plugin/debian/compat2011-09-07 16:58:16 UTC 
(rev 14747)
@@ -0,0 +1 @@
+8

Added: trunk/net-luminis-build-plugin/debian/control
===
--- trunk/net-luminis-build-plugin/debian/control   
(rev 0)
+++ trunk/net-luminis-build-plugin/debian/control   2011-09-07 16:58:16 UTC 
(rev 14747)
@@ -0,0 +1,22 @@
+Source: net-luminis-build-plugin
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers 

+DM-Upload-Allowed: yes
+Uploaders: Mathieu Malaterre 
+Build-Depends: debhelper (>= 8), javahelper (>=0.25)
+Build-Depends-Indep: default-jdk, ant, bnd
+Standards-Version: 3.9.2
+Homepage: https://opensource.luminis.net/wiki/display/SITE/OSGi+Bundle+Ant+Task
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/net-luminis-build-plugin
+Vcs-Browser: 
http://svn.debian.org/wsvn/pkg-java/trunk/net-luminis-build-plugin/
+
+Package: libnet-luminis-build-plugin-java
+Architecture: all
+Depends: ${misc:Depends}
+Description: Wrapper around Bnd to allow easy bundle creation from ant builds.
+ The OSGi bundle ant task is a wrapper around Bnd to allow easy bundle creation
+ from ant builds.
+ .
+ Creates an OSGi bundle. Computes OSGi headers (most notably the importPackage
+ and exportPackage) from class analysis.

Added: trunk/net-luminis-build-plugin/debian/copyright
===
--- trunk/net-luminis-build-plugin/debian/copyright 
(rev 0)
+++ trunk/net-luminis-build-plugin/debian/copyright 2011-09-07 16:58:16 UTC 
(rev 14747)
@@ -0,0 +1,34 @@
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: OSGi Bundle Ant Task
+Source: https://opensource.luminis.net/wiki/display/SITE/OSGi+Bundle+Ant+Task
+
+Files: *
+Copyright: © 2006, 2007 luminis
+Licence: BSD
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ 
+ - Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+ - Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+ - Neither the name of the Luminis nor the names of its contributors may be
+   used to endorse or promote products derived from this software without
+   specific prior written permission.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
+Files: debian/*
+Copyright: © 2011 Mathieu Malaterre 
+License: BSD

Added: trunk/n

[pkg-java] r14748 - in trunk/net-luminis-build-plugin/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-07 17:07:01 + (Wed, 07 Sep 2011)
New Revision: 14748

Added:
   trunk/net-luminis-build-plugin/debian/patches/fixbuildxml.patch
Modified:
   trunk/net-luminis-build-plugin/debian/patches/series
   trunk/net-luminis-build-plugin/debian/rules
Log:
Fixing build.xml

Added: trunk/net-luminis-build-plugin/debian/patches/fixbuildxml.patch
===
--- trunk/net-luminis-build-plugin/debian/patches/fixbuildxml.patch 
(rev 0)
+++ trunk/net-luminis-build-plugin/debian/patches/fixbuildxml.patch 
2011-09-07 17:07:01 UTC (rev 14748)
@@ -0,0 +1,52 @@
+Taken from:
+http://www.spinics.net/lists/fedora-package-review/msg213801.html
+Index: net-luminis-build-plugin-0.2.0/build.xml
+===
+--- net-luminis-build-plugin-0.2.0.orig/build.xml  2011-09-07 
19:03:59.0 +0200
 net-luminis-build-plugin-0.2.0/build.xml   2011-09-07 19:04:04.0 
+0200
+@@ -1,17 +1,30 @@
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+ 
+-
+-
+ 

Modified: trunk/net-luminis-build-plugin/debian/patches/series
===
--- trunk/net-luminis-build-plugin/debian/patches/series2011-09-07 
16:58:16 UTC (rev 14747)
+++ trunk/net-luminis-build-plugin/debian/patches/series2011-09-07 
17:07:01 UTC (rev 14748)
@@ -0,0 +1 @@
+fixbuildxml.patch

Modified: trunk/net-luminis-build-plugin/debian/rules
===
--- trunk/net-luminis-build-plugin/debian/rules 2011-09-07 16:58:16 UTC (rev 
14747)
+++ trunk/net-luminis-build-plugin/debian/rules 2011-09-07 17:07:01 UTC (rev 
14748)
@@ -3,11 +3,14 @@
 export DH_VERBOSE=1
 
 JAVA_HOME=/usr/lib/jvm/default-java
-CLASSPATH=/usr/share/java/bnd.jar
+export CLASSPATH=/usr/share/java/bnd.jar
 #DEB_ANT_BUILD_TARGET := dist
 
 %:
dh $@
 
+override_dh_auto_build:
+   ant dist
+
 get-orig-source:
./debian/get-orig-source


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r14749 - in trunk/net-luminis-build-plugin/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-07 17:13:55 + (Wed, 07 Sep 2011)
New Revision: 14749

Added:
   trunk/net-luminis-build-plugin/debian/patches/debian-changes-0.2.0-1
Modified:
   trunk/net-luminis-build-plugin/debian/control
   trunk/net-luminis-build-plugin/debian/patches/fixbuildxml.patch
   trunk/net-luminis-build-plugin/debian/patches/series
   trunk/net-luminis-build-plugin/debian/rules
Log:
Package does compile

Modified: trunk/net-luminis-build-plugin/debian/control
===
--- trunk/net-luminis-build-plugin/debian/control   2011-09-07 17:07:01 UTC 
(rev 14748)
+++ trunk/net-luminis-build-plugin/debian/control   2011-09-07 17:13:55 UTC 
(rev 14749)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers 

 DM-Upload-Allowed: yes
 Uploaders: Mathieu Malaterre 
-Build-Depends: debhelper (>= 8), javahelper (>=0.25)
+Build-Depends: debhelper (>= 8), javahelper (>= 0.25)
 Build-Depends-Indep: default-jdk, ant, bnd
 Standards-Version: 3.9.2
 Homepage: https://opensource.luminis.net/wiki/display/SITE/OSGi+Bundle+Ant+Task

Added: trunk/net-luminis-build-plugin/debian/patches/debian-changes-0.2.0-1
===
--- trunk/net-luminis-build-plugin/debian/patches/debian-changes-0.2.0-1
(rev 0)
+++ trunk/net-luminis-build-plugin/debian/patches/debian-changes-0.2.0-1
2011-09-07 17:13:55 UTC (rev 14749)
@@ -0,0 +1,38 @@
+Description: Upstream changes introduced in version 0.2.0-1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ net-luminis-build-plugin (0.2.0-1) unstable; urgency=low
+ .
+   * Initial Debian Upload (Closes: #??)
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Mathieu Malaterre 
+
+---
+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: , 
+Bug: 
+Bug-Debian: http://bugs.debian.org/
+Bug-Ubuntu: https://launchpad.net/bugs/
+Forwarded: 
+Reviewed-By: 
+Last-Update: 
+
+--- 
net-luminis-build-plugin-0.2.0.orig/src/net/luminis/build/plugin/bnd/BuildTask.java
 
net-luminis-build-plugin-0.2.0/src/net/luminis/build/plugin/bnd/BuildTask.java
+@@ -338,8 +338,8 @@ public class BuildTask extends Task {
+  * task attribute.
+  */
+ public void setIncludeIncludeResourceHeader(boolean include) {
+-if (! include)
+-m_instructions.put(Analyzer.REMOVE_HEADERS, 
Analyzer.INCLUDE_RESOURCE);
++//if (! include)
++//m_instructions.put(Analyzer.REMOVE_HEADERS, 
Analyzer.INCLUDE_RESOURCE);
+ // default is do include
+ }
+ 

Modified: trunk/net-luminis-build-plugin/debian/patches/fixbuildxml.patch
===
--- trunk/net-luminis-build-plugin/debian/patches/fixbuildxml.patch 
2011-09-07 17:07:01 UTC (rev 14748)
+++ trunk/net-luminis-build-plugin/debian/patches/fixbuildxml.patch 
2011-09-07 17:13:55 UTC (rev 14749)
@@ -2,8 +2,8 @@
 http://www.spinics.net/lists/fedora-package-review/msg213801.html
 Index: net-luminis-build-plugin-0.2.0/build.xml
 ===
 net-luminis-build-plugin-0.2.0.orig/build.xml  2011-09-07 
19:03:59.0 +0200
-+++ net-luminis-build-plugin-0.2.0/build.xml   2011-09-07 19:04:04.0 
+0200
+--- net-luminis-build-plugin-0.2.0.orig/build.xml  2011-09-07 
19:11:28.0 +0200
 net-luminis-build-plugin-0.2.0/build.xml   2011-09-07 19:11:51.0 
+0200
 @@ -1,17 +1,30 @@
 -
 -
@@ -37,9 +37,9 @@
 +
 +
-+
++
 +
-+
++
 +
 +

Modified: trunk/net-luminis-build-plugin/debian/patches/series
===
--- trunk/net-luminis-build-plugin/debian/patches/series2011-09-07 
17:07:01 UTC (rev 14748)
+++ trunk/net-luminis-build-plugin/debian/patches/series2011-09-07 
17:13:55 UTC (rev 14749)
@@ -1 +1,2 @@
 fixbuildxml.patch
+debian-changes-0.2.0-1

Modified: trunk/net-luminis-build-plugin/debian/rules
===
--- trunk/net-luminis-build-plugin/debian/rules 2011-09-07 17:07:01 UTC (rev 
14748)
+++ trunk/net-luminis-build-plugin/debian/rules 2011-09-07 17:13:55 UTC (rev 
14749)
@@ -1,13 +1,12 @@
 #!/usr/bin/make -f
+#export DH_VERBOSE=1
 
-export DH_VERBOSE=1
-
 JAVA_HOME=/usr/lib/jvm/default-java
 export CLASSPATH=/usr/share/java/bnd.jar
 #DEB_ANT_BUILD_TARGET := dist
 
 %:
-   dh $@
+   dh $@ --with javahelper
 
 override_dh_auto_build:

[pkg-java] r14757 - trunk/bnd/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-07 20:44:22 + (Wed, 07 Sep 2011)
New Revision: 14757

Modified:
   trunk/bnd/debian/control
Log:
Fix homepage link

Modified: trunk/bnd/debian/control
===
--- trunk/bnd/debian/control2011-09-07 20:25:51 UTC (rev 14756)
+++ trunk/bnd/debian/control2011-09-07 20:44:22 UTC (rev 14757)
@@ -8,7 +8,7 @@
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/bnd
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/bnd
-Homepage: http://www.aqute.biz/Code/Bnd
+Homepage: http://www.aQute.biz/Bnd
 
 Package: bnd
 Architecture: all


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Bug#640839: bnd move to github

[Mathieu Malaterre]

Package: bnd
Version: 0.0.384-1
Severity: normal


Just a note, bnd has moved to github, and is not on sf.net anymore:

https://github.com/bnd/bnd

orig-tar.sh will need to be fixed

-- System Information:
Debian Release: 6.0.1
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'stable'), (200, 'testing'), (100, 
'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages bnd depends on:
ii  default-jre-headle 1:1.6-40  Standard Java or Java compatible R
ii  gcj-4.4-jre-headle 4.4.5-2   Java runtime environment using GIJ
ii  gcj-jre-headless [ 4:4.4.5-1 Java runtime environment using GIJ
ii  java-wrappers  0.1.16wrappers for java executables
ii  openjdk-6-jdk  6b18-1.8.7-2~squeeze1 OpenJDK Development Kit (JDK)
ii  openjdk-6-jre-head 6b18-1.8.7-2~squeeze1 OpenJDK Java runtime, using Hotspo

bnd recommends no packages.

bnd suggests no packages.

-- no debconf information



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#613808:

[Mathieu Malaterre]

Roger I forgot to CC you. Could you please check status of bug #613808

Thanks

-- 
Mathieu



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#584472:

[Mathieu Malaterre]

forward 584472 https://issues.apache.org/bugzilla/show_bug.cgi?id=40464
thanks

Apparently support for OpenType in fop has been discussed many time on
the mailing list. The issue is rather low level as fop should only
focuss on fo rendering and not in fonts handling.

-- 
Mathieu



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#610344:

[Mathieu Malaterre]

tag 610344 moreinfo
thanks

Brian, when you say "patch attach", you mean I need to apply the two
patches referenced in the bug report on fop/apache bugtracker, right ?

Thanks
-- 
Mathieu



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#609253:

[Mathieu Malaterre]

tag 609253 moreinfo
thanks

Brian, I cannot reproduce this issue today using your wonderer.fo file.


$ apt-cache policy fop
fop:
  Installed: 1:1.0.dfsg2-2
  Candidate: 1:1.0.dfsg2-2
  Version table:
 *** 1:1.0.dfsg2-2 0
200 http://ftp.fr.debian.org/debian/ testing/main amd64 Packages
100 http://ftp.fr.debian.org/debian/ unstable/main amd64 Packages
100 /var/lib/dpkg/status
 1:0.95.dfsg-11 0
500 http://ftp.fr.debian.org/debian/ squeeze/main amd64 Packages

-- 
Mathieu



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#519592:

[Mathieu Malaterre]

tag 519592 moreinfo
thanks

Brian, would it be possible for you to provide a simple fo file to
reproduce this issue ?
Did you reported it upstream ?

Thanks

-- 
Mathieu



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#613808:

[Mathieu Malaterre]

Ok then closing.

-- 
Mathieu



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#519592: your mail

[Mathieu Malaterre]

On Sun, Sep 11, 2011 at 3:07 AM, brian m. carlson
 wrote:
> On Fri, Sep 09, 2011 at 11:17:03AM +0200, Mathieu Malaterre wrote:
>> Brian, would it be possible for you to provide a simple fo file to
>> reproduce this issue ?
>
> A fo file is attached.  I don't know about simple, but I trimmed the
> input file I generated it from in order to make it as minimal as
> possible.  The only thing that matters is the rdf:RDF in the
> fo:declarations element, so you can remove extraneous material if you
> need to.

Ok. I can reproduce:

$ fop aoif.fo aoif.pdf
$ pdfinfo aoif.pdf
Title:  Una Naranja en Vuelo
...

>> Did you reported it upstream ?
>
> If I didn't mark the Debian bug as forwarded, I didn't report it
> upstream.

Ok, I'll do it for you.

-- 
Mathieu



__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#609253: your mail

[Mathieu Malaterre]

On Sun, Sep 11, 2011 at 2:55 AM, brian m. carlson
 wrote:
> On Fri, Sep 09, 2011 at 11:14:24AM +0200, Mathieu Malaterre wrote:
>> tag 609253 moreinfo
>> thanks
>>
>> Brian, I cannot reproduce this issue today using your wonderer.fo file.
>
> I can still reproduce it.  Try using the attached configuration file
> with -c.

Brian, I can *still* not reproduce your issue (not a single warning).
Your fop.xconf seems to be reading from "/etc/fop/hyph", which does
not exists on my debian system.
What is supposed to be located here ?

Simply commenting out hyphenation-base XML element makes your
fop.xconf valid for me.

Thanks
-- 
Mathieu



__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#610344: your mail

[Mathieu Malaterre]

On Sun, Sep 11, 2011 at 2:49 AM, brian m. carlson
 wrote:
> On Fri, Sep 09, 2011 at 11:09:41AM +0200, Mathieu Malaterre wrote:
>> Brian, when you say "patch attach", you mean I need to apply the two
>> patches referenced in the bug report on fop/apache bugtracker, right ?
>
> I had intended to attach it but forgot.  The patch is the same one as
> for the upstream bug.  The bug has been fixed differently upstream,
> though, so you may want to use the upstream patch instead.

Ok. Thanks for confirmation.

-- 
Mathieu



__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

[pkg-java] r14819 - in trunk/fop/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-11 13:06:21 + (Sun, 11 Sep 2011)
New Revision: 14819

Added:
   trunk/fop/debian/patches/enco.patch
   trunk/fop/debian/patches/enco2.patch
Modified:
   trunk/fop/debian/changelog
   trunk/fop/debian/patches/dump_exception.patch
   trunk/fop/debian/patches/series
Log:
Fix one issue where font was misrender. Regression from 0.95

Modified: trunk/fop/debian/changelog
===
--- trunk/fop/debian/changelog  2011-09-11 10:15:52 UTC (rev 14818)
+++ trunk/fop/debian/changelog  2011-09-11 13:06:21 UTC (rev 14819)
@@ -1,3 +1,9 @@
+fop (1:1.0.dfsg2-3) UNRELEASED; urgency=low
+
+  * Fix misrender issue. Closes: #610344
+
+ -- Mathieu Malaterre   Sun, 11 Sep 2011 15:01:03 
+0200
+
 fop (1:1.0.dfsg2-2) unstable; urgency=low
 
   [ Mathieu Malaterre ]

Modified: trunk/fop/debian/patches/dump_exception.patch
===
--- trunk/fop/debian/patches/dump_exception.patch   2011-09-11 10:15:52 UTC 
(rev 14818)
+++ trunk/fop/debian/patches/dump_exception.patch   2011-09-11 13:06:21 UTC 
(rev 14819)
@@ -1,8 +1,8 @@
 Dump exception, as suggest on bug #639162
 Index: fop-1.0/src/java/org/apache/fop/cli/Main.java
 ===
 fop-1.0.orig/src/java/org/apache/fop/cli/Main.java 2010-07-12 
21:34:44.0 +0200
-+++ fop-1.0/src/java/org/apache/fop/cli/Main.java  2011-08-26 
14:40:54.0 +0200
+--- fop-1.0.orig/src/java/org/apache/fop/cli/Main.java 2011-09-11 
14:50:52.0 +0200
 fop-1.0/src/java/org/apache/fop/cli/Main.java  2011-09-11 
14:51:11.0 +0200
 @@ -186,6 +186,8 @@
  System.exit(0);
  }

Added: trunk/fop/debian/patches/enco.patch
===
--- trunk/fop/debian/patches/enco.patch (rev 0)
+++ trunk/fop/debian/patches/enco.patch 2011-09-11 13:06:21 UTC (rev 14819)
@@ -0,0 +1,70 @@
+Description: Removed fallback mechanism in AbstractCodePointMapping. This is 
superfluous now that SingleByteFont handles all substitutions. This actually 
fixes a bug: the glyph "minus" was painted using "hyphen" but used the width of 
"minus" due to this fallback mechanism.
+Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=50605
+Last-Update: 2011-09-11
+Origin: http://svn.apache.org/viewvc?view=revision&revision=1142188
+
+Index: fop-1.0/src/java/org/apache/fop/fonts/AbstractCodePointMapping.java
+===
+--- fop-1.0.orig/src/java/org/apache/fop/fonts/AbstractCodePointMapping.java   
2011-09-11 14:51:37.0 +0200
 fop-1.0/src/java/org/apache/fop/fonts/AbstractCodePointMapping.java
2011-09-11 14:52:41.0 +0200
+@@ -20,7 +20,6 @@
+ package org.apache.fop.fonts;
+ 
+ import java.util.Arrays;
+-import java.util.Map;
+ 
+ import org.apache.xmlgraphics.fonts.Glyphs;
+ 
+@@ -37,7 +36,6 @@
+ private char[] codepoints;
+ private char[] unicodeMap; //code point to Unicode char
+ private String[] charNameMap; //all character names in the encoding
+-private Map fallbackMap; //Here we accumulate all mappings we have found 
through substitution
+ 
+ /**
+  * Main constructor.
+@@ -140,44 +138,9 @@
+ bot = mid + 1;
+ }
+ }
+-
+-//Fallback: using cache
+-synchronized (this) {
+-if (fallbackMap != null) {
+-Character fallback = (Character)fallbackMap.get(new 
Character(c));
+-if (fallback != null) {
+-return fallback.charValue();
+-}
+-}
+-}
+-//Fallback: find alternatives (slow!)
+-String glyphName = Glyphs.charToGlyphName(c);
+-if (glyphName.length() > 0) {
+-String[] alternatives = 
Glyphs.getCharNameAlternativesFor(glyphName);
+-if (alternatives != null) {
+-for (int i = 0, ic = alternatives.length; i < ic; i++) {
+-int idx = getCodePointForGlyph(alternatives[i]);
+-if (idx >= 0) {
+-putFallbackCharacter(c, (char)idx);
+-return (char)idx;
+-}
+-}
+-}
+-}
+-
+-putFallbackCharacter(c, NOT_FOUND_CODE_POINT);
+ return NOT_FOUND_CODE_POINT;
+ }
+ 
+-private void putFallbackCharacter(char c, char mapTo) {
+-synchronized (this) {
+-if (this.fallbackMap == null) {
+-this.fallbackMap = new java.util.HashMap();
+-}
+-this.fallbackMap.put(new Character(c), new Character(mapTo));
+-}
+-}
+-
+ /**
+  * Returns the main Unicode value that is associated with the given code 
point in the encoding.

Bug#575411: fop: log4j not initialized correctly

[Mathieu Malaterre]

tag 575411 moreinfo
thanks

For some reason I cannot reproduce this issue with latest fop from
testing. Could someone double-check ?

Thanks much
-- 
Mathieu



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#519592: Fwd: picks wrong title language for metadata

[Mathieu Malaterre]

tag 519592 wontfix
thanks


-- Forwarded message --


There are two questionable assumptions you seem to make below:
(1) that FOP "chooses" (filters) metadata elements based on lang,
i.e., FOP implements the semantics of rdf:Alt;
(2) that FOP would fix-up non-conforming metadata;
Of course, the functionality in question is an extension to XSL-FO in
the first place, so it is *possible* that FOP could do these things.
However, it is not consistent with FOP semantics that it should do so,
since FOP does not make choices between *any* content based on
language, and since FOP does not perform *any* fix-ups for
non-compliant content.
You should perform the content selection process during the front-end
XSLT stage, or, if you are feeding FO directly to FOP, then do it when
you create the FO input file. That is, you should not expect this
extension to implement the semantics of rdf:Alt.



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#544546:

[Mathieu Malaterre]

We need to pay attention to this:

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=220237

In the past we had a libfop-java package already and current fop
package is marked as conflict against this libfop-java package

-- 
Mathieu



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#575411:

[Mathieu Malaterre]

fixed 575411 fop/1:1.0.dfsg2-2
thanks

I cannot reproduce the issue using 1.0 release. Must be 0.95 specific. Closing.

-- 
Mathieu



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#609253:

[Mathieu Malaterre]

Smaller example taken from:

https://issues.apache.org/bugzilla/show_bug.cgi?id=47279

thread info:

http://www.mail-archive.com/fop-users@xmlgraphics.apache.org/msg14198.html

-- 
Mathieu

http://www.w3.org/1999/XSL/Format";>
  

  

  
  

  Text that can be rendered using the default sans-serif font 
family only.

  

__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

[pkg-java] r14856 - trunk/net-luminis-build-plugin/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-12 12:58:24 + (Mon, 12 Sep 2011)
New Revision: 14856

Added:
   trunk/net-luminis-build-plugin/debian/patches/remove_headers.patch
Removed:
   trunk/net-luminis-build-plugin/debian/patches/debian-changes-0.2.0-1
Modified:
   trunk/net-luminis-build-plugin/debian/patches/series
Log:
cleanup patches

Deleted: trunk/net-luminis-build-plugin/debian/patches/debian-changes-0.2.0-1
===
--- trunk/net-luminis-build-plugin/debian/patches/debian-changes-0.2.0-1
2011-09-12 12:53:51 UTC (rev 14855)
+++ trunk/net-luminis-build-plugin/debian/patches/debian-changes-0.2.0-1
2011-09-12 12:58:24 UTC (rev 14856)
@@ -1,38 +0,0 @@
-Description: Upstream changes introduced in version 0.2.0-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- net-luminis-build-plugin (0.2.0-1) unstable; urgency=low
- .
-   * Initial Debian Upload (Closes: #??)
- .
- The person named in the Author field signed this changelog entry.
-Author: Mathieu Malaterre 
-

-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: , 
-Bug: 
-Bug-Debian: http://bugs.debian.org/
-Bug-Ubuntu: https://launchpad.net/bugs/
-Forwarded: 
-Reviewed-By: 
-Last-Update: 
-
 
net-luminis-build-plugin-0.2.0.orig/src/net/luminis/build/plugin/bnd/BuildTask.java
-+++ 
net-luminis-build-plugin-0.2.0/src/net/luminis/build/plugin/bnd/BuildTask.java
-@@ -338,8 +338,8 @@ public class BuildTask extends Task {
-  * task attribute.
-  */
- public void setIncludeIncludeResourceHeader(boolean include) {
--if (! include)
--m_instructions.put(Analyzer.REMOVE_HEADERS, 
Analyzer.INCLUDE_RESOURCE);
-+//if (! include)
-+//m_instructions.put(Analyzer.REMOVE_HEADERS, 
Analyzer.INCLUDE_RESOURCE);
- // default is do include
- }
- 

Copied: trunk/net-luminis-build-plugin/debian/patches/remove_headers.patch 
(from rev 14855, 
trunk/net-luminis-build-plugin/debian/patches/debian-changes-0.2.0-1)
===
--- trunk/net-luminis-build-plugin/debian/patches/remove_headers.patch  
(rev 0)
+++ trunk/net-luminis-build-plugin/debian/patches/remove_headers.patch  
2011-09-12 12:58:24 UTC (rev 14856)
@@ -0,0 +1,15 @@
+Index: 
net-luminis-build-plugin-0.2.0/src/net/luminis/build/plugin/bnd/BuildTask.java
+===
+--- 
net-luminis-build-plugin-0.2.0.orig/src/net/luminis/build/plugin/bnd/BuildTask.java
2011-09-12 14:57:52.0 +0200
 
net-luminis-build-plugin-0.2.0/src/net/luminis/build/plugin/bnd/BuildTask.java  
   2011-09-12 14:57:55.0 +0200
+@@ -338,8 +338,8 @@
+  * task attribute.
+  */
+ public void setIncludeIncludeResourceHeader(boolean include) {
+-if (! include)
+-m_instructions.put(Analyzer.REMOVE_HEADERS, 
Analyzer.INCLUDE_RESOURCE);
++//if (! include)
++//m_instructions.put(Analyzer.REMOVE_HEADERS, 
Analyzer.INCLUDE_RESOURCE);
+ // default is do include
+ }
+ 

Modified: trunk/net-luminis-build-plugin/debian/patches/series
===
--- trunk/net-luminis-build-plugin/debian/patches/series2011-09-12 
12:53:51 UTC (rev 14855)
+++ trunk/net-luminis-build-plugin/debian/patches/series2011-09-12 
12:58:24 UTC (rev 14856)
@@ -1,2 +1,2 @@
 fixbuildxml.patch
-debian-changes-0.2.0-1
+remove_headers.patch


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r14857 - trunk/net-luminis-build-plugin/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-12 13:07:09 + (Mon, 12 Sep 2011)
New Revision: 14857

Modified:
   trunk/net-luminis-build-plugin/debian/changelog
Log:
set ITP#

Modified: trunk/net-luminis-build-plugin/debian/changelog
===
--- trunk/net-luminis-build-plugin/debian/changelog 2011-09-12 12:58:24 UTC 
(rev 14856)
+++ trunk/net-luminis-build-plugin/debian/changelog 2011-09-12 13:07:09 UTC 
(rev 14857)
@@ -1,5 +1,5 @@
 net-luminis-build-plugin (0.2.0-1) unstable; urgency=low
 
-  * Initial Debian Upload (Closes: #??)
+  * Initial Debian Upload (Closes: #641295)
 
  -- Mathieu Malaterre   Wed, 07 Sep 2011 18:48:30 
+0200


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r14860 - in trunk: . opendap opendap/debian opendap/debian/patches opendap/debian/source

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-12 14:29:30 + (Mon, 12 Sep 2011)
New Revision: 14860

Added:
   trunk/opendap/
   trunk/opendap/debian/
   trunk/opendap/debian/changelog
   trunk/opendap/debian/compat
   trunk/opendap/debian/control
   trunk/opendap/debian/copyright
   trunk/opendap/debian/get-orig-source
   trunk/opendap/debian/libnet-luminis-build-plugin-java.jlibs
   trunk/opendap/debian/patches/
   trunk/opendap/debian/patches/fixbuildxml.patch
   trunk/opendap/debian/patches/remove_headers.patch
   trunk/opendap/debian/patches/series
   trunk/opendap/debian/rules
   trunk/opendap/debian/source/
   trunk/opendap/debian/source/format
   trunk/opendap/debian/watch
Log:
adding opendap

Added: trunk/opendap/debian/changelog
===
--- trunk/opendap/debian/changelog  (rev 0)
+++ trunk/opendap/debian/changelog  2011-09-12 14:29:30 UTC (rev 14860)
@@ -0,0 +1,5 @@
+opendap (2.2-1) unstable; urgency=low
+
+  * Initial Debian Upload (Closes: #??)
+
+ -- Mathieu Malaterre   Wed, 07 Sep 2011 18:48:30 
+0200

Added: trunk/opendap/debian/compat
===
--- trunk/opendap/debian/compat (rev 0)
+++ trunk/opendap/debian/compat 2011-09-12 14:29:30 UTC (rev 14860)
@@ -0,0 +1 @@
+8

Added: trunk/opendap/debian/control
===
--- trunk/opendap/debian/control(rev 0)
+++ trunk/opendap/debian/control2011-09-12 14:29:30 UTC (rev 14860)
@@ -0,0 +1,22 @@
+Source: opendap
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers 

+DM-Upload-Allowed: yes
+Uploaders: Mathieu Malaterre 
+Build-Depends: debhelper (>= 8), javahelper (>= 0.25)
+Build-Depends-Indep: default-jdk, ant, bnd
+Standards-Version: 3.9.2
+Homepage: https://opensource.luminis.net/wiki/display/SITE/OSGi+Bundle+Ant+Task
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/net-luminis-build-plugin
+Vcs-Browser: 
http://svn.debian.org/wsvn/pkg-java/trunk/net-luminis-build-plugin/
+
+Package: libopendap-java
+Architecture: all
+Depends: ${misc:Depends}
+Description: Wrapper around Bnd to allow easy bundle creation from ant builds.
+ The OSGi bundle ant task is a wrapper around Bnd to allow easy bundle creation
+ from ant builds.
+ .
+ Creates an OSGi bundle. Computes OSGi headers (most notably the importPackage
+ and exportPackage) from class analysis.

Added: trunk/opendap/debian/copyright
===
--- trunk/opendap/debian/copyright  (rev 0)
+++ trunk/opendap/debian/copyright  2011-09-12 14:29:30 UTC (rev 14860)
@@ -0,0 +1,34 @@
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: OSGi Bundle Ant Task
+Source: https://opensource.luminis.net/wiki/display/SITE/OSGi+Bundle+Ant+Task
+
+Files: *
+Copyright: © 2006, 2007 luminis
+Licence: BSD
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ 
+ - Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+ - Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+ - Neither the name of the Luminis nor the names of its contributors may be
+   used to endorse or promote products derived from this software without
+   specific prior written permission.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
+Files: debian/*
+Copyright: © 2011 Mathieu Malaterre 
+License: BSD

Added: trunk/opendap/debian/get-orig-source
===
--- trunk/opendap/debian/get-orig-source(rev 0)
+++ trunk/opendap/debian/get-orig-source2011-09-12 14:29:30 UTC (rev 
14860)
@@ -0,0 +1,27 @@
+#!/bin/sh
+set -ex
+
+PACKAGE=opendap
+
+
+VERSION=${VERSION:-$2}
+TARFILE=${TARFILE:-$3}
+
+if [ -z ${VERSION}]; the

[pkg-java] r14861 - trunk/opendap/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-12 15:02:26 + (Mon, 12 Sep 2011)
New Revision: 14861

Added:
   trunk/opendap/debian/libopendap-java-doc.javadocs
   trunk/opendap/debian/libopendap-java.jlibs
Removed:
   trunk/opendap/debian/libnet-luminis-build-plugin-java.jlibs
Modified:
   trunk/opendap/debian/control
   trunk/opendap/debian/rules
Log:
Start fixing copy/paste error

Modified: trunk/opendap/debian/control
===
--- trunk/opendap/debian/control2011-09-12 14:29:30 UTC (rev 14860)
+++ trunk/opendap/debian/control2011-09-12 15:02:26 UTC (rev 14861)
@@ -5,18 +5,39 @@
 DM-Upload-Allowed: yes
 Uploaders: Mathieu Malaterre 
 Build-Depends: debhelper (>= 8), javahelper (>= 0.25)
-Build-Depends-Indep: default-jdk, ant, bnd
+Build-Depends-Indep: default-jdk, ant, libjdom1-java, 
libcommons-httpclient-java
 Standards-Version: 3.9.2
-Homepage: https://opensource.luminis.net/wiki/display/SITE/OSGi+Bundle+Ant+Task
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/net-luminis-build-plugin
-Vcs-Browser: 
http://svn.debian.org/wsvn/pkg-java/trunk/net-luminis-build-plugin/
+Homepage: http://opendap.org
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/opendap
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/opendap/
 
 Package: libopendap-java
 Architecture: all
-Depends: ${misc:Depends}
-Description: Wrapper around Bnd to allow easy bundle creation from ant builds.
- The OSGi bundle ant task is a wrapper around Bnd to allow easy bundle creation
- from ant builds.
+Depends: ${java:Depends}, ${misc:Depends}
+Recommends: ${java:Recommends}
+Description: Project for a Network Data Access Protocol
+ OPeNDAP is a framework that simplifies all aspects of scientific data
+ networking.
  .
- Creates an OSGi bundle. Computes OSGi headers (most notably the importPackage
- and exportPackage) from class analysis.
+ OPeNDAP provides software which makes local data accessible to remote
+ locations regardless of local storage format.
+ .
+ OPeNDAP also provides tools for transforming existing applications into
+ OPeNDAP clients (i.e., enabling them to remotely access OPeNDAP served data).
+
+Package: libopendap-java-doc
+Section: doc
+Architecture: all
+Depends: ${java:Depends}, ${misc:Depends}
+Recommends: ${java:Recommends}
+Description: Project for a Network Data Access Protocol (documentation)
+ OPeNDAP is a framework that simplifies all aspects of scientific data
+ networking.
+ .
+ OPeNDAP provides software which makes local data accessible to remote
+ locations regardless of local storage format.
+ .
+ OPeNDAP also provides tools for transforming existing applications into
+ OPeNDAP clients (i.e., enabling them to remotely access OPeNDAP served data).
+ .
+ This package provides the documentation for the library

Deleted: trunk/opendap/debian/libnet-luminis-build-plugin-java.jlibs
===
--- trunk/opendap/debian/libnet-luminis-build-plugin-java.jlibs 2011-09-12 
14:29:30 UTC (rev 14860)
+++ trunk/opendap/debian/libnet-luminis-build-plugin-java.jlibs 2011-09-12 
15:02:26 UTC (rev 14861)
@@ -1 +0,0 @@
-dist/*.jar

Added: trunk/opendap/debian/libopendap-java-doc.javadocs
===
--- trunk/opendap/debian/libopendap-java-doc.javadocs   
(rev 0)
+++ trunk/opendap/debian/libopendap-java-doc.javadocs   2011-09-12 15:02:26 UTC 
(rev 14861)
@@ -0,0 +1 @@
+build/doc usr/share/doc/libopendap-java/api

Copied: trunk/opendap/debian/libopendap-java.jlibs (from rev 14860, 
trunk/opendap/debian/libnet-luminis-build-plugin-java.jlibs)
===
--- trunk/opendap/debian/libopendap-java.jlibs  (rev 0)
+++ trunk/opendap/debian/libopendap-java.jlibs  2011-09-12 15:02:26 UTC (rev 
14861)
@@ -0,0 +1 @@
+build/dist/opendap-2.2.jar

Modified: trunk/opendap/debian/rules
===
--- trunk/opendap/debian/rules  2011-09-12 14:29:30 UTC (rev 14860)
+++ trunk/opendap/debian/rules  2011-09-12 15:02:26 UTC (rev 14861)
@@ -2,8 +2,8 @@
 #export DH_VERBOSE=1
 
 JAVA_HOME=/usr/lib/jvm/default-java
-#export CLASSPATH=/usr/share/java/bnd.jar
-#DEB_ANT_BUILD_TARGET := dist
+export 
CLASSPATH=/usr/share/java/commons-httpclient.jar:/usr/share/java/jdom1.jar
+#DEB_ANT_BUILD_TARGET := distribution
 
 %:
dh $@ --with javahelper


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r14862 - trunk/opendap/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-12 15:14:58 + (Mon, 12 Sep 2011)
New Revision: 14862

Added:
   trunk/opendap/debian/libopendap-java-doc.javadoc
Removed:
   trunk/opendap/debian/libopendap-java-doc.javadocs
Modified:
   trunk/opendap/debian/libopendap-java.jlibs
Log:
final touch

Copied: trunk/opendap/debian/libopendap-java-doc.javadoc (from rev 14861, 
trunk/opendap/debian/libopendap-java-doc.javadocs)
===
--- trunk/opendap/debian/libopendap-java-doc.javadoc
(rev 0)
+++ trunk/opendap/debian/libopendap-java-doc.javadoc2011-09-12 15:14:58 UTC 
(rev 14862)
@@ -0,0 +1 @@
+build/doc usr/share/doc/libopendap-java/api

Deleted: trunk/opendap/debian/libopendap-java-doc.javadocs
===
--- trunk/opendap/debian/libopendap-java-doc.javadocs   2011-09-12 15:02:26 UTC 
(rev 14861)
+++ trunk/opendap/debian/libopendap-java-doc.javadocs   2011-09-12 15:14:58 UTC 
(rev 14862)
@@ -1 +0,0 @@
-build/doc usr/share/doc/libopendap-java/api

Modified: trunk/opendap/debian/libopendap-java.jlibs
===
--- trunk/opendap/debian/libopendap-java.jlibs  2011-09-12 15:02:26 UTC (rev 
14861)
+++ trunk/opendap/debian/libopendap-java.jlibs  2011-09-12 15:14:58 UTC (rev 
14862)
@@ -1 +1 @@
-build/dist/opendap-2.2.jar
+build/lib/opendap-2.2.jar


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r14864 - trunk/opendap/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-12 15:28:49 + (Mon, 12 Sep 2011)
New Revision: 14864

Modified:
   trunk/opendap/debian/copyright
Log:
fix copyright

Modified: trunk/opendap/debian/copyright
===
--- trunk/opendap/debian/copyright  2011-09-12 15:25:49 UTC (rev 14863)
+++ trunk/opendap/debian/copyright  2011-09-12 15:28:49 UTC (rev 14864)
@@ -1,34 +1,59 @@
 Format: http://dep.debian.net/deps/dep5/
-Upstream-Name: OSGi Bundle Ant Task
-Source: https://opensource.luminis.net/wiki/display/SITE/OSGi+Bundle+Ant+Task
+Upstream-Name: OPeNDAP
+Upstream-Author: James Gallagher 
+Source: http://opendap.org/
 
 Files: *
-Copyright: © 2006, 2007 luminis
+Copyright: © 2002,2003 OPeNDAP, Inc. ,
+ © 20010 OPeNDAP, Inc.
 Licence: BSD
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
+ Redistribution and use in source and binary forms,
+ with or without modification, are permitted provided
+ that the following conditions are met:
  
- - Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
- - Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
- - Neither the name of the Luminis nor the names of its contributors may be
-   used to endorse or promote products derived from this software without
-   specific prior written permission.
+ - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
  
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
+ - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+ 
+ - Neither the name of the OPeNDAP nor the names of its contributors may
+   be used to endorse or promote products derived from this software
+   without specific prior written permission.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+Files: src/opendap/servlet/AsciiWriter.java
+Copyright: © 1997-2006 Unidata Program Center/University Corporation for
+ Atmospheric Research, P.O. Box 3000, Boulder, CO 80307,
+ supp...@unidata.ucar.edu.
+Licence: LGPL v2.1
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or (at
+ your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
+ General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
 Files: debian/*
 Copyright: © 2011 Mathieu Malaterre 
 License: BSD


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r14865 - trunk/opendap/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-12 15:30:21 + (Mon, 12 Sep 2011)
New Revision: 14865

Modified:
   trunk/opendap/debian/copyright
Log:
fix typo

Modified: trunk/opendap/debian/copyright
===
--- trunk/opendap/debian/copyright  2011-09-12 15:28:49 UTC (rev 14864)
+++ trunk/opendap/debian/copyright  2011-09-12 15:30:21 UTC (rev 14865)
@@ -1,6 +1,6 @@
 Format: http://dep.debian.net/deps/dep5/
 Upstream-Name: OPeNDAP
-Upstream-Author: James Gallagher 
+Upstream-Contact: James Gallagher 
 Source: http://opendap.org/
 
 Files: *


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r14866 - trunk/opendap/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-12 15:32:24 + (Mon, 12 Sep 2011)
New Revision: 14866

Modified:
   trunk/opendap/debian/control
Log:
use new URL

Modified: trunk/opendap/debian/control
===
--- trunk/opendap/debian/control2011-09-12 15:30:21 UTC (rev 14865)
+++ trunk/opendap/debian/control2011-09-12 15:32:24 UTC (rev 14866)
@@ -9,7 +9,7 @@
 Standards-Version: 3.9.2
 Homepage: http://opendap.org
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/opendap
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/opendap/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/opendap/
 
 Package: libopendap-java
 Architecture: all


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r14867 - trunk/opendap/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-12 15:35:04 + (Mon, 12 Sep 2011)
New Revision: 14867

Removed:
   trunk/opendap/debian/patches/
   trunk/opendap/debian/watch
Log:
cleanup

Deleted: trunk/opendap/debian/watch
===
--- trunk/opendap/debian/watch  2011-09-12 15:32:24 UTC (rev 14866)
+++ trunk/opendap/debian/watch  2011-09-12 15:35:04 UTC (rev 14867)
@@ -1,2 +0,0 @@
-# TODO 
-# https://opensource.luminis.net/wiki/display/SITE/OSGi+Bundle+Ant+Task


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r14868 - trunk/opendap/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-12 15:36:40 + (Mon, 12 Sep 2011)
New Revision: 14868

Modified:
   trunk/opendap/debian/changelog
Log:
add ITP#

Modified: trunk/opendap/debian/changelog
===
--- trunk/opendap/debian/changelog  2011-09-12 15:35:04 UTC (rev 14867)
+++ trunk/opendap/debian/changelog  2011-09-12 15:36:40 UTC (rev 14868)
@@ -1,5 +1,5 @@
 opendap (2.2-1) unstable; urgency=low
 
-  * Initial Debian Upload (Closes: #??)
+  * Initial Debian Upload (Closes: #641315)
 
  -- Mathieu Malaterre   Wed, 07 Sep 2011 18:48:30 
+0200


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r14869 - in trunk: . javadap/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-12 15:56:52 + (Mon, 12 Sep 2011)
New Revision: 14869

Added:
   trunk/javadap/
   trunk/javadap/debian/changelog
   trunk/javadap/debian/control
Removed:
   trunk/javadap/debian/changelog
   trunk/javadap/debian/control
   trunk/javadap/debian/patches/
   trunk/javadap/debian/watch
   trunk/opendap/
Log:
rename opendap into javadap to prevent any possible confusion with C 
implementation

Deleted: trunk/javadap/debian/changelog
===
--- trunk/opendap/debian/changelog  2011-09-12 15:30:21 UTC (rev 14865)
+++ trunk/javadap/debian/changelog  2011-09-12 15:56:52 UTC (rev 14869)
@@ -1,5 +0,0 @@
-opendap (2.2-1) unstable; urgency=low
-
-  * Initial Debian Upload (Closes: #??)
-
- -- Mathieu Malaterre   Wed, 07 Sep 2011 18:48:30 
+0200

Copied: trunk/javadap/debian/changelog (from rev 14868, 
trunk/opendap/debian/changelog)
===
--- trunk/javadap/debian/changelog  (rev 0)
+++ trunk/javadap/debian/changelog  2011-09-12 15:56:52 UTC (rev 14869)
@@ -0,0 +1,5 @@
+opendap (2.2-1) unstable; urgency=low
+
+  * Initial Debian Upload (Closes: #641315)
+
+ -- Mathieu Malaterre   Wed, 07 Sep 2011 18:48:30 
+0200

Deleted: trunk/javadap/debian/control
===
--- trunk/opendap/debian/control2011-09-12 15:30:21 UTC (rev 14865)
+++ trunk/javadap/debian/control2011-09-12 15:56:52 UTC (rev 14869)
@@ -1,43 +0,0 @@
-Source: opendap
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers 

-DM-Upload-Allowed: yes
-Uploaders: Mathieu Malaterre 
-Build-Depends: debhelper (>= 8), javahelper (>= 0.25)
-Build-Depends-Indep: default-jdk, ant, libjdom1-java, 
libcommons-httpclient-java
-Standards-Version: 3.9.2
-Homepage: http://opendap.org
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/opendap
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/opendap/
-
-Package: libopendap-java
-Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}
-Recommends: ${java:Recommends}
-Description: Project for a Network Data Access Protocol
- OPeNDAP is a framework that simplifies all aspects of scientific data
- networking.
- .
- OPeNDAP provides software which makes local data accessible to remote
- locations regardless of local storage format.
- .
- OPeNDAP also provides tools for transforming existing applications into
- OPeNDAP clients (i.e., enabling them to remotely access OPeNDAP served data).
-
-Package: libopendap-java-doc
-Section: doc
-Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}
-Recommends: ${java:Recommends}
-Description: Project for a Network Data Access Protocol (documentation)
- OPeNDAP is a framework that simplifies all aspects of scientific data
- networking.
- .
- OPeNDAP provides software which makes local data accessible to remote
- locations regardless of local storage format.
- .
- OPeNDAP also provides tools for transforming existing applications into
- OPeNDAP clients (i.e., enabling them to remotely access OPeNDAP served data).
- .
- This package provides the documentation for the library

Copied: trunk/javadap/debian/control (from rev 14866, 
trunk/opendap/debian/control)
===
--- trunk/javadap/debian/control(rev 0)
+++ trunk/javadap/debian/control2011-09-12 15:56:52 UTC (rev 14869)
@@ -0,0 +1,43 @@
+Source: opendap
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers 

+DM-Upload-Allowed: yes
+Uploaders: Mathieu Malaterre 
+Build-Depends: debhelper (>= 8), javahelper (>= 0.25)
+Build-Depends-Indep: default-jdk, ant, libjdom1-java, 
libcommons-httpclient-java, junit
+Standards-Version: 3.9.2
+Homepage: http://opendap.org
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/opendap
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/opendap/
+
+Package: libopendap-java
+Architecture: all
+Depends: ${java:Depends}, ${misc:Depends}
+Recommends: ${java:Recommends}
+Description: Project for a Network Data Access Protocol
+ OPeNDAP is a framework that simplifies all aspects of scientific data
+ networking.
+ .
+ OPeNDAP provides software which makes local data accessible to remote
+ locations regardless of local storage format.
+ .
+ OPeNDAP also provides tools for transforming existing applications into
+ OPeNDAP clients (i.e., enabling them to remotely access OPeNDAP served data).
+
+Package: libopendap-java-doc
+Section: doc
+Architecture: all
+Depends: ${java:Depends}, ${misc:Depends}
+Recommends: ${java:Recommends}
+Description: Project for a Network Data Access Protocol (documentation)
+ OPeNDAP is a framework that simplifies all aspects of scientific data
+ networking.
+ .
+ OPeNDAP provides software which makes local data accessible to remote
+ locations regardl

[pkg-java] r14870 - trunk/javadap/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-12 16:00:46 + (Mon, 12 Sep 2011)
New Revision: 14870

Added:
   trunk/javadap/debian/libjdap-java-doc.javadoc
   trunk/javadap/debian/libjdap-java.jlibs
Removed:
   trunk/javadap/debian/libopendap-java-doc.javadoc
   trunk/javadap/debian/libopendap-java.jlibs
Modified:
   trunk/javadap/debian/changelog
   trunk/javadap/debian/control
   trunk/javadap/debian/get-orig-source
Log:
rename opendap into jdap

Modified: trunk/javadap/debian/changelog
===
--- trunk/javadap/debian/changelog  2011-09-12 15:56:52 UTC (rev 14869)
+++ trunk/javadap/debian/changelog  2011-09-12 16:00:46 UTC (rev 14870)
@@ -1,4 +1,4 @@
-opendap (2.2-1) unstable; urgency=low
+javadap (2.2-1) unstable; urgency=low
 
   * Initial Debian Upload (Closes: #641315)
 

Modified: trunk/javadap/debian/control
===
--- trunk/javadap/debian/control2011-09-12 15:56:52 UTC (rev 14869)
+++ trunk/javadap/debian/control2011-09-12 16:00:46 UTC (rev 14870)
@@ -1,4 +1,4 @@
-Source: opendap
+Source: javadap
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers 

@@ -8,10 +8,10 @@
 Build-Depends-Indep: default-jdk, ant, libjdom1-java, 
libcommons-httpclient-java, junit
 Standards-Version: 3.9.2
 Homepage: http://opendap.org
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/opendap
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/opendap/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/javadap
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/javadap/
 
-Package: libopendap-java
+Package: libjdap-java
 Architecture: all
 Depends: ${java:Depends}, ${misc:Depends}
 Recommends: ${java:Recommends}
@@ -25,7 +25,7 @@
  OPeNDAP also provides tools for transforming existing applications into
  OPeNDAP clients (i.e., enabling them to remotely access OPeNDAP served data).
 
-Package: libopendap-java-doc
+Package: libjdap-java-doc
 Section: doc
 Architecture: all
 Depends: ${java:Depends}, ${misc:Depends}

Modified: trunk/javadap/debian/get-orig-source
===
--- trunk/javadap/debian/get-orig-source2011-09-12 15:56:52 UTC (rev 
14869)
+++ trunk/javadap/debian/get-orig-source2011-09-12 16:00:46 UTC (rev 
14870)
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -ex
 
-PACKAGE=opendap
+PACKAGE=javadap
 
 
 VERSION=${VERSION:-$2}

Copied: trunk/javadap/debian/libjdap-java-doc.javadoc (from rev 14869, 
trunk/javadap/debian/libopendap-java-doc.javadoc)
===
--- trunk/javadap/debian/libjdap-java-doc.javadoc   
(rev 0)
+++ trunk/javadap/debian/libjdap-java-doc.javadoc   2011-09-12 16:00:46 UTC 
(rev 14870)
@@ -0,0 +1 @@
+build/doc usr/share/doc/libjdap-java/api

Copied: trunk/javadap/debian/libjdap-java.jlibs (from rev 14869, 
trunk/javadap/debian/libopendap-java.jlibs)
===
--- trunk/javadap/debian/libjdap-java.jlibs (rev 0)
+++ trunk/javadap/debian/libjdap-java.jlibs 2011-09-12 16:00:46 UTC (rev 
14870)
@@ -0,0 +1 @@
+build/lib/opendap-2.2.jar

Deleted: trunk/javadap/debian/libopendap-java-doc.javadoc
===
--- trunk/javadap/debian/libopendap-java-doc.javadoc2011-09-12 15:56:52 UTC 
(rev 14869)
+++ trunk/javadap/debian/libopendap-java-doc.javadoc2011-09-12 16:00:46 UTC 
(rev 14870)
@@ -1 +0,0 @@
-build/doc usr/share/doc/libopendap-java/api

Deleted: trunk/javadap/debian/libopendap-java.jlibs
===
--- trunk/javadap/debian/libopendap-java.jlibs  2011-09-12 15:56:52 UTC (rev 
14869)
+++ trunk/javadap/debian/libopendap-java.jlibs  2011-09-12 16:00:46 UTC (rev 
14870)
@@ -1 +0,0 @@
-build/lib/opendap-2.2.jar


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r14871 - trunk/javadap/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-12 16:04:34 + (Mon, 12 Sep 2011)
New Revision: 14871

Added:
   trunk/javadap/debian/libopendap-java-doc.javadoc
   trunk/javadap/debian/libopendap-java.jlibs
Removed:
   trunk/javadap/debian/libjdap-java-doc.javadoc
   trunk/javadap/debian/libjdap-java.jlibs
Modified:
   trunk/javadap/debian/control
Log:
revert previous change. Keep opendap for binary package, should not conflict 
with C implementation as java is in the name

Modified: trunk/javadap/debian/control
===
--- trunk/javadap/debian/control2011-09-12 16:00:46 UTC (rev 14870)
+++ trunk/javadap/debian/control2011-09-12 16:04:34 UTC (rev 14871)
@@ -11,7 +11,7 @@
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/javadap
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/javadap/
 
-Package: libjdap-java
+Package: libopendap-java
 Architecture: all
 Depends: ${java:Depends}, ${misc:Depends}
 Recommends: ${java:Recommends}
@@ -25,7 +25,7 @@
  OPeNDAP also provides tools for transforming existing applications into
  OPeNDAP clients (i.e., enabling them to remotely access OPeNDAP served data).
 
-Package: libjdap-java-doc
+Package: libopendap-java-doc
 Section: doc
 Architecture: all
 Depends: ${java:Depends}, ${misc:Depends}

Deleted: trunk/javadap/debian/libjdap-java-doc.javadoc
===
--- trunk/javadap/debian/libjdap-java-doc.javadoc   2011-09-12 16:00:46 UTC 
(rev 14870)
+++ trunk/javadap/debian/libjdap-java-doc.javadoc   2011-09-12 16:04:34 UTC 
(rev 14871)
@@ -1 +0,0 @@
-build/doc usr/share/doc/libjdap-java/api

Deleted: trunk/javadap/debian/libjdap-java.jlibs
===
--- trunk/javadap/debian/libjdap-java.jlibs 2011-09-12 16:00:46 UTC (rev 
14870)
+++ trunk/javadap/debian/libjdap-java.jlibs 2011-09-12 16:04:34 UTC (rev 
14871)
@@ -1 +0,0 @@
-build/lib/opendap-2.2.jar

Copied: trunk/javadap/debian/libopendap-java-doc.javadoc (from rev 14870, 
trunk/javadap/debian/libjdap-java-doc.javadoc)
===
--- trunk/javadap/debian/libopendap-java-doc.javadoc
(rev 0)
+++ trunk/javadap/debian/libopendap-java-doc.javadoc2011-09-12 16:04:34 UTC 
(rev 14871)
@@ -0,0 +1 @@
+build/doc usr/share/doc/libopendap-java/api

Copied: trunk/javadap/debian/libopendap-java.jlibs (from rev 14870, 
trunk/javadap/debian/libjdap-java.jlibs)
===
--- trunk/javadap/debian/libopendap-java.jlibs  (rev 0)
+++ trunk/javadap/debian/libopendap-java.jlibs  2011-09-12 16:04:34 UTC (rev 
14871)
@@ -0,0 +1 @@
+build/lib/opendap-2.2.jar


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r14888 - trunk/javadap/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-13 08:28:56 + (Tue, 13 Sep 2011)
New Revision: 14888

Modified:
   trunk/javadap/debian/control
   trunk/javadap/debian/copyright
   trunk/javadap/debian/rules
Log:
Fix lintian reports.

Modified: trunk/javadap/debian/control
===
--- trunk/javadap/debian/control2011-09-13 04:17:35 UTC (rev 14887)
+++ trunk/javadap/debian/control2011-09-13 08:28:56 UTC (rev 14888)
@@ -5,7 +5,7 @@
 DM-Upload-Allowed: yes
 Uploaders: Mathieu Malaterre 
 Build-Depends: debhelper (>= 8), javahelper (>= 0.25)
-Build-Depends-Indep: default-jdk, ant, libjdom1-java, 
libcommons-httpclient-java, junit
+Build-Depends-Indep: default-jdk, ant, libjdom1-java, 
libcommons-httpclient-java, junit, libservlet2.4-java
 Standards-Version: 3.9.2
 Homepage: http://opendap.org
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/javadap

Modified: trunk/javadap/debian/copyright
===
--- trunk/javadap/debian/copyright  2011-09-13 04:17:35 UTC (rev 14887)
+++ trunk/javadap/debian/copyright  2011-09-13 08:28:56 UTC (rev 14888)
@@ -51,7 +51,10 @@
 
  You should have received a copy of the GNU Lesser General Public License
  along with this library; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+Comment:
+ On Debian systems, you can read the full text of the GNU Lesser General Public
+ License in ‘/usr/share/common-licenses/LGPL-2.1’.
 
 
 Files: debian/*

Modified: trunk/javadap/debian/rules
===
--- trunk/javadap/debian/rules  2011-09-13 04:17:35 UTC (rev 14887)
+++ trunk/javadap/debian/rules  2011-09-13 08:28:56 UTC (rev 14888)
@@ -2,7 +2,7 @@
 #export DH_VERBOSE=1
 
 JAVA_HOME=/usr/lib/jvm/default-java
-export 
CLASSPATH=/usr/share/java/commons-httpclient.jar:/usr/share/java/jdom1.jar
+export 
CLASSPATH=/usr/share/java/commons-httpclient.jar:/usr/share/java/jdom1.jar:/usr/share/java/servlet-api.jar
 #DEB_ANT_BUILD_TARGET := distribution
 
 %:


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r14892 - trunk/net-luminis-build-plugin/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-13 14:37:53 + (Tue, 13 Sep 2011)
New Revision: 14892

Modified:
   trunk/net-luminis-build-plugin/debian/control
Log:
final touch

Modified: trunk/net-luminis-build-plugin/debian/control
===
--- trunk/net-luminis-build-plugin/debian/control   2011-09-13 14:20:17 UTC 
(rev 14891)
+++ trunk/net-luminis-build-plugin/debian/control   2011-09-13 14:37:53 UTC 
(rev 14892)
@@ -13,7 +13,8 @@
 
 Package: libnet-luminis-build-plugin-java
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${java:Depends}, ${misc:Depends}
+Recommends: ${java:Recommends}
 Description: Wrapper around Bnd to allow easy bundle creation from ant builds.
  The OSGi bundle ant task is a wrapper around Bnd to allow easy bundle creation
  from ant builds.


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-15 20:11:31 + (Thu, 15 Sep 2011)
New Revision: 14919

Modified:
   trunk/fop/debian/changelog
   trunk/fop/debian/rules
Log:
minor tweak

Modified: trunk/fop/debian/changelog
===
--- trunk/fop/debian/changelog  2011-09-15 19:34:54 UTC (rev 14918)
+++ trunk/fop/debian/changelog  2011-09-15 20:11:31 UTC (rev 14919)
@@ -1,6 +1,7 @@
 fop (1:1.0.dfsg2-3) UNRELEASED; urgency=low
 
   * Fix misrender issue. Closes: #610344
+  * Remove qdox.jar copy from source tree
 
  -- Mathieu Malaterre   Sun, 11 Sep 2011 15:01:03 
+0200
 

Modified: trunk/fop/debian/rules
===
--- trunk/fop/debian/rules  2011-09-15 19:34:54 UTC (rev 14918)
+++ trunk/fop/debian/rules  2011-09-15 20:11:31 UTC (rev 14919)
@@ -44,6 +44,7 @@
 clean::
-rm -Rf build
mkdir -p lib/build
+   rm -f lib/build/qdox.jar
mh_clean
 
 get-orig-source:


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r14922 - in trunk/fop/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-16 07:06:41 + (Fri, 16 Sep 2011)
New Revision: 14922

Removed:
   trunk/fop/debian/patches/dump_exception.patch
Modified:
   trunk/fop/debian/fop.sh
   trunk/fop/debian/patches/series
Log:
As discussed on #575411 by Gabriel C.

Modified: trunk/fop/debian/fop.sh
===
--- trunk/fop/debian/fop.sh 2011-09-15 20:33:44 UTC (rev 14921)
+++ trunk/fop/debian/fop.sh 2011-09-16 07:06:41 UTC (rev 14922)
@@ -40,6 +40,6 @@
 fi
 find_jars fop
 
+LOG_OPTION=-Dorg.apache.commons.logging.Log=org.apache.fop.util.CommandLineLogger
 
-
-run_java $HEADLESS org.apache.fop.cli.Main "$@"
+run_java $HEADLESS org.apache.fop.cli.Main $LOG_OPTION "$@"

Deleted: trunk/fop/debian/patches/dump_exception.patch
===
--- trunk/fop/debian/patches/dump_exception.patch   2011-09-15 20:33:44 UTC 
(rev 14921)
+++ trunk/fop/debian/patches/dump_exception.patch   2011-09-16 07:06:41 UTC 
(rev 14922)
@@ -1,14 +0,0 @@
-Dump exception, as suggest on bug #639162
-Index: fop-1.0/src/java/org/apache/fop/cli/Main.java
-===
 fop-1.0.orig/src/java/org/apache/fop/cli/Main.java 2011-09-11 
14:50:52.0 +0200
-+++ fop-1.0/src/java/org/apache/fop/cli/Main.java  2011-09-11 
14:51:11.0 +0200
-@@ -186,6 +186,8 @@
- System.exit(0);
- }
- } catch (Exception e) {
-+  System.out.println("Exception: "+ e.toString());
-+  e.printStackTrace();
- if (options != null) {
- options.getLogger().error("Exception", e);
- if (options.getOutputFile() != null) {

Modified: trunk/fop/debian/patches/series
===
--- trunk/fop/debian/patches/series 2011-09-15 20:33:44 UTC (rev 14921)
+++ trunk/fop/debian/patches/series 2011-09-16 07:06:41 UTC (rev 14922)
@@ -1,4 +1,3 @@
 04_fixqdoxbuildfailure.patch
-dump_exception.patch
 enco.patch
 enco2.patch


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-16 07:16:13 + (Fri, 16 Sep 2011)
New Revision: 14923

Modified:
   trunk/fop/debian/changelog
Log:
update dch

Modified: trunk/fop/debian/changelog
===
--- trunk/fop/debian/changelog  2011-09-16 07:06:41 UTC (rev 14922)
+++ trunk/fop/debian/changelog  2011-09-16 07:16:13 UTC (rev 14923)
@@ -2,6 +2,7 @@
 
   * Fix misrender issue. Closes: #610344
   * Remove qdox.jar copy from source tree
+  * Properly fix logging option. Closes: #575411
 
  -- Mathieu Malaterre   Sun, 11 Sep 2011 15:01:03 
+0200
 


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-16 12:42:06 + (Fri, 16 Sep 2011)
New Revision: 14924

Modified:
   trunk/fop/debian/rules
Log:
Add testing

Modified: trunk/fop/debian/rules
===
--- trunk/fop/debian/rules  2011-09-16 07:16:13 UTC (rev 14923)
+++ trunk/fop/debian/rules  2011-09-16 12:42:06 UTC (rev 14924)
@@ -5,8 +5,8 @@
 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
-DEB_ANT_BUILD_TARGET := package javadocs #docs
+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
+DEB_ANT_BUILD_TARGET := package javadocs junit #docs
 DEB_ANT_CLEAN_TARGET := distclean
 DEB_ANT_ARGS := -verbose
 DEB_COMPRESS_EXCLUDE := .xconf


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Bug#575411:

[Mathieu Malaterre]

reopen 575411
thanks

Thanks Gabriel for the clear report ! I have re-open the bug. And I'll
close in the next upload of fop (properly this time) !

Thanks very much !
-- 
Mathieu



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-16 12:55:53 + (Fri, 16 Sep 2011)
New Revision: 14925

Modified:
   trunk/fop/debian/rules
Log:
tests are failing. removing them for now. reported upstream

Modified: trunk/fop/debian/rules
===
--- trunk/fop/debian/rules  2011-09-16 12:42:06 UTC (rev 14924)
+++ trunk/fop/debian/rules  2011-09-16 12:55:53 UTC (rev 14925)
@@ -6,7 +6,7 @@
 
 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
-DEB_ANT_BUILD_TARGET := package javadocs junit #docs
+DEB_ANT_BUILD_TARGET := package javadocs #junit #docs
 DEB_ANT_CLEAN_TARGET := distclean
 DEB_ANT_ARGS := -verbose
 DEB_COMPRESS_EXCLUDE := .xconf


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Bug#639683:

[Mathieu Malaterre]

Can't run tests for now, they fails:

[junit] Test org.apache.fop.config.UserConfigTestSuite FAILED
[junit] Test org.apache.fop.StandardTestSuite FAILED
[junit] Test org.apache.fop.BasicTranscoderTestSuite FAILED
[junit] Test org.apache.fop.BasicTranscoderTestSuite FAILED
[junit] Test org.apache.fop.fotreetest.FOTreeTestSuite FAILED
[junit] Test org.apache.fop.layoutengine.LayoutEngineTestSuite FAILED


-- 
Mathieu



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-16 13:08:06 + (Fri, 16 Sep 2011)
New Revision: 14926

Modified:
   trunk/fop/debian/control
   trunk/fop/debian/rules
Log:
add xmlunit for later

Modified: trunk/fop/debian/control
===
--- trunk/fop/debian/control2011-09-16 12:55:53 UTC (rev 14925)
+++ trunk/fop/debian/control2011-09-16 13:08:06 UTC (rev 14926)
@@ -11,7 +11,7 @@
 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,
+ 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
 Standards-Version: 3.9.2

Modified: trunk/fop/debian/rules
===
--- trunk/fop/debian/rules  2011-09-16 12:55:53 UTC (rev 14925)
+++ trunk/fop/debian/rules  2011-09-16 13:08:06 UTC (rev 14926)
@@ -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
+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_ANT_BUILD_TARGET := package javadocs #junit #docs
 DEB_ANT_CLEAN_TARGET := distclean
 DEB_ANT_ARGS := -verbose


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r14927 - trunk/fop/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-16 13:11:47 + (Fri, 16 Sep 2011)
New Revision: 14927

Added:
   trunk/fop/debian/patches/fixbuildxml.patch
Modified:
   trunk/fop/debian/patches/series
Log:
need to update build.xml

Added: trunk/fop/debian/patches/fixbuildxml.patch
===
--- trunk/fop/debian/patches/fixbuildxml.patch  (rev 0)
+++ trunk/fop/debian/patches/fixbuildxml.patch  2011-09-16 13:11:47 UTC (rev 
14927)
@@ -0,0 +1,16 @@
+Index: fop-1.0.dfsg2/build.xml
+===
+--- fop-1.0.dfsg2.orig/build.xml   2011-09-16 15:10:36.0 +0200
 fop-1.0.dfsg2/build.xml2011-09-16 15:10:57.0 +0200
+@@ -149,8 +149,9 @@
+   
+   
+   
+-  
+-  
++  
++  
++  
+   
+   
+   

Modified: trunk/fop/debian/patches/series
===
--- trunk/fop/debian/patches/series 2011-09-16 13:08:06 UTC (rev 14926)
+++ trunk/fop/debian/patches/series 2011-09-16 13:11:47 UTC (rev 14927)
@@ -1,3 +1,4 @@
 04_fixqdoxbuildfailure.patch
 enco.patch
 enco2.patch
+fixbuildxml.patch


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-16 13:40:23 + (Fri, 16 Sep 2011)
New Revision: 14928

Modified:
   trunk/fop/debian/fop.sh
Log:
Wrong order in option

Modified: trunk/fop/debian/fop.sh
===
--- trunk/fop/debian/fop.sh 2011-09-16 13:11:47 UTC (rev 14927)
+++ trunk/fop/debian/fop.sh 2011-09-16 13:40:23 UTC (rev 14928)
@@ -41,5 +41,6 @@
 find_jars fop
 
 
LOG_OPTION=-Dorg.apache.commons.logging.Log=org.apache.fop.util.CommandLineLogger
+# LOG_DEBUG_OPTION=-Dlog4j.debug
 
-run_java $HEADLESS org.apache.fop.cli.Main $LOG_OPTION "$@"
+run_java $HEADLESS $LOG_OPTION org.apache.fop.cli.Main "$@"


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-16 13:48:07 + (Fri, 16 Sep 2011)
New Revision: 14929

Modified:
   trunk/fop/debian/changelog
Log:
rock n' roll

Modified: trunk/fop/debian/changelog
===
--- trunk/fop/debian/changelog  2011-09-16 13:40:23 UTC (rev 14928)
+++ trunk/fop/debian/changelog  2011-09-16 13:48:07 UTC (rev 14929)
@@ -1,4 +1,4 @@
-fop (1:1.0.dfsg2-3) UNRELEASED; urgency=low
+fop (1:1.0.dfsg2-3) unstable; urgency=low
 
   * Fix misrender issue. Closes: #610344
   * Remove qdox.jar copy from source tree


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Bug#544546:

[Mathieu Malaterre]

reopen 544546
thanks

No I mean we need to pay attention to the Conflict: field. The bug I
referred to has some material but I believe a 'fop' should have been
introduced without removing libfop-java, which was the acual error.

Thanks
-- 
Mathieu



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

[pkg-java] r14966 - in trunk/jmdns/debian: . poms

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-20 20:43:02 + (Tue, 20 Sep 2011)
New Revision: 14966

Modified:
   trunk/jmdns/debian/changelog
   trunk/jmdns/debian/control
   trunk/jmdns/debian/poms/jmdns.pom
Log:
prepare for new release

Modified: trunk/jmdns/debian/changelog
===
--- trunk/jmdns/debian/changelog2011-09-20 17:12:03 UTC (rev 14965)
+++ trunk/jmdns/debian/changelog2011-09-20 20:43:02 UTC (rev 14966)
@@ -1,3 +1,9 @@
+jmdns (3.4.1-1) UNRELEASED; urgency=low
+
+  * New upstream : 3.4.1
+
+ -- Mathieu Malaterre   Tue, 20 Sep 2011 21:47:53 
+0200
+
 jmdns (3.4.0-2) unstable; urgency=low
 
   * Fix issue with un-resolvable parent POM:

Modified: trunk/jmdns/debian/control
===
--- trunk/jmdns/debian/control  2011-09-20 17:12:03 UTC (rev 14965)
+++ trunk/jmdns/debian/control  2011-09-20 20:43:02 UTC (rev 14966)
@@ -2,7 +2,8 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers 

-Uploaders: Mathieu Malaterre (malat) , 
+DM-Upload-Allowed: yes
+Uploaders: Mathieu Malaterre , 
  James Page 
 Build-Depends: debhelper (>> 7), javahelper, gcj-jdk, default-jdk, 
maven-repo-helper
 Build-Depends-Indep: junit4, libeasymock-java

Modified: trunk/jmdns/debian/poms/jmdns.pom
===
--- trunk/jmdns/debian/poms/jmdns.pom   2011-09-20 17:12:03 UTC (rev 14965)
+++ trunk/jmdns/debian/poms/jmdns.pom   2011-09-20 20:43:02 UTC (rev 14966)
@@ -2,13 +2,21 @@
4.0.0
javax.jmdns
jmdns
-   3.4.0
+   3.4.1
JmDNS
jar

org.sonatype.oss
oss-parent
-   4
+   7
+   .../parent/pom.xml
+   
+   
+   
+   
+   
+   
+   

JmDNS is a Java implementation of multi-cast DNS and can 
be used for service registration and discovery in local area networks. JmDNS is 
fully compatible with Apple's Bonjour.
 The project was originally started in December 2002 by Arthur van Hoff at 
Strangeberry. In November 2003 the project was moved to SourceForge, and the 
name was changed from JRendezvous to JmDNS for legal reasons.
@@ -20,14 +28,14 @@
http://jmdns.sourceforge.net/


-   
scm:svn:https://jmdns.svn.sourceforge.net/svnroot/jmdns/tags/jmdns-3.4.0
-   
scm:svn:https://jmdns.svn.sourceforge.net/svnroot/jmdns/tags/jmdns-3.4.0
-   
scm:svn:https://jmdns.svn.sourceforge.net/svnroot/jmdns/tags/jmdns-3.4.0
+   
scm:svn:https://jmdns.svn.sourceforge.net/svnroot/jmdns/tags/jmdns-3.4.1
+   
scm:svn:https://jmdns.svn.sourceforge.net/svnroot/jmdns/tags/jmdns-3.4.1
+   
scm:svn:https://jmdns.svn.sourceforge.net/svnroot/jmdns/tags/jmdns-3.4.1



jmdns.sf.net
-   
scp://shell.sourceforge.net/home/groups/j/jm/jmdns/htdocs
+   
scp://shell.sourceforge.net/home/project-web/jmdns/htdocs



@@ -161,7 +169,7 @@

org.apache.maven.plugins
maven-compiler-plugin
-   2.3.1
+   2.3.2

${jvm.version}
${jvm.version}
@@ -170,7 +178,7 @@

org.codehaus.mojo

buildnumber-maven-plugin
-   1.0-beta-4
+   1.0


validate
@@ -240,9 +248,10 @@

org.apache.felix
maven-bundle-plugin
-   2.1.0
+   2.3.5
true

+   
${project.build.outputDirectory}/META-INF


javax.jmdns

javax.jmdns.impl,javax.jmdns.impl.*,com.strangeberry.*,samples
@@ -254,7 +263,7 @@


bundle-manifest
-   process-classes
+   process-classes

 

Bug#642740:

[Mathieu Malaterre]

tag 642740 moreinfo
thanks

I cannot reproduce it here. I cannot see *anything* from the log, so I
am attempting a wild guess using my cristal ball is this bug #641530 ?

Thanks
-- 
Mathieu



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#646141: java.lang.IllegalArgumentException: factor < 0; was: -1

[Mathieu Malaterre]

Package: fop
Version: 1:1.0.dfsg2-3
Severity: normal



fop fails with:

$ fop test.fo test.pdf   
Exception
java.lang.IllegalArgumentException: factor < 0; was: -1


-- System Information:
Debian Release: 6.0.1
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'stable'), (200, 'testing'), (100, 
'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages fop depends on:
ii  default-jre-headle 1:1.6-40  Standard Java or Java compatible R
ii  gcj-4.4-jre-headle 4.4.5-2   Java runtime environment using GIJ
ii  gcj-jre-headless [ 4:4.4.5-1 Java runtime environment using GIJ
ii  java-wrappers  0.1.16wrappers for java executables
ii  libavalon-framewor 4.2.0-7   Common framework for Java server a
ii  libbatik-java  1.7-6 xml.apache.org SVG Library
ii  libbsf-java1:2.4.0-4 Bean Scripting Framework to suppor
ii  libcommons-io-java 1.4-3 Common useful IO related classes
ii  libcommons-logging 1.1.1-8   commmon wrapper interface for seve
ii  libxalan2-java 2.7.1-5   XSL Transformations (XSLT) process
ii  libxerces2-java2.9.1-4.1 Validating XML parser for Java wit
ii  libxml-commons-ext 1.3.05-2  XML Commons external code - DOM, S
ii  libxmlgraphics-com 1.4.dfsg-3reusable components used by Batik 
ii  libxt6 1:1.0.7-1 X11 toolkit intrinsics library
ii  libxtst6   2:1.1.0-3 X11 Testing -- Record extension li
ii  openjdk-6-jre-head 6b18-1.8.7-2~squeeze1 OpenJDK Java runtime, using Hotspo
ii  sun-java6-jre [jav 6.26-0squeeze1Sun Java(TM) Runtime Environment (

Versions of packages fop recommends:
ii  libsaxon-java 1:6.5.5-6  The Saxon XSLT Processor

Versions of packages fop suggests:
pn  fop-doc(no description available)
ii  libservlet2.4-java5.0.30-12  Servlet 2.4 and JSP 2.0 Java libra

-- no debconf information



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#575411: workaround

[Mathieu Malaterre]

Hi Holger,

On Tue, Oct 18, 2011 at 11:55 AM, Holger Levsen  wrote:
> as a workaround one can rebuild xmlgraphics-commons and fop from wheezy. (A
> newer version of xml-graphics-common is needed for the newer fop.)
>
> xmlgraphics-commons_1.4.dfsg-3.dsc and fop_1.0.dfsg2-3.dsc built fine for me
> in a pure squeeze environment.

As one of the many fop maintainers, I would vote *against* backporting
fop 1.0 to squeeze (quite strongly actually). See bug #610344 and more
recently #646141.
I really feel anxious in backporting fop in that state, fop is really
a ".0" release, so I would prefer waiting a little more.

The question now becomes should we backport 0.95 with a patch to
remove the annoying warning on the console ? I have no real opinion
about it. If someone thinks this is important, I can try doing the
stable-bpo. However this is documented earlier in this thread how to
circumvent printing of this warning.

2cts
-- 
Mathieu



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#646141:

[Mathieu Malaterre]

forgot attachement. test.fo works out nicely with fop 0.95

-- 
Mathieu

http://www.w3.org/1999/XSL/Format";>







Below is the block that contains the character (00AD) (soft-hyphen) causes the crash
­ 



__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-10-21 23:08:39 + (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/control2011-10-19 19:54:39 UTC (rev 15221)
+++ trunk/fop/debian/control2011-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 
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: fop
+Upstream-Contact: James Tauber 
 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


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r15270 - in trunk: . clooj clooj/debian clooj/debian/source

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-10-27 12:43:26 + (Thu, 27 Oct 2011)
New Revision: 15270

Added:
   trunk/clooj/
   trunk/clooj/debian/
   trunk/clooj/debian/changelog
   trunk/clooj/debian/clooj.jlibs
   trunk/clooj/debian/compat
   trunk/clooj/debian/control
   trunk/clooj/debian/copyright
   trunk/clooj/debian/get-orig-source
   trunk/clooj/debian/rules
   trunk/clooj/debian/source/
   trunk/clooj/debian/source/format
   trunk/clooj/debian/watch
Log:
first pass at clooj

Added: trunk/clooj/debian/changelog
===
--- trunk/clooj/debian/changelog(rev 0)
+++ trunk/clooj/debian/changelog2011-10-27 12:43:26 UTC (rev 15270)
@@ -0,0 +1,5 @@
+clooj (0.2.4~git4dfb603527-1) unstable; urgency=low
+
+  * Initial Debian Upload (Closes: #)
+
+ -- Mathieu Malaterre   Wed, 07 Sep 2011 18:48:30 
+0200

Added: trunk/clooj/debian/clooj.jlibs
===
--- trunk/clooj/debian/clooj.jlibs  (rev 0)
+++ trunk/clooj/debian/clooj.jlibs  2011-10-27 12:43:26 UTC (rev 15270)
@@ -0,0 +1 @@
+clooj-0.2.4.jar

Added: trunk/clooj/debian/compat
===
--- trunk/clooj/debian/compat   (rev 0)
+++ trunk/clooj/debian/compat   2011-10-27 12:43:26 UTC (rev 15270)
@@ -0,0 +1 @@
+8

Added: trunk/clooj/debian/control
===
--- trunk/clooj/debian/control  (rev 0)
+++ trunk/clooj/debian/control  2011-10-27 12:43:26 UTC (rev 15270)
@@ -0,0 +1,23 @@
+Source: clooj
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers 

+DM-Upload-Allowed: yes
+Uploaders: Mathieu Malaterre 
+Build-Depends: debhelper (>= 8), javahelper (>= 0.25)
+Build-Depends-Indep: default-jdk, leiningen
+Standards-Version: 3.9.2
+Homepage: https://github.com/arthuredelstein/clooj/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/clooj
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/clooj/
+
+Package: clooj
+Architecture: all
+Depends: ${java:Depends}, ${misc:Depends}
+Recommends: ${java:Recommends}
+Description: clooj, a lightweight IDE for clojure
+ clooj is a small, simple IDE (integrated development environment) for the
+ clojure programming language, available for free download. clooj is written
+ entirely in clojure and uses a swing-based GUI. It is cross-platform, and runs
+ as a standalone application or as a clojure editor embedded in another java or
+ clojure application.

Added: trunk/clooj/debian/copyright
===
--- trunk/clooj/debian/copyright(rev 0)
+++ trunk/clooj/debian/copyright2011-10-27 12:43:26 UTC (rev 15270)
@@ -0,0 +1,62 @@
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: OPeNDAP
+Upstream-Contact: James Gallagher 
+Source: http://opendap.org/
+
+Files: *
+Copyright: © 2002,2003 OPeNDAP, Inc. ,
+ © 20010 OPeNDAP, Inc.
+Licence: BSD
+ Redistribution and use in source and binary forms,
+ with or without modification, are permitted provided
+ that the following conditions are met:
+ 
+ - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+ 
+ - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+ 
+ - Neither the name of the OPeNDAP nor the names of its contributors may
+   be used to endorse or promote products derived from this software
+   without specific prior written permission.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: src/opendap/servlet/AsciiWriter.java
+Copyright: © 1997-2006 Unidata Program Center/University Corporation for
+ Atmospheric Research, P.O. Box 3000, Boulder, CO 80307,
+ supp...@unidata.ucar.edu.
+Licence: LGPL v2.1
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as publish

[pkg-java] r15271 - trunk/clooj/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-10-27 12:51:43 + (Thu, 27 Oct 2011)
New Revision: 15271

Modified:
   trunk/clooj/debian/changelog
   trunk/clooj/debian/get-orig-source
Log:
simplify packaging

Modified: trunk/clooj/debian/changelog
===
--- trunk/clooj/debian/changelog2011-10-27 12:43:26 UTC (rev 15270)
+++ trunk/clooj/debian/changelog2011-10-27 12:51:43 UTC (rev 15271)
@@ -1,4 +1,4 @@
-clooj (0.2.4~git4dfb603527-1) unstable; urgency=low
+clooj (0.2.4-1) unstable; urgency=low
 
   * Initial Debian Upload (Closes: #)
 

Modified: trunk/clooj/debian/get-orig-source
===
--- trunk/clooj/debian/get-orig-source  2011-10-27 12:43:26 UTC (rev 15270)
+++ trunk/clooj/debian/get-orig-source  2011-10-27 12:51:43 UTC (rev 15271)
@@ -12,6 +12,7 @@
 fi
 
 REVISION=`echo $VERSION | sed -e 's/^.*git//g'`
+REVISION=4dfb603527
 
 if [ -z ${TARFILE}]; then
 TARFILE=${PACKAGE}_${VERSION}.orig.tar.gz


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[pkg-java] r15272 - trunk/clooj/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-10-27 13:06:48 + (Thu, 27 Oct 2011)
New Revision: 15272

Modified:
   trunk/clooj/debian/copyright
   trunk/clooj/debian/rules
Log:
fix copyright

Modified: trunk/clooj/debian/copyright
===
--- trunk/clooj/debian/copyright2011-10-27 12:51:43 UTC (rev 15271)
+++ trunk/clooj/debian/copyright2011-10-27 13:06:48 UTC (rev 15272)
@@ -1,62 +1,611 @@
 Format: http://dep.debian.net/deps/dep5/
-Upstream-Name: OPeNDAP
-Upstream-Contact: James Gallagher 
-Source: http://opendap.org/
+Upstream-Name: clooj
+Upstream-Contact: Arthur Edelstein
+Source: http://github.com/arthuredelstein/clooj
 
 Files: *
-Copyright: © 2002,2003 OPeNDAP, Inc. ,
- © 20010 OPeNDAP, Inc.
-Licence: BSD
- Redistribution and use in source and binary forms,
- with or without modification, are permitted provided
- that the following conditions are met:
- 
- - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
- 
- - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
- 
- - Neither the name of the OPeNDAP nor the names of its contributors may
-   be used to endorse or promote products derived from this software
-   without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Copyright: © 2011, Arthur Edelstein
+Licence: EPL-1.0
 
-Files: src/opendap/servlet/AsciiWriter.java
-Copyright: © 1997-2006 Unidata Program Center/University Corporation for
- Atmospheric Research, P.O. Box 3000, Boulder, CO 80307,
- supp...@unidata.ucar.edu.
-Licence: LGPL v2.1
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or (at
- your option) any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
- General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-Comment:
- On Debian systems, you can read the full text of the GNU Lesser General Public
- License in ‘/usr/share/common-licenses/LGPL-2.1’.
-
-
 Files: debian/*
 Copyright: © 2011 Mathieu Malaterre 
-License: BSD
+License: EPL-1.0
+
+License: EPL-1.0
+ Source code distributed under the Eclipse Public License - v 1.0:
+ .
+ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+ PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
+ THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ .
+ 1. DEFINITIONS
+ .
+ "Contribution" means:
+ .
+ a) in the case of the initial Contributor, the initial code and
+ documentation distributed under this Agreement, and
+ .
+ b) in the case of each subsequent Contributor:
+ .
+ i) changes to the Program, and
+ .
+ ii) additions to the Program;
+ .
+ where such changes and/or additions to the Program originate from and
+ are distributed by that particular Contributor. A Contribution
+ 'originates' from a Contributor if it was added to the Program by such
+ Contributor itself or anyone acting on such Contributor's
+ behalf. Contributions do not include additions to the Program which:
+ (i) are separate modules of software distributed in conjunction with
+ the Program under their own license agreement, and (ii) are not
+ derivative works of the Program.
+ .
+ "Contributor" means any person or entity that distributes the Program.
+ .
+ "Licensed Patents" mean patent claims licensable by a Contributor
+ which are necessarily infringed by the use or sale of its Contribution
+ alone or when combined with the Program.
+ .
+ "Progr

[pkg-java] r15273 - trunk/clooj/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-10-27 13:38:49 + (Thu, 27 Oct 2011)
New Revision: 15273

Modified:
   trunk/clooj/debian/changelog
   trunk/clooj/debian/control
Log:
add itp number. fix lintian

Modified: trunk/clooj/debian/changelog
===
--- trunk/clooj/debian/changelog2011-10-27 13:06:48 UTC (rev 15272)
+++ trunk/clooj/debian/changelog2011-10-27 13:38:49 UTC (rev 15273)
@@ -1,5 +1,5 @@
 clooj (0.2.4-1) unstable; urgency=low
 
-  * Initial Debian Upload (Closes: #)
+  * Initial Debian Upload (Closes: #646811)
 
  -- Mathieu Malaterre   Wed, 07 Sep 2011 18:48:30 
+0200

Modified: trunk/clooj/debian/control
===
--- trunk/clooj/debian/control  2011-10-27 13:06:48 UTC (rev 15272)
+++ trunk/clooj/debian/control  2011-10-27 13:38:49 UTC (rev 15273)
@@ -15,7 +15,7 @@
 Architecture: all
 Depends: ${java:Depends}, ${misc:Depends}
 Recommends: ${java:Recommends}
-Description: clooj, a lightweight IDE for clojure
+Description: lightweight IDE for clojure
  clooj is a small, simple IDE (integrated development environment) for the
  clojure programming language, available for free download. clooj is written
  entirely in clojure and uses a swing-based GUI. It is cross-platform, and runs


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Bug#610295: libcommons-net-java: New upstream : 2.2 / remove depdendency to oro

[Mathieu Malaterre]

Package: libcommons-net-java
Version: 1.4.1-2
Severity: normal
Tags: upstream ipv6


It would be nice to update libcommons-net-java to latest upstream. It would:
- remove dep to oro lib
- add support for ipv6

Thanks !

http://commons.apache.org/net/changes-report.html

Commons::Net now uses JDK regex functionality, saving on an extra [oro] 
dependency. There are now no external dependencies required.
Optionally enable EPSV with IPv4; Only send EPRT with IPv6. Fix incorrect port 
used with EPRT. Allow activeMaxPort == activeMinPort in getActivePort() method. 
Fixes NET-313.
Add support for IPv6 EPRT/EPSV Fixes NET-288.

-- System Information:
Debian Release: 6.0
  APT prefers testing
  APT policy: (200, 'testing'), (100, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages libcommons-net-java depends on:
ii  default-jre-headless [java2 1:1.6-40 Standard Java or Java compatible R
ii  gcj-4.4-jre-headless [java2 4.4.5-2  Java runtime environment using GIJ
ii  gcj-jre-headless [java2-run 4:4.4.5-1Java runtime environment using GIJ
ii  liboro-java 2.0.8a-7 Regular expression library for Jav
ii  openjdk-6-jre-headless [jav 6b18-1.8.3-2 OpenJDK Java runtime, using Hotspo

libcommons-net-java recommends no packages.

libcommons-net-java suggests no packages.

-- no debconf information



__
This is the maintainer address of Debian's Java team
. Please 
use
debian-j...@lists.debian.org for discussions and questions.

[pkg-java] r13602 - trunk/jmdns/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-04-27 11:43:58 + (Wed, 27 Apr 2011)
New Revision: 13602

Modified:
   trunk/jmdns/debian/changelog
   trunk/jmdns/debian/rules
Log:
Start packaging 3.4.0

Modified: trunk/jmdns/debian/changelog
===
--- trunk/jmdns/debian/changelog2011-04-27 05:21:56 UTC (rev 13601)
+++ trunk/jmdns/debian/changelog2011-04-27 11:43:58 UTC (rev 13602)
@@ -1,5 +1,6 @@
-jmdns (3.1-1.1) unstable; urgency=low
+jmdns (3.4.0-1) unstable; urgency=low
 
+  [ Ioan Eugen STAN ]
   * Non-maintainer upload.
   * Fix "Package does not install Maven artifacts" (Closes: #620048)
   * Enabled maven artifact deployment:
@@ -12,8 +13,11 @@
  - debian/patches/javaDocLink: patch to link JavaDoc to system doc
  - debian/patches/series: the series of patches
 
- -- Ioan Eugen STAN   Mon, 11 Apr 2011 00:42:54 +0300
+  [ Mathieu Malaterre ]
+  * New upsteam 3.4.0
 
+ -- Mathieu Malaterre   Wed, 27 Apr 2011 13:39:54 
+0200
+
 jmdns (3.1-1) unstable; urgency=low
 
   * New upstream.

Modified: trunk/jmdns/debian/rules
===
--- trunk/jmdns/debian/rules2011-04-27 05:21:56 UTC (rev 13601)
+++ trunk/jmdns/debian/rules2011-04-27 11:43:58 UTC (rev 13602)
@@ -75,13 +75,14 @@
wget http://voxel.dl.sourceforge.net/sourceforge/jmdns/$@
 
 get-orig-source: $(UPSTREAM_SRC).zip
-   unzip -q $(UPSTREAM_SRC).zip
+   unzip -q $(UPSTREAM_SRC).zip -d $(DEBIAN_SRC_DIR)
# Also remove pre-generated Javadoc
rm -rf $(UPSTREAM_SRC)/docs/
# Remove pre-generated jar file:
rm -rf $(UPSTREAM_SRC)/lib/jmdns.jar
-   GZIP=-9 tar czf $(DEBIAN_SRC_TAR) $(DEBIAN_SRC_DIR)
+   GZIP="--best --no-name" tar czf $(DEBIAN_SRC_TAR) $(DEBIAN_SRC_DIR)
rm -rf $(UPSTREAM_SRC)
+   rm $(UPSTREAM_SRC).zip
 
 binary: binary-indep binary-arch
 .PHONY: build build-arch build-indep clean binary-indep binary-arch binary 
install-indep


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits

[pkg-java] r13603 - trunk/jmdns/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-04-27 11:50:21 + (Wed, 27 Apr 2011)
New Revision: 13603

Modified:
   trunk/jmdns/debian/changelog
Log:
Add bug ref

Modified: trunk/jmdns/debian/changelog
===
--- trunk/jmdns/debian/changelog2011-04-27 11:43:58 UTC (rev 13602)
+++ trunk/jmdns/debian/changelog2011-04-27 11:50:21 UTC (rev 13603)
@@ -14,7 +14,7 @@
  - debian/patches/series: the series of patches
 
   [ Mathieu Malaterre ]
-  * New upsteam 3.4.0
+  * New upsteam 3.4.0. Closes: #616175
 
  -- Mathieu Malaterre   Wed, 27 Apr 2011 13:39:54 
+0200
 


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits

[pkg-java] r13604 - trunk/jmdns/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-04-27 12:09:23 + (Wed, 27 Apr 2011)
New Revision: 13604

Modified:
   trunk/jmdns/debian/patches/series
Log:
remove patch for now

Modified: trunk/jmdns/debian/patches/series
===
--- trunk/jmdns/debian/patches/series   2011-04-27 11:50:21 UTC (rev 13603)
+++ trunk/jmdns/debian/patches/series   2011-04-27 12:09:23 UTC (rev 13604)
@@ -1 +1 @@
-javaDocLink
+#javaDocLink


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits

Bug#625869: fop_1.0.dfsg.orig.tar.gz contains upstream bundled jar files

[Mathieu Malaterre]

On Sun, May 8, 2011 at 5:53 PM, Sylvestre Ledru  wrote:
> Le vendredi 06 mai 2011 à 14:28 +0100, James Page a écrit :
>> I noticed this purely based on the size of the orig.tar.gz - its +11M bigger
>> than the orig.tar.gz provided by 1:0.95.dfsg-* as it contains all of the
>> upstream bundled libraries in the lib directory.
> Hello,
>
> Mathieu, it seems you are the one who uploaded this version in the
> archive (no worries). Could you have a look to this ? (watch out qbox
> which is version 1.12 in the archive while fop upstream is using version
> 1.6.3)

Confirmed. My bad.

$ ls -al fop_1.0.dfsg.orig.tar.gz ../fop_1.0.dfsg.orig.tar.gz
-rw-r--r-- 1 mathieu mathieu  6322460 May 16 19:14 ../fop_1.0.dfsg.orig.tar.gz
-rw-r--r-- 1 mathieu mathieu 16141354 Jul 17  2010 fop_1.0.dfsg.orig.tar.gz

We will need a proper upload to unstable using :

$ make -f ./debian/rules get-orig-source

2cts
-- 
Mathieu



__
This is the maintainer address of Debian's Java team
. Please 
use
debian-j...@lists.debian.org for discussions and questions.

Bug#576664: statsvn: Please update the man page

[Mathieu Malaterre]

Package: statsvn
Version: 0.4.0.dfsg-1
Severity: minor


I am not sure how the man page was first generated, but it would be nice that 
this page was updated with the latest options:

http://wiki.statsvn.org/User%20Manual.ashx

Thanks !

-- System Information:
Debian Release: 5.0.4
  APT prefers stable
  APT policy: (500, 'stable'), (200, 'testing'), (101, 'experimental'), (100, 
'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.30-bpo.1-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages statsvn depends on:
ii  default-jre [java-ru 1.5-30  Standard Java or Java compatible R
ii  gcj-4.4-jre [java-ru 4.4.2-4 Java runtime environment using GIJ
ii  gcj-jre [java-runtim 4:4.3.4-1   Java runtime environment using GIJ
ii  java-gcj-compat [jav 1.0.80-5.1  Java runtime environment using GIJ
ii  java-wrappers0.1.15  wrappers for java executables
ii  kaffe-pthreads [java 2:1.1.8-5.2 A POSIX threads enabled version of
ii  libbackport-util-con 2.2+dfsg-1  backport of java.util.concurrent t
ii  libjcommon-java  1.0.10.dfsg-1   General Purpose library for Java
ii  libjfreechart-java   1.0.10-1Chart library for Java
ii  openjdk-6-jre [java- 6b11-9.1+lenny2 OpenJDK Java runtime, using Hotspo
ii  statcvs  1:0.4.0.dfsg-3  CVS Repository statistic analysis 
ii  subversion   1.6.4dfsg-1~bpo50+1 Advanced version control system
ii  sun-java5-jre [java- 1.5.0-17-0.1Sun Java(TM) Runtime Environment (
ii  sun-java6-jre [java- 6-12-1  Sun Java(TM) Runtime Environment (

statsvn recommends no packages.

statsvn suggests no packages.

-- no debconf information



__
This is the maintainer address of Debian's Java team
. Please 
use
debian-j...@lists.debian.org for discussions and questions.

Bug#576664: statsvn: Please update the man page

[Mathieu Malaterre]

On Tue, Apr 6, 2010 at 1:01 PM, Vincent Fourmond  wrote:
> On Tue, Apr 6, 2010 at 12:55 PM, Mathieu Malaterre
>  wrote:
>> Package: statsvn
>> Version: 0.4.0.dfsg-1
>                ^

I did not know how to install the package just for faking the
installation for a proper bug report.

>> I am not sure how the man page was first generated, but it would be nice 
>> that this page was updated with the latest options:
>>
>> http://wiki.statsvn.org/User%20Manual.ashx
>
>  Well, sure enough, if you're using the stable version, it won't be
> up-to-date with respect to newer options ;-)... I believe the 0.7.0
> version is up-to-date, but please tell me if I missed some options.

I used apt-get source and then:

$ cat statsvn-0.7.0.dfsg/debian/manpages/statsvn.1| grep "cache-dir"

Same goes for:
no-developer
css
notes
config-file
chora
mantis
concurrency-threshold
anonymize

I hope I did not miss any.

HTH
-- 
Mathieu



__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers>. Please 
use
debian-j...@lists.debian.org for discussions and questions.

Bug#576982: fop: java.awt.HeadlessException

[Mathieu Malaterre]

Package: fop
Version: 1:0.95.dfsg-9
Severity: normal


I cannot use the -awt switch, it fails with:

[warning] /usr/bin/fop: Unable to locate xml-apis in /usr/share/java
Apr 8, 2010 7:40:29 PM org.apache.fop.fonts.FontCache loadFrom
WARNING: I/O exception while reading font cache 
(org.apache.fop.fonts.FontCache; local class incompatible: stream classdesc 
serialVersionUID = 605232520271754719, local class serialVersionUID = 
605232520271754718). Discarding font cache file.
Apr 8, 2010 7:40:29 PM org.apache.fop.cli.Main startFOP
SEVERE: Exception
java.awt.HeadlessException
at 
java.awt.GraphicsEnvironment.checkHeadless(GraphicsEnvironment.java:173)
at java.awt.Window.(Window.java:437)
at java.awt.Frame.(Frame.java:419)
at java.awt.Frame.(Frame.java:384)
at javax.swing.JFrame.(JFrame.java:180)
at 
org.apache.fop.render.awt.viewer.PreviewDialog.(PreviewDialog.java:108)
at 
org.apache.fop.render.awt.viewer.PreviewDialog.createPreviewDialog(PreviewDialog.java:267)
at 
org.apache.fop.render.awt.AWTRenderer.setUserAgent(AWTRenderer.java:101)
at 
org.apache.fop.cli.CommandLineOptions.parse(CommandLineOptions.java:180)
at org.apache.fop.cli.Main.startFOP(Main.java:154)
at org.apache.fop.cli.Main.main(Main.java:197)


Steps:
 $ fop -xsl /usr/share/xml/docbook/stylesheet/docbook-xsl/fo/docbook.xsl -xml 
hex.xml -awt

where:
hex.xml is:


http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd";>

  
  
  bla


21B6: ↶
↶





Thanks !

-- System Information:
Debian Release: 5.0.4
  APT prefers stable
  APT policy: (500, 'stable'), (200, 'testing'), (101, 'experimental'), (100, 
'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.30-bpo.1-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages fop depends on:
ii  default-jre [java2-runti 1.5-30  Standard Java or Java compatible R
ii  default-jre-headless 1.5-30  Standard Java or Java compatible R
ii  gcj-4.4-jre [java2-runti 4.4.2-4 Java runtime environment using GIJ
ii  gcj-jre [java2-runtime]  4:4.3.4-1   Java runtime environment using GIJ
ii  java-gcj-compat [java2-r 1.0.80-5.1  Java runtime environment using GIJ
ii  java-wrappers0.1.15  wrappers for java executables
ii  libavalon-framework-java 4.2.0-4 Common framework for Java server a
ii  libbatik-java1.7-5   xml.apache.org SVG Library
ii  libbsf-java  1:2.4.0-2   Bean Scripting Framework to suppor
ii  libcommons-io-java   1.4-1   Common useful IO related classes
ii  libcommons-logging-java  1.1.1-6 commmon wrapper interface for seve
ii  libxalan2-java   2.7.1-5 XSL Transformations (XSLT) process
ii  libxerces2-java  2.9.1-2+lenny1  Validating XML parser for Java wit
ii  libxml-commons-external- 1.3.05-1XML Commons external code - DOM, S
ii  libxmlgraphics-commons-j 1.3.1.dfsg-4reusable components used by Batik 
ii  libxp6   1:1.0.0.xsf1-2  X Printing Extension (Xprint) clie
ii  libxt6   1:1.0.5-3   X11 toolkit intrinsics library
ii  libxtst6 2:1.0.3-1   X11 Testing -- Resource extension 
ii  openjdk-6-jre [java2-run 6b11-9.1+lenny2 OpenJDK Java runtime, using Hotspo
ii  sun-java5-jre [java2-run 1.5.0-17-0.1Sun Java(TM) Runtime Environment (
ii  sun-java6-jre [java2-run 6-12-1  Sun Java(TM) Runtime Environment (

Versions of packages fop recommends:
ii  libsaxon-java 1:6.5.5-5  The Saxon XSLT Processor

Versions of packages fop suggests:
ii  fop-doc1:0.95.dfsg-7 Documentation for fop
ii  libservlet2.4-java 5.0.30-8  Servlet 2.4 and JSP 2.0 Java class

-- no debconf information



__
This is the maintainer address of Debian's Java team
. Please 
use
debian-j...@lists.debian.org for discussions and questions.