[pkg-java] r18999 - in trunk/xmlbeans/debian: . patches
Eugene Zhukov
eugene at moszumanska.debian.org
Fri Feb 19 21:11:11 GMT 2016
Author: eugene
Date: 2016-02-19 21:11:11 +0000 (Fri, 19 Feb 2016)
New Revision: 18999
Added:
trunk/xmlbeans/debian/patches/saxonhe_fixes.patch
Modified:
trunk/xmlbeans/debian/changelog
trunk/xmlbeans/debian/control
trunk/xmlbeans/debian/patches/build-xml.patch
trunk/xmlbeans/debian/patches/series
Log:
Add patch to replace libsaxonb-java dep with libsaxonhe-java
Modified: trunk/xmlbeans/debian/changelog
===================================================================
--- trunk/xmlbeans/debian/changelog 2016-02-17 20:19:05 UTC (rev 18998)
+++ trunk/xmlbeans/debian/changelog 2016-02-19 21:11:11 UTC (rev 18999)
@@ -1,3 +1,10 @@
+xmlbeans (2.6.0-4) UNRELEASED; urgency=medium
+
+ * Add patch to build with Saxon-HE instead of Saxon-B
+ * d/control: use https for Vcs-Browser uri
+
+ -- Eugene Zhukov <eugene at debian.org> Fri, 19 Feb 2016 23:07:36 +0200
+
xmlbeans (2.6.0-3) unstable; urgency=medium
* Team upload.
Modified: trunk/xmlbeans/debian/control
===================================================================
--- trunk/xmlbeans/debian/control 2016-02-17 20:19:05 UTC (rev 18998)
+++ trunk/xmlbeans/debian/control 2016-02-19 21:11:11 UTC (rev 18999)
@@ -4,11 +4,11 @@
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Damien Raude-Morvan <drazzib at debian.org>, Emmanuel Bourg <ebourg at apache.org>
Build-Depends: cdbs, debhelper (>= 9), ant, default-jdk
-Build-Depends-Indep: ant-optional, libxmlbeans-java,
- libsaxonb-java, maven-repo-helper
+Build-Depends-Indep: ant-optional, libxmlbeans-java, maven-repo-helper,
+ libsaxonhe-java
Standards-Version: 3.9.7
Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/xmlbeans/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/xmlbeans/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/xmlbeans/
Homepage: http://xmlbeans.apache.org
Package: libxmlbeans-java
Modified: trunk/xmlbeans/debian/patches/build-xml.patch
===================================================================
--- trunk/xmlbeans/debian/patches/build-xml.patch 2016-02-17 20:19:05 UTC (rev 18998)
+++ trunk/xmlbeans/debian/patches/build-xml.patch 2016-02-19 21:11:11 UTC (rev 18999)
@@ -152,18 +152,17 @@
<mkdir dir="build/classes/xpath_xquery"/>
<mkdir dir="build/classes/xpath_xquery/META-INF"/>
<mkdir dir="build/classes/xpath_xquery/META-INF/services"/>
-@@ -996,8 +996,8 @@
+@@ -996,8 +996,7 @@
<classpath id="xpath.compile.path">
<pathelement location="build/classes/xmlpublic"/>
<pathelement location="build/classes/store"/>
- <pathelement location="${saxon_jar}"/>
- <pathelement location="${saxon_dom_jar}"/>
-+ <pathelement location="/usr/share/java/saxonb.jar"/>
-+ <pathelement location="/usr/share/java/saxonb-dom.jar"/>
++ <pathelement location="/usr/share/java/Saxon-HE.jar"/>
</classpath>
</javac>
</target>
-@@ -1061,19 +1061,19 @@
+@@ -1061,19 +1060,19 @@
<path id="test.compile.path">
<pathelement location="build/classes/marshal"/>
<pathelement location="build/classes/common"/>
@@ -187,7 +186,7 @@
<mkdir dir="build/private/classes/drt"/>
<javac
destdir="build/private/classes/drt"
-@@ -1093,7 +1093,7 @@
+@@ -1093,7 +1092,7 @@
<path id="scomp.run.path">
<pathelement location="build/lib/xbean.jar"/>
@@ -196,7 +195,7 @@
</path>
<target name="stsschema.check">
-@@ -1118,7 +1118,7 @@
+@@ -1118,7 +1117,7 @@
</uptodate>
</target>
@@ -205,7 +204,7 @@
<delete dir="build/private/jam"/>
<mkdir dir="build/private/jam"/>
<unjar src="external/lib/jam-0.1.0-src.jar" dest="build/private/jam"/>
-@@ -1141,7 +1141,7 @@
+@@ -1141,7 +1140,7 @@
debug="on">
<src path="build/private/jam/src_repackage"/>
<classpath>
Added: trunk/xmlbeans/debian/patches/saxonhe_fixes.patch
===================================================================
--- trunk/xmlbeans/debian/patches/saxonhe_fixes.patch (rev 0)
+++ trunk/xmlbeans/debian/patches/saxonhe_fixes.patch 2016-02-19 21:11:11 UTC (rev 18999)
@@ -0,0 +1,40 @@
+Description: Build with Saxon-HE
+
+--- a/src/xpath_xquery/org/apache/xmlbeans/impl/xpath/saxon/XBeansXPath.java
++++ b/src/xpath_xquery/org/apache/xmlbeans/impl/xpath/saxon/XBeansXPath.java
+@@ -25,11 +25,11 @@
+ import org.w3c.dom.Node;
+
+ import net.sf.saxon.Configuration;
+-import net.sf.saxon.dom.NodeWrapper;
++import net.sf.saxon.dom.DOMNodeWrapper;
+ import net.sf.saxon.om.NodeInfo;
+-import net.sf.saxon.om.VirtualNode;
++import net.sf.saxon.tree.wrapper.VirtualNode;
+ import net.sf.saxon.om.Item;
+-import net.sf.saxon.value.Value;
++import net.sf.saxon.om.SequenceTool;
+ import net.sf.saxon.sxpath.XPathEvaluator;
+ import net.sf.saxon.sxpath.XPathExpression;
+ import net.sf.saxon.sxpath.IndependentContext;
+@@ -122,9 +122,9 @@
+ Object o = it.next();
+ if (o instanceof NodeInfo)
+ {
+- if (o instanceof NodeWrapper)
++ if (o instanceof DOMNodeWrapper)
+ {
+- Node n = getUnderlyingNode((NodeWrapper)o);
++ Node n = getUnderlyingNode((DOMNodeWrapper)o);
+ it.set(n);
+ }
+ else
+@@ -133,7 +133,7 @@
+ }
+ }
+ else if (o instanceof Item)
+- it.set(Value.convertToJava((Item)o));
++ it.set(SequenceTool.convertToJava((Item)o));
+ }
+ return saxonNodes;
+ }
Modified: trunk/xmlbeans/debian/patches/series
===================================================================
--- trunk/xmlbeans/debian/patches/series 2016-02-17 20:19:05 UTC (rev 18998)
+++ trunk/xmlbeans/debian/patches/series 2016-02-19 21:11:11 UTC (rev 18999)
@@ -1,2 +1,3 @@
build-xml.patch
scripts.patch
+saxonhe_fixes.patch
More information about the pkg-java-commits
mailing list