[pkg-java] r10696 - in trunk/werken.xpath/debian: . patches

[Michael Koch]

Author: mkoch
Date: 2009-09-28 19:53:56 +0000 (Mon, 28 Sep 2009)
New Revision: 10696

Added:
   trunk/werken.xpath/debian/patches/05_JDOM_getParent.patch
Modified:
   trunk/werken.xpath/debian/changelog
   trunk/werken.xpath/debian/control
   trunk/werken.xpath/debian/rules
Log:
werken.xpath (0.9.4-11) unstable; urgency=low

  * (Build-)Depends on libjdom1-java (Closes: #500537).
  * Added debian/patches/05_JDOM_getParent.patch.
  * Loosen Depends to allow non-default java implementations too.

 -- Michael Koch <konqueror at gmx.de>  Mon, 28 Sep 2009 21:52:03 +0200



Modified: trunk/werken.xpath/debian/changelog
===================================================================
--- trunk/werken.xpath/debian/changelog	2009-09-28 19:13:45 UTC (rev 10695)
+++ trunk/werken.xpath/debian/changelog	2009-09-28 19:53:56 UTC (rev 10696)
@@ -1,3 +1,11 @@
+werken.xpath (0.9.4-11) unstable; urgency=low
+
+  * (Build-)Depends on libjdom1-java (Closes: #500537).
+  * Added debian/patches/05_JDOM_getParent.patch.
+  * Loosen Depends to allow non-default java implementations too.
+
+ -- Michael Koch <konqueror at gmx.de>  Mon, 28 Sep 2009 21:52:03 +0200
+
 werken.xpath (0.9.4-10) unstable; urgency=low
 
   * (Build-)Depends on default-jdk.

Modified: trunk/werken.xpath/debian/control
===================================================================
--- trunk/werken.xpath/debian/control	2009-09-28 19:13:45 UTC (rev 10695)
+++ trunk/werken.xpath/debian/control	2009-09-28 19:53:56 UTC (rev 10696)
@@ -4,12 +4,12 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
 Build-Depends: debhelper(>= 7), cdbs, ant, default-jdk
-Build-Depends-Indep: libxerces2-java, antlr(>= 2.7), libjdom0-java
+Build-Depends-Indep: libxerces2-java, antlr(>= 2.7), libjdom1-java
 Standards-Version: 3.8.3
 
 Package: libwerken.xpath-java
 Architecture: all
-Depends: default-jdk, libxerces2-java, antlr(>= 2.7), libjdom0-java, ${misc:Depends}
+Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless, libxerces2-java, antlr(>= 2.7), libjdom1-java, ${misc:Depends}
 Description: JDOM XPath Engine 
  A XPath Engine for JDOM, created by the Werken & Sons Company.
  .

Added: trunk/werken.xpath/debian/patches/05_JDOM_getParent.patch
===================================================================
--- trunk/werken.xpath/debian/patches/05_JDOM_getParent.patch	                        (rev 0)
+++ trunk/werken.xpath/debian/patches/05_JDOM_getParent.patch	2009-09-28 19:53:56 UTC (rev 10696)
@@ -0,0 +1,66 @@
+--- werken.xpath-0.9.4.orig/src/com/werken/xpath/ElementNamespaceContext.java
++++ werken.xpath-0.9.4/src/com/werken/xpath/ElementNamespaceContext.java
+@@ -62,12 +62,12 @@
+ 
+       lineage.push(_element);
+ 
+-      Element elem = _element.getParent();
++      Element elem = (Element)_element.getParent();
+ 
+       while (elem != null)
+       {
+         lineage.push(elem);
+-        elem = elem.getParent();
++        elem = (Element)elem.getParent();
+       }
+ 
+       List      nsList = null;
+--- werken.xpath-0.9.4.orig/src/com/werken/xpath/impl/ParentStep.java
++++ werken.xpath-0.9.4/src/com/werken/xpath/impl/ParentStep.java
+@@ -50,7 +50,7 @@
+ 
+       if ( each instanceof Element )
+       {
+-        parent = ((Element)each).getParent();
++        parent = (Element)((Element)each).getParent();
+ 
+         if (parent != null)
+         {
+--- werken.xpath-0.9.4.orig/src/com/werken/xpath/util/Partition.java
++++ werken.xpath-0.9.4/src/com/werken/xpath/util/Partition.java
+@@ -67,7 +67,7 @@
+ 
+   public static List followingSiblings(Element node)
+   {
+-    Element parent = node.getParent();
++    Element parent = (Element)node.getParent();
+ 
+     if (parent == null)
+     {
+@@ -95,7 +95,7 @@
+ 
+   public static List preceedingSiblings(Element node)
+   {
+-    Element parent = node.getParent();
++    Element parent = (Element)node.getParent();
+ 
+     if (parent == null)
+     {
+@@ -137,7 +137,7 @@
+       results.addAll( Partition.descendants( each ) );
+     }
+ 
+-    Element parent = node.getParent();
++    Element parent = (Element)node.getParent();
+ 
+     if (parent != null)
+     {
+@@ -170,7 +170,7 @@
+       results.addAll( Partition.descendants( each ) );
+     }
+ 
+-    Element parent = node.getParent();
++    Element parent = (Element)node.getParent();
+ 
+     if (parent != null)
+     {

Modified: trunk/werken.xpath/debian/rules
===================================================================
--- trunk/werken.xpath/debian/rules	2009-09-28 19:13:45 UTC (rev 10695)
+++ trunk/werken.xpath/debian/rules	2009-09-28 19:53:56 UTC (rev 10696)
@@ -7,7 +7,7 @@
 
 JAVA_HOME := /usr/lib/jvm/default-java
 
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar jdom0 xercesImpl antlrall
+DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar jdom1 xercesImpl antlrall
 
 DEB_ANT_CLEAN_TARGET := clean
 DEB_ANT_BUILD_TARGET := package javadoc