Author: twerner
Date: 2011-08-29 09:43:18 +0000 (Mon, 29 Aug 2011)
New Revision: 14550
Added:
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/patches/series
trunk/saxonb/debian/source/
trunk/saxonb/debian/source/format
Removed:
trunk/saxonb/debian/patches/disable-dotnet-support.patch
trunk/saxonb/debian/patches/disable-external-method-invocation.patch
trunk/saxonb/debian/patches/disable-proprietary-saxon.patch
Modified:
trunk/saxonb/debian/
trunk/saxonb/debian/changelog
trunk/saxonb/debian/rules
trunk/saxonb/debian/watch
Log:
UNRELEASED
* Team upload.
* Switch to source format 3.0.
* Update debian/watch to look into subversions tags directory. But there are
even newer versions.
Property changes on: trunk/saxonb/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Modified: trunk/saxonb/debian/changelog
===================================================================
--- trunk/saxonb/debian/changelog 2011-08-29 09:04:02 UTC (rev 14549)
+++ trunk/saxonb/debian/changelog 2011-08-29 09:43:18 UTC (rev 14550)
@@ -1,3 +1,13 @@
+saxonb (9.0.0.4+svn20080322-4) unstable; urgency=low
+
+ UNRELEASED
+ * Team upload.
+ * Switch to source format 3.0.
+ * Update debian/watch to look into subversions tags directory. But there are
+ even newer versions.
+
+ -- Torsten Werner <twer...@debian.org> Mon, 29 Aug 2011 11:33:38 +0200
+
saxonb (9.0.0.4+svn20080322-3) unstable; urgency=low
[ Chris Cheney ]
Added: trunk/saxonb/debian/patches/0001-disable-dotnet-support.patch
===================================================================
--- trunk/saxonb/debian/patches/0001-disable-dotnet-support.patch
(rev 0)
+++ trunk/saxonb/debian/patches/0001-disable-dotnet-support.patch
2011-08-29 09:43:18 UTC (rev 14550)
@@ -0,0 +1,31 @@
+From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Date: Mon, 29 Aug 2011 11:21:08 +0200
+Subject: [PATCH] disable dotnet support
+
+---
+ src/net/sf/saxon/Configuration.java | 4 ++--
+ 1 files changed, 2 insertions(+), 2 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.*;
+
+ import javax.xml.parsers.ParserConfigurationException;
+@@ -232,7 +232,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());
+--
Added: trunk/saxonb/debian/patches/0002-disable-external-method-invocation.patch
===================================================================
--- trunk/saxonb/debian/patches/0002-disable-external-method-invocation.patch
(rev 0)
+++ trunk/saxonb/debian/patches/0002-disable-external-method-invocation.patch
2011-08-29 09:43:18 UTC (rev 14550)
@@ -0,0 +1,22 @@
+From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Date: Mon, 29 Aug 2011 11:21:08 +0200
+Subject: [PATCH] disable external method invocation
+
+---
+ src/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 {
+ private transient OutputURIResolver outputURIResolver;
+ private boolean timing = false;
+ private boolean versionWarning = true;
+- private boolean allowExternalFunctions = true;
++ private boolean allowExternalFunctions = false;
+ private boolean traceExternalFunctions = false;
+ private boolean validation = false;
+ private boolean allNodesUntyped = false;
+--
Added: trunk/saxonb/debian/patches/0003-disable-proprietary-saxon.patch
===================================================================
--- trunk/saxonb/debian/patches/0003-disable-proprietary-saxon.patch
(rev 0)
+++ trunk/saxonb/debian/patches/0003-disable-proprietary-saxon.patch
2011-08-29 09:43:18 UTC (rev 14550)
@@ -0,0 +1,79 @@
+From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Date: Mon, 29 Aug 2011 11:21:08 +0200
+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(-)
+
+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
+@@ -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());
+
+- if (schemaAware) {
+- // remove this line to compile the code for use under Saxon-B only
+- config = Configuration.makeSchemaAwareConfiguration(null, null);
+- config.displayLicenseMessage();
+- } else {
++// if (schemaAware) {
++// // remove this line to compile the code for use under Saxon-B
only
++// config = Configuration.makeSchemaAwareConfiguration(null, null);
++// config.displayLicenseMessage();
++// } else {
+ config = new Configuration();
+- }
++// }
+
+ 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 {
+ */
+
+ public void importComponents(Source source) throws SaxonApiException {
+- try {
+- SchemaModelLoader loader = new SchemaModelLoader(config);
+- PreparedSchema schema = loader.load(source);
+- } catch (XPathException err) {
+- throw new SaxonApiException(err);
+- }
++ throw new SaxonApiException("proprietary schema support disabled in
this version");
+ }
+
+ /**
+@@ -114,13 +109,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();
+- } catch (XPathException e) {
+- throw new SaxonApiException(e);
+- }
++ throw new SaxonApiException("proprietary schema support disabled in
this version");
+ }
+
+
+--
Deleted: trunk/saxonb/debian/patches/disable-dotnet-support.patch
===================================================================
--- trunk/saxonb/debian/patches/disable-dotnet-support.patch 2011-08-29
09:04:02 UTC (rev 14549)
+++ trunk/saxonb/debian/patches/disable-dotnet-support.patch 2011-08-29
09:43:18 UTC (rev 14550)
@@ -1,20 +0,0 @@
---- src/net/sf/saxon/Configuration.java.orig 2007-12-18 00:19:25.000000000
+0100
-+++ src/net/sf/saxon/Configuration.java 2007-12-18 00:19:57.000000000
+0100
-@@ -28,7 +28,7 @@
- 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.*;
-
- import javax.xml.parsers.ParserConfigurationException;
-@@ -232,7 +232,7 @@
-
- /*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());
Deleted: trunk/saxonb/debian/patches/disable-external-method-invocation.patch
===================================================================
--- trunk/saxonb/debian/patches/disable-external-method-invocation.patch
2011-08-29 09:04:02 UTC (rev 14549)
+++ trunk/saxonb/debian/patches/disable-external-method-invocation.patch
2011-08-29 09:43:18 UTC (rev 14550)
@@ -1,11 +0,0 @@
---- src/net/sf/saxon/Configuration.java.orig 2008-02-15 21:24:24.000000000
+0100
-+++ src/net/sf/saxon/Configuration.java 2008-02-15 21:24:49.000000000
+0100
-@@ -121,7 +121,7 @@
- private transient OutputURIResolver outputURIResolver;
- private boolean timing = false;
- private boolean versionWarning = true;
-- private boolean allowExternalFunctions = true;
-+ private boolean allowExternalFunctions = false;
- private boolean traceExternalFunctions = false;
- private boolean validation = false;
- private boolean allNodesUntyped = false;
Deleted: trunk/saxonb/debian/patches/disable-proprietary-saxon.patch
===================================================================
--- trunk/saxonb/debian/patches/disable-proprietary-saxon.patch 2011-08-29
09:04:02 UTC (rev 14549)
+++ trunk/saxonb/debian/patches/disable-proprietary-saxon.patch 2011-08-29
09:43:18 UTC (rev 14550)
@@ -1,65 +0,0 @@
---- src/net/sf/saxon/ant/AntTransform.java.orig 2007-12-18
00:23:00.000000000 +0100
-+++ src/net/sf/saxon/ant/AntTransform.java 2007-12-18 00:25:51.000000000
+0100
-@@ -325,13 +325,13 @@
- public void execute() throws BuildException {
- log("AntTransform.execute() schema-aware=" + schemaAware + " version
" + Version.getProductVersion());
-
-- if (schemaAware) {
-- // remove this line to compile the code for use under Saxon-B only
-- config = Configuration.makeSchemaAwareConfiguration(null, null);
-- config.displayLicenseMessage();
-- } else {
-+// if (schemaAware) {
-+// // remove this line to compile the code for use under Saxon-B
only
-+// config = Configuration.makeSchemaAwareConfiguration(null, null);
-+// config.displayLicenseMessage();
-+// } else {
- config = new Configuration();
-- }
-+// }
-
- config.setAllowExternalFunctions(allowExtensions);
- config.setExpandAttributeDefaults(expandAttributeDefaults);
---- src/net/sf/saxon/s9api/SchemaManager.java.orig 2007-12-18
08:03:25.000000000 +0100
-+++ src/net/sf/saxon/s9api/SchemaManager.java 2007-12-18 08:05:42.000000000
+0100
-@@ -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 void importComponents(Source source) throws SaxonApiException {
-- try {
-- SchemaModelLoader loader = new SchemaModelLoader(config);
-- PreparedSchema schema = loader.load(source);
-- } catch (XPathException err) {
-- throw new SaxonApiException(err);
-- }
-+ throw new SaxonApiException("proprietary schema support disabled in
this version");
- }
-
- /**
-@@ -114,13 +109,7 @@
- */
-
- public void exportComponents(Destination destination) throws
SaxonApiException {
-- try {
-- Receiver out = destination.getReceiver(config);
-- SchemaModelSerializer serializer = new
SchemaModelSerializer(config, out);
-- serializer.serialize();
-- } catch (XPathException e) {
-- throw new SaxonApiException(e);
-- }
-+ throw new SaxonApiException("proprietary schema support disabled in
this version");
- }
-
-
Added: trunk/saxonb/debian/patches/series
===================================================================
--- trunk/saxonb/debian/patches/series (rev 0)
+++ trunk/saxonb/debian/patches/series 2011-08-29 09:43:18 UTC (rev 14550)
@@ -0,0 +1,3 @@
+0001-disable-dotnet-support.patch
+0002-disable-external-method-invocation.patch
+0003-disable-proprietary-saxon.patch
Modified: trunk/saxonb/debian/rules
===================================================================
--- trunk/saxonb/debian/rules 2011-08-29 09:04:02 UTC (rev 14549)
+++ trunk/saxonb/debian/rules 2011-08-29 09:43:18 UTC (rev 14550)
@@ -4,7 +4,6 @@
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
VERSION=9.0
Added: trunk/saxonb/debian/source/format
===================================================================
--- trunk/saxonb/debian/source/format (rev 0)
+++ trunk/saxonb/debian/source/format 2011-08-29 09:43:18 UTC (rev 14550)
@@ -0,0 +1 @@
+3.0 (quilt)
Modified: trunk/saxonb/debian/watch
===================================================================
--- trunk/saxonb/debian/watch 2011-08-29 09:04:02 UTC (rev 14549)
+++ trunk/saxonb/debian/watch 2011-08-29 09:43:18 UTC (rev 14550)
@@ -1,3 +1,3 @@
version=3
-opts=uversionmangle=s/-/./g,dversionmangle=s/\+svn\d*// \
-http://sf.net/saxon/ saxonb(\d.*)j.zip
+
+http://saxon.svn.sourceforge.net/viewvc/saxon/tags/ (\d.*)/
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
