[pkg-java] r14551 - in trunk/saxonb/debian: . patches
Torsten Werner
twerner at alioth.debian.org
Mon Aug 29 11:35:22 UTC 2011
Author: twerner
Date: 2011-08-29 11:35:21 +0000 (Mon, 29 Aug 2011)
New Revision: 14551
Added:
trunk/saxonb/debian/orig-tar.sh
Modified:
trunk/saxonb/debian/build.xml
trunk/saxonb/debian/changelog
trunk/saxonb/debian/patches/0001-disable-dotnet-support.patch
trunk/saxonb/debian/patches/0002-disable-external-method-invocation.patch
trunk/saxonb/debian/patches/0003-disable-proprietary-saxon.patch
trunk/saxonb/debian/rules
trunk/saxonb/debian/watch
Log:
Newer but not newest upstream release. (Closes: #576467, #599413)
Modified: trunk/saxonb/debian/build.xml
===================================================================
--- trunk/saxonb/debian/build.xml 2011-08-29 09:43:18 UTC (rev 14550)
+++ trunk/saxonb/debian/build.xml 2011-08-29 11:35:21 UTC (rev 14551)
@@ -7,7 +7,7 @@
<target name="compile">
<mkdir dir="../build" />
- <javac srcdir="../src" destdir="../build" source="1.5" target="1.5" nowarn="true">
+ <javac srcdir="../bj" destdir="../build" source="1.5" target="1.5" nowarn="true">
<exclude name="**/dotnet/**" />
</javac>
</target>
@@ -75,7 +75,7 @@
<target name="javadoc" depends="compile">
<mkdir dir="../dist/api" />
- <javadoc sourcepath="../src" destdir="../dist/api" encoding="iso-8859-1" />
+ <javadoc sourcepath="../bj" destdir="../dist/api" encoding="iso-8859-1" />
</target>
</project>
Modified: trunk/saxonb/debian/changelog
===================================================================
--- trunk/saxonb/debian/changelog 2011-08-29 09:43:18 UTC (rev 14550)
+++ trunk/saxonb/debian/changelog 2011-08-29 11:35:21 UTC (rev 14551)
@@ -1,12 +1,13 @@
-saxonb (9.0.0.4+svn20080322-4) unstable; urgency=low
+saxonb (9.1.0.8-1) unstable; urgency=low
UNRELEASED
* Team upload.
+ * Newer but not newest upstream release. (Closes: #576467, #599413)
* Switch to source format 3.0.
* Update debian/watch to look into subversions tags directory. But there are
even newer versions.
- -- Torsten Werner <twerner at debian.org> Mon, 29 Aug 2011 11:33:38 +0200
+ -- Torsten Werner <twerner at debian.org> Mon, 29 Aug 2011 12:57:25 +0200
saxonb (9.0.0.4+svn20080322-3) unstable; urgency=low
Added: trunk/saxonb/debian/orig-tar.sh
===================================================================
--- trunk/saxonb/debian/orig-tar.sh (rev 0)
+++ trunk/saxonb/debian/orig-tar.sh 2011-08-29 11:35:21 UTC (rev 14551)
@@ -0,0 +1,16 @@
+#!/bin/sh -e
+
+VERSION=$2
+TAR=../saxonb_$VERSION.orig.tar.gz
+DIR=saxonb-$VERSION
+TAG="$VERSION"
+
+svn export https://saxon.svn.sourceforge.net/svnroot/saxon/tags/${TAG}/ $DIR
+tar -c -z -f $TAR --exclude '*.class' $DIR
+rm -rf $DIR ../$TAG
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $TAR $origDir && echo "moved $TAR to $origDir"
+fi
Property changes on: trunk/saxonb/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/saxonb/debian/patches/0001-disable-dotnet-support.patch
===================================================================
--- trunk/saxonb/debian/patches/0001-disable-dotnet-support.patch 2011-08-29 09:43:18 UTC (rev 14550)
+++ trunk/saxonb/debian/patches/0001-disable-dotnet-support.patch 2011-08-29 11:35:21 UTC (rev 14551)
@@ -3,29 +3,35 @@
Subject: [PATCH] disable dotnet support
---
- src/net/sf/saxon/Configuration.java | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ bj/net/sf/saxon/Configuration.java | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
-diff --git a/src/net/sf/saxon/Configuration.java b/src/net/sf/saxon/Configuration.java
-index a862ac4..38bb320 100644
---- a/src/net/sf/saxon/Configuration.java
-+++ b/src/net/sf/saxon/Configuration.java
-@@ -28,7 +28,7 @@ import net.sf.saxon.trans.SaxonErrorCode;
- import net.sf.saxon.tree.TreeBuilder;
- import net.sf.saxon.type.*;
- import net.sf.saxon.value.Whitespace;
--import net.sf.saxon.dotnet.DotNetPlatform;
-+//import net.sf.saxon.dotnet.DotNetPlatform;
- import org.xml.sax.*;
+diff --git a/bj/net/sf/saxon/Configuration.java b/bj/net/sf/saxon/Configuration.java
+index b95f98d..4ecb53a 100644
+--- a/bj/net/sf/saxon/Configuration.java
++++ b/bj/net/sf/saxon/Configuration.java
+@@ -1,6 +1,6 @@
+ package net.sf.saxon;
- import javax.xml.parsers.ParserConfigurationException;
-@@ -232,7 +232,7 @@ public class Configuration implements Serializable, SourceResolver {
+-/*DOTNETONLY*/ import net.sf.saxon.dotnet.DotNetPlatform;
++/*DOTNETONLY*/ //import net.sf.saxon.dotnet.DotNetPlatform;
- /*DOTNETONLY*/ /*JAVAONLY*/ if (System.getProperty("java.vendor").equals("Jeroen Frijters")) {
- //System.err.println("Call to create .NET platform currently disabled in Configuration.java (needed for JDK1.4)");
-- /*DOTNETONLY*/ platform = DotNetPlatform.getInstance();
-+ /*DOTNETONLY*/ //platform = DotNetPlatform.getInstance();
- /*DOTNETONLY*/ /*JAVAONLY*/ }
+ import net.sf.saxon.event.*;
+ import net.sf.saxon.evpull.PullEventSource;
+@@ -249,7 +249,7 @@ public class Configuration implements Serializable, SourceResolver {
+
+ /*DOTNETONLY*/ /*JAVAONLY*/ if (System.getProperty("java.vendor").equals("Jeroen Frijters")) {
+ //System.err.println("Call to create .NET platform currently disabled in Configuration.java (needed for JDK1.4)");
+- /*DOTNETONLY*/ platform = DotNetPlatform.getInstance();
++ /*DOTNETONLY*/ //platform = DotNetPlatform.getInstance();
+ /*DOTNETONLY*/ /*JAVAONLY*/ }
// System.err.println(System.getProperty("java.vendor"));
// System.err.println(platform.getClass().getName());
+@@ -3540,4 +3540,4 @@ public class Configuration implements Serializable, SourceResolver {
+ // Portions created by (your name) are Copyright (C) (your legal entity). All Rights Reserved.
+ //
+ // Contributor(s): none.
+-//
+\ No newline at end of file
++//
--
Modified: trunk/saxonb/debian/patches/0002-disable-external-method-invocation.patch
===================================================================
--- trunk/saxonb/debian/patches/0002-disable-external-method-invocation.patch 2011-08-29 09:43:18 UTC (rev 14550)
+++ trunk/saxonb/debian/patches/0002-disable-external-method-invocation.patch 2011-08-29 11:35:21 UTC (rev 14551)
@@ -3,17 +3,17 @@
Subject: [PATCH] disable external method invocation
---
- src/net/sf/saxon/Configuration.java | 2 +-
+ bj/net/sf/saxon/Configuration.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
-diff --git a/src/net/sf/saxon/Configuration.java b/src/net/sf/saxon/Configuration.java
-index 38bb320..1b3ae11 100644
---- a/src/net/sf/saxon/Configuration.java
-+++ b/src/net/sf/saxon/Configuration.java
-@@ -121,7 +121,7 @@ public class Configuration implements Serializable, SourceResolver {
+diff --git a/bj/net/sf/saxon/Configuration.java b/bj/net/sf/saxon/Configuration.java
+index 4ecb53a..1ee5c5d 100644
+--- a/bj/net/sf/saxon/Configuration.java
++++ b/bj/net/sf/saxon/Configuration.java
+@@ -130,7 +130,7 @@ public class Configuration implements Serializable, SourceResolver {
private transient OutputURIResolver outputURIResolver;
private boolean timing = false;
- private boolean versionWarning = true;
+ private boolean versionWarning = false;
- private boolean allowExternalFunctions = true;
+ private boolean allowExternalFunctions = false;
private boolean traceExternalFunctions = false;
Modified: trunk/saxonb/debian/patches/0003-disable-proprietary-saxon.patch
===================================================================
--- trunk/saxonb/debian/patches/0003-disable-proprietary-saxon.patch 2011-08-29 09:43:18 UTC (rev 14550)
+++ trunk/saxonb/debian/patches/0003-disable-proprietary-saxon.patch 2011-08-29 11:35:21 UTC (rev 14551)
@@ -3,14 +3,14 @@
Subject: [PATCH] disable proprietary saxon
---
- src/net/sf/saxon/ant/AntTransform.java | 12 ++++++------
- src/net/sf/saxon/s9api/SchemaManager.java | 21 +++++----------------
- 2 files changed, 11 insertions(+), 22 deletions(-)
+ bj/net/sf/saxon/ant/AntTransform.java | 12 ++++++------
+ bj/net/sf/saxon/s9api/SchemaManager.java | 13 ++-----------
+ 2 files changed, 8 insertions(+), 17 deletions(-)
-diff --git a/src/net/sf/saxon/ant/AntTransform.java b/src/net/sf/saxon/ant/AntTransform.java
-index 9d2ca53..e29065b 100644
---- a/src/net/sf/saxon/ant/AntTransform.java
-+++ b/src/net/sf/saxon/ant/AntTransform.java
+diff --git a/bj/net/sf/saxon/ant/AntTransform.java b/bj/net/sf/saxon/ant/AntTransform.java
+index 5fba972..38db268 100644
+--- a/bj/net/sf/saxon/ant/AntTransform.java
++++ b/bj/net/sf/saxon/ant/AntTransform.java
@@ -325,13 +325,13 @@ public class AntTransform extends MatchingTask implements XSLTLogger {
public void execute() throws BuildException {
log("AntTransform.execute() schema-aware=" + schemaAware + " version " + Version.getProductVersion());
@@ -31,29 +31,16 @@
config.setAllowExternalFunctions(allowExtensions);
config.setExpandAttributeDefaults(expandAttributeDefaults);
-diff --git a/src/net/sf/saxon/s9api/SchemaManager.java b/src/net/sf/saxon/s9api/SchemaManager.java
-index 7c79302..05e410d 100644
---- a/src/net/sf/saxon/s9api/SchemaManager.java
-+++ b/src/net/sf/saxon/s9api/SchemaManager.java
-@@ -1,8 +1,8 @@
- package net.sf.saxon.s9api;
-
--import com.saxonica.schema.PreparedSchema;
--import com.saxonica.schema.SchemaModelLoader;
--import com.saxonica.schema.SchemaModelSerializer;
-+//import com.saxonica.schema.PreparedSchema;
-+//import com.saxonica.schema.SchemaModelLoader;
-+//import com.saxonica.schema.SchemaModelSerializer;
- import net.sf.saxon.Configuration;
- import net.sf.saxon.event.Receiver;
- import net.sf.saxon.trans.XPathException;
-@@ -98,12 +98,7 @@ public class SchemaManager {
+diff --git a/bj/net/sf/saxon/s9api/SchemaManager.java b/bj/net/sf/saxon/s9api/SchemaManager.java
+index 9ab0b13..e62f5b8 100644
+--- a/bj/net/sf/saxon/s9api/SchemaManager.java
++++ b/bj/net/sf/saxon/s9api/SchemaManager.java
+@@ -96,11 +96,7 @@ public class SchemaManager {
*/
public void importComponents(Source source) throws SaxonApiException {
- try {
-- SchemaModelLoader loader = new SchemaModelLoader(config);
-- PreparedSchema schema = loader.load(source);
+- config.importComponents(source);
- } catch (XPathException err) {
- throw new SaxonApiException(err);
- }
@@ -61,14 +48,13 @@
}
/**
-@@ -114,13 +109,7 @@ public class SchemaManager {
+@@ -111,12 +107,7 @@ public class SchemaManager {
*/
public void exportComponents(Destination destination) throws SaxonApiException {
- try {
- Receiver out = destination.getReceiver(config);
-- SchemaModelSerializer serializer = new SchemaModelSerializer(config, out);
-- serializer.serialize();
+- config.exportComponents(out);
- } catch (XPathException e) {
- throw new SaxonApiException(e);
- }
Modified: trunk/saxonb/debian/rules
===================================================================
--- trunk/saxonb/debian/rules 2011-08-29 09:43:18 UTC (rev 14550)
+++ trunk/saxonb/debian/rules 2011-08-29 11:35:21 UTC (rev 14551)
@@ -5,15 +5,16 @@
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-VERSION=9.0
+VERSION := $(DEB_UPSTREAM_VERSION)
JAVA_HOME := /usr/lib/jvm/default-java
ANT_HOME := /usr/share/ant
DEB_JARS := dom4j jdom1 xom
-#DEB_ANT_ARGS := -verbose
-DEB_ANT_BUILDFILE := debian/build.xml
+DEB_ANT_ARGS := -Dupstream-version=$(DEB_UPSTREAM_VERSION)
+DEB_ANT_BUILDFILE := $(CURDIR)/debian/build.xml
DEB_ANT_BUILD_TARGET := jar javadoc
+DEB_BUILDDIR := bj
install/libsaxonb-java::
install -m 644 -D dist/saxonb-$(VERSION).jar debian/libsaxonb-java/usr/share/java/saxonb-$(VERSION).jar
@@ -34,3 +35,6 @@
dh_link -p libsaxonb-java /usr/share/java/saxonb-xom-$(VERSION).jar /usr/share/java/saxonb-xom.jar
dh_link -p libsaxonb-java /usr/share/java/saxonb-xpath-$(VERSION).jar /usr/share/java/saxonb-xpath.jar
dh_link -p libsaxonb-java /usr/share/java/saxonb-xqj-$(VERSION).jar /usr/share/java/saxonb-xqj.jar
+
+get-orig-source:
+ uscan --download-version $(VERSION) --force-download
Modified: trunk/saxonb/debian/watch
===================================================================
--- trunk/saxonb/debian/watch 2011-08-29 09:43:18 UTC (rev 14550)
+++ trunk/saxonb/debian/watch 2011-08-29 11:35:21 UTC (rev 14551)
@@ -1,3 +1,4 @@
version=3
-http://saxon.svn.sourceforge.net/viewvc/saxon/tags/ (\d.*)/
+https://saxon.svn.sourceforge.net/svnroot/saxon/tags/ (\d.*)/ \
+ debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list