This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository saxonb.
commit dc4a16ff4028ffb5e038dc6e4c8d0b511df9465f Author: Torsten Werner <twer...@debian.org> Date: Mon Aug 29 09:43:18 2011 +0000 UNRELEASED * Team upload. * Switch to source format 3.0. * Update debian/watch to look into subversions tags directory. But there are even newer versions. --- debian/changelog | 10 ++++++++ ...ort.patch => 0001-disable-dotnet-support.patch} | 19 +++++++++++---- .../0002-disable-external-method-invocation.patch | 22 +++++++++++++++++ ....patch => 0003-disable-proprietary-saxon.patch} | 28 ++++++++++++++++------ .../disable-external-method-invocation.patch | 11 --------- debian/patches/series | 3 +++ debian/rules | 1 - debian/source/format | 1 + debian/watch | 4 ++-- 9 files changed, 74 insertions(+), 25 deletions(-) diff --git a/debian/changelog b/debian/changelog index d7b86d2..fba78be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 ] diff --git a/debian/patches/disable-dotnet-support.patch b/debian/patches/0001-disable-dotnet-support.patch similarity index 56% rename from debian/patches/disable-dotnet-support.patch rename to debian/patches/0001-disable-dotnet-support.patch index c580a52..acd6a28 100644 --- a/debian/patches/disable-dotnet-support.patch +++ b/debian/patches/0001-disable-dotnet-support.patch @@ -1,6 +1,16 @@ ---- 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 @@ +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; @@ -9,7 +19,7 @@ import org.xml.sax.*; import javax.xml.parsers.ParserConfigurationException; -@@ -232,7 +232,7 @@ +@@ -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)"); @@ -18,3 +28,4 @@ /*DOTNETONLY*/ /*JAVAONLY*/ } // System.err.println(System.getProperty("java.vendor")); // System.err.println(platform.getClass().getName()); +-- diff --git a/debian/patches/0002-disable-external-method-invocation.patch b/debian/patches/0002-disable-external-method-invocation.patch new file mode 100644 index 0000000..856b723 --- /dev/null +++ b/debian/patches/0002-disable-external-method-invocation.patch @@ -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; +-- diff --git a/debian/patches/disable-proprietary-saxon.patch b/debian/patches/0003-disable-proprietary-saxon.patch similarity index 68% rename from debian/patches/disable-proprietary-saxon.patch rename to debian/patches/0003-disable-proprietary-saxon.patch index f153db3..1561ed9 100644 --- a/debian/patches/disable-proprietary-saxon.patch +++ b/debian/patches/0003-disable-proprietary-saxon.patch @@ -1,6 +1,17 @@ ---- 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 @@ +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()); @@ -20,8 +31,10 @@ 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 +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; @@ -34,7 +47,7 @@ import net.sf.saxon.Configuration; import net.sf.saxon.event.Receiver; import net.sf.saxon.trans.XPathException; -@@ -98,12 +98,7 @@ +@@ -98,12 +98,7 @@ public class SchemaManager { */ public void importComponents(Source source) throws SaxonApiException { @@ -48,7 +61,7 @@ } /** -@@ -114,13 +109,7 @@ +@@ -114,13 +109,7 @@ public class SchemaManager { */ public void exportComponents(Destination destination) throws SaxonApiException { @@ -63,3 +76,4 @@ } +-- diff --git a/debian/patches/disable-external-method-invocation.patch b/debian/patches/disable-external-method-invocation.patch deleted file mode 100644 index 0cd0339..0000000 --- a/debian/patches/disable-external-method-invocation.patch +++ /dev/null @@ -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; diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..f279c4d --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +0001-disable-dotnet-support.patch +0002-disable-external-method-invocation.patch +0003-disable-proprietary-saxon.patch diff --git a/debian/rules b/debian/rules index 7a33e9a..ac87de0 100755 --- a/debian/rules +++ b/debian/rules @@ -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 diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch index 7e7c1d1..1aca7be 100644 --- a/debian/watch +++ b/debian/watch @@ -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.*)/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/saxonb.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits