[pkg-java] r18997 - in trunk/xslthl/debian: . patches

[Eugene Zhukov]

Author: eugene
Date: 2016-02-17 20:02:05 +0000 (Wed, 17 Feb 2016)
New Revision: 18997

Added:
   trunk/xslthl/debian/patches/saxon-he.patch
Modified:
   trunk/xslthl/debian/changelog
   trunk/xslthl/debian/control
   trunk/xslthl/debian/maven.rules
   trunk/xslthl/debian/patches/series
Log:
Add a patch to build with libsaxonhe-java

Modified: trunk/xslthl/debian/changelog
===================================================================
--- trunk/xslthl/debian/changelog	2016-02-16 19:38:35 UTC (rev 18996)
+++ trunk/xslthl/debian/changelog	2016-02-17 20:02:05 UTC (rev 18997)
@@ -1,3 +1,10 @@
+xslthl (2.1.3-2) UNRELEASED; urgency=medium
+
+  * Bump Std-Vers to 3.9.7, no changes needed
+  * Switch build dependency to libsaxonhe-java from libsaxonb-java
+
+ -- Eugene Zhukov <eugene at debian.org>  Wed, 17 Feb 2016 21:28:52 +0200
+
 xslthl (2.1.3-1) unstable; urgency=medium
 
   * New upstream release (Closes: #809821)

Modified: trunk/xslthl/debian/control
===================================================================
--- trunk/xslthl/debian/control	2016-02-16 19:38:35 UTC (rev 18996)
+++ trunk/xslthl/debian/control	2016-02-17 20:02:05 UTC (rev 18997)
@@ -4,11 +4,10 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Eugene Zhukov <eugene at debian.org>, Mathieu Malaterre <malat at debian.org>
 Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.6.1)
-Build-Depends-Indep: libsaxon-java (>= 6.5.5), libsaxonb-java (>= 9.1.0.8), libxalan2-java,
- junit4 
-Standards-Version: 3.9.6
+Build-Depends-Indep: libsaxon-java, libsaxonhe-java, libxalan2-java, junit4 
+Standards-Version: 3.9.7
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/xslthl
-Vcs-Browser: http://anonscm.debian.org/wsvn/pkg-java/trunk/xslthl
+Vcs-Browser: https://anonscm.debian.org/wsvn/pkg-java/trunk/xslthl
 Homepage: http://xslthl.sourceforge.net
 
 Package: libxslthl-java

Modified: trunk/xslthl/debian/maven.rules
===================================================================
--- trunk/xslthl/debian/maven.rules	2016-02-16 19:38:35 UTC (rev 18996)
+++ trunk/xslthl/debian/maven.rules	2016-02-17 20:02:05 UTC (rev 18997)
@@ -1,6 +1,7 @@
 
 junit junit jar s/.*/4.x/ * *
 junit junit jar s/4\..*/4.x/ * *
-s/net.sf.saxon/net.sourceforge.saxon/ saxon jar s/.*/debian/ * *
+net.sf.saxon Saxon-HE jar s/.*/debian/ * *
+net.sf.saxon s/saxon/Saxon-HE jar s/.*/debian/ * *
 net.sf.xslthl xslthl jar s/2\..*/2.x/ * *
 org.apache.maven.wagon wagon-ssh-external jar s/.*/debian/ * *

Added: trunk/xslthl/debian/patches/saxon-he.patch
===================================================================
--- trunk/xslthl/debian/patches/saxon-he.patch	                        (rev 0)
+++ trunk/xslthl/debian/patches/saxon-he.patch	2016-02-17 20:02:05 UTC (rev 18997)
@@ -0,0 +1,45 @@
+Description: Make package compile with libsaxonhe-java
+
+--- a/src/main/java/net/sf/xslthl/ConnectorSaxonB.java
++++ b/src/main/java/net/sf/xslthl/ConnectorSaxonB.java
+@@ -30,10 +30,10 @@
+ 
+ import net.sf.saxon.event.Builder;
+ import net.sf.saxon.expr.XPathContext;
+-import net.sf.saxon.om.Axis;
+-import net.sf.saxon.om.AxisIterator;
++import net.sf.saxon.om.AxisInfo;
++import net.sf.saxon.tree.iter.AxisIterator;
+ import net.sf.saxon.om.Item;
+-import net.sf.saxon.om.ListIterator;
++import net.sf.saxon.tree.iter.ListIterator;
+ import net.sf.saxon.om.NamePool;
+ import net.sf.saxon.om.NodeInfo;
+ import net.sf.saxon.om.SequenceIterator;
+@@ -50,7 +50,7 @@
+ 		if (b.isStyled()) {
+ 			int elemId = pool.allocate(config.prefix, config.uri,
+ 			        ((StyledBlock) b).getStyle());
+-			builder.startElement(elemId, -1, 0, 0);
++			builder.startElement(null, null, 0, 0);
+ 			builder.characters(b.getText(), 0, b.getText().length());
+ 			builder.endElement();
+ 		} else {
+@@ -96,7 +96,7 @@
+ 				Item itm = seq.current();
+ 				if (itm instanceof NodeInfo) {
+ 					NodeInfo ni = (NodeInfo) itm;
+-					SequenceIterator ae = ni.iterateAxis(Axis.CHILD,
++					SequenceIterator ae = ni.iterateAxis(AxisInfo.CHILD,
+ 					        AnyNodeTest.getInstance());
+ 					while (ae.next() != null) {
+ 						Item itm2 = ae.current();
+@@ -117,7 +117,7 @@
+ 									builder.close();
+ 									NodeInfo doc = builder.getCurrentRoot();
+ 									AxisIterator elms = doc.iterateAxis(
+-									        Axis.CHILD, AnyNodeTest
++									        AxisInfo.CHILD, AnyNodeTest
+ 									                .getInstance());
+ 									while (elms.next() != null) {
+ 										resultNodes.add(elms.current());

Modified: trunk/xslthl/debian/patches/series
===================================================================
--- trunk/xslthl/debian/patches/series	2016-02-16 19:38:35 UTC (rev 18996)
+++ trunk/xslthl/debian/patches/series	2016-02-17 20:02:05 UTC (rev 18997)
@@ -1,3 +1,4 @@
 pom_fixes.patch
 sh_compat.patch
 using_system_config_file.diff
+saxon-he.patch