[pkg-java] r10367 - in trunk/libxt-java/debian: . patches

[Michael Koch]

Author: mkoch
Date: 2009-09-14 20:52:20 +0000 (Mon, 14 Sep 2009)
New Revision: 10367

Added:
   trunk/libxt-java/debian/patches/02_Java5.patch
Modified:
   trunk/libxt-java/debian/changelog
   trunk/libxt-java/debian/compat
   trunk/libxt-java/debian/control
   trunk/libxt-java/debian/rules
Log:
libxt-java (0.20050823-3) unstable; urgency=low

  * (Build-)Depends on default-jdk.
  * Added debian/patches/02_Java5.patch to compile with a Java5-
    capable compiler.
  * Build-Depends on debhelper >= 7.
  * Moved ant, cdbs and debhelper to Build-Depends.
  * Moved libxt-java to section 'java'.
  * Make libxt-java depend on ${misc:Depends}.
  * Removed Wolfgang and added myself to Uploaders.
  * Updated Standards-Version to 3.8.3.

 -- Michael Koch <konqueror at gmx.de>  Mon, 14 Sep 2009 22:50:37 +0200



Modified: trunk/libxt-java/debian/changelog
===================================================================
--- trunk/libxt-java/debian/changelog	2009-09-14 20:31:44 UTC (rev 10366)
+++ trunk/libxt-java/debian/changelog	2009-09-14 20:52:20 UTC (rev 10367)
@@ -1,3 +1,17 @@
+libxt-java (0.20050823-3) unstable; urgency=low
+
+  * (Build-)Depends on default-jdk.
+  * Added debian/patches/02_Java5.patch to compile with a Java5-
+    capable compiler.
+  * Build-Depends on debhelper >= 7.
+  * Moved ant, cdbs and debhelper to Build-Depends.
+  * Moved libxt-java to section 'java'.
+  * Make libxt-java depend on ${misc:Depends}.
+  * Removed Wolfgang and added myself to Uploaders.
+  * Updated Standards-Version to 3.8.3.
+
+ -- Michael Koch <konqueror at gmx.de>  Mon, 14 Sep 2009 22:50:37 +0200
+
 libxt-java (0.20050823-2) unstable; urgency=low
 
   * kaffe compiler transition

Modified: trunk/libxt-java/debian/compat
===================================================================
--- trunk/libxt-java/debian/compat	2009-09-14 20:31:44 UTC (rev 10366)
+++ trunk/libxt-java/debian/compat	2009-09-14 20:52:20 UTC (rev 10367)
@@ -1 +1 @@
-4
+7

Modified: trunk/libxt-java/debian/control
===================================================================
--- trunk/libxt-java/debian/control	2009-09-14 20:31:44 UTC (rev 10366)
+++ trunk/libxt-java/debian/control	2009-09-14 20:52:20 UTC (rev 10367)
@@ -1,15 +1,15 @@
 Source: libxt-java
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: debhelper (>= 4.2.30), libservlet2.4-java, kaffe, ant, cdbs, docbook-to-man (>= 1:2.0.0)
-Standards-Version: 3.6.2
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
+Build-Depends: debhelper (>= 7), cdbs, ant, default-jdk
+Build-Depends-indep: libservlet2.4-java, docbook-to-man (>= 1:2.0.0)
+Standards-Version: 3.8.3
 
 Package: libxt-java
 Architecture: all
-Depends: kaffe | java1-runtime | java2-runtime
-Suggests: java-virtual-machine, libservlet2.3-java | libservlet2.4-java
+Depends: default-jdk, ${misc:Depends}
 Conflicts: lib-xt-java
 Replaces: lib-xt-java
 Description: An implementation in Java of XSL Transformations

Added: trunk/libxt-java/debian/patches/02_Java5.patch
===================================================================
--- trunk/libxt-java/debian/patches/02_Java5.patch	                        (rev 0)
+++ trunk/libxt-java/debian/patches/02_Java5.patch	2009-09-14 20:52:20 UTC (rev 10367)
@@ -0,0 +1,30 @@
+--- libxt-java-0.20050823.orig/src/xt/java/com/jclark/xsl/tr/AppendAction.java
++++ libxt-java-0.20050823/src/xt/java/com/jclark/xsl/tr/AppendAction.java
+@@ -16,9 +16,9 @@
+     public void invoke(ProcessContext context, 
+                        Node sourceNode, Result result) throws XSLException
+     {
+-        for (Enumeration enum = sequence.elements();
+-             enum.hasMoreElements();)
+-            ((Action)enum.nextElement()).invoke(context, sourceNode, result);
++        for (Enumeration e = sequence.elements();
++             e.hasMoreElements();)
++            ((Action)e.nextElement()).invoke(context, sourceNode, result);
+     }
+ 
+     void add(Action action)
+--- libxt-java-0.20050823.orig/src/xt/java/com/jclark/xsl/expr/PatternList.java
++++ libxt-java-0.20050823/src/xt/java/com/jclark/xsl/expr/PatternList.java
+@@ -126,9 +126,9 @@
+             case Node.ATTRIBUTE:
+             case Node.PROCESSING_INSTRUCTION:
+             case Node.ALLTYPES:            // for "node()" node test
+-                for (Enumeration enum =
+-                         nameRules.elements();  enum.hasMoreElements(); ) {
+-                    append((Vector)enum.nextElement(), ppb, obj);
++                for (Enumeration e =
++                         nameRules.elements();  e.hasMoreElements(); ) {
++                    append((Vector)e.nextElement(), ppb, obj);
+                 }
+                 append(anyNameRules, ppb, obj);
+                 break;

Modified: trunk/libxt-java/debian/rules
===================================================================
--- trunk/libxt-java/debian/rules	2009-09-14 20:31:44 UTC (rev 10366)
+++ trunk/libxt-java/debian/rules	2009-09-14 20:52:20 UTC (rev 10367)
@@ -6,8 +6,8 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME := /usr/lib/kaffe
-ANT_HOME := /usr/share/ant
+JAVA_HOME := /usr/lib/jvm/default-java
+
 DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar servlet-api-2.4
 #DEB_ANT_PROPERTYFILE := build.properties
 #DEB_ANT_BUILDFILE := build.xml