[epubcheck] 01/01: Add Saxon-HE 9.8.0.8 compatibility
Eugene Zhukov
eugene at moszumanska.debian.org
Fri Feb 16 11:30:36 UTC 2018
This is an automated email from the git hooks/post-receive script.
eugene pushed a commit to branch master
in repository epubcheck.
commit 23c0483c679e2d439259883d95aa322c80b2cd3c
Author: Eugene Zhukov <eugene at debian.org>
Date: Fri Feb 16 11:11:36 2018 +0000
Add Saxon-HE 9.8.0.8 compatibility
---
debian/changelog | 6 ++++++
debian/control | 2 +-
....7.patch => compatibility_with_saxon_9.8.patch} | 22 +++++++++++-----------
debian/patches/series | 2 +-
4 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8a093df..3027b63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+epubcheck (4.0.2-2) UNRELEASED; urgency=medium
+
+ * Update Saxon-HE version patch
+
+ -- Eugene Zhukov <eugene at debian.org> Fri, 16 Feb 2018 11:04:57 +0000
+
epubcheck (4.0.2-1) unstable; urgency=medium
* New upstream release
diff --git a/debian/control b/debian/control
index 6e7a064..2778f3f 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9), cdbs,
libjing-java,
libmaven-bundle-plugin-java,
libsac-java,
- libsaxonhe-java (>= 9.7.0.10+dfsg+1),
+ libsaxonhe-java (>= 9.8.0.8+dfsg+1),
libxml-maven-plugin-java,
libmaven-dependency-plugin-java,
libjackson-json-java
diff --git a/debian/patches/compatibility_with_saxon_9.7.patch b/debian/patches/compatibility_with_saxon_9.8.patch
similarity index 83%
rename from debian/patches/compatibility_with_saxon_9.7.patch
rename to debian/patches/compatibility_with_saxon_9.8.patch
index 154ec15..c9b5566 100644
--- a/debian/patches/compatibility_with_saxon_9.7.patch
+++ b/debian/patches/compatibility_with_saxon_9.8.patch
@@ -10,7 +10,7 @@ Origin: https://github.com/IDPF/epubcheck/commit/21cd661a19b58084175c97cb0e46ffd
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
- <version>9.5.1-5</version>
-+ <version>9.7.0-10</version>
++ <version>9.8.0-8</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -19,13 +19,13 @@ Origin: https://github.com/IDPF/epubcheck/commit/21cd661a19b58084175c97cb0e46ffd
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
- <version>9.4</version>
-+ <version>9.7.0-10</version>
++ <version>9.8.0-8</version>
</dependency>
</dependencies>
</plugin>
--- a/src/main/java/com/adobe/epubcheck/vocab/PrefixDeclarationParser.java
+++ b/src/main/java/com/adobe/epubcheck/vocab/PrefixDeclarationParser.java
-@@ -9,7 +9,7 @@ import java.util.EnumSet;
+@@ -9,7 +9,7 @@
import java.util.List;
import java.util.Map;
@@ -34,7 +34,7 @@ Origin: https://github.com/IDPF/epubcheck/commit/21cd661a19b58084175c97cb0e46ffd
import com.adobe.epubcheck.api.EPUBLocation;
import com.adobe.epubcheck.api.Report;
-@@ -102,7 +102,7 @@ public class PrefixDeclarationParser
+@@ -102,7 +102,7 @@
{
// empty prefix
report.message(MessageId.OPF_004a, location);
@@ -45,7 +45,7 @@ Origin: https://github.com/IDPF/epubcheck/commit/21cd661a19b58084175c97cb0e46ffd
report.message(MessageId.OPF_004b, location, chars);
--- a/src/main/java/com/adobe/epubcheck/xml/XMLValidator.java
+++ b/src/main/java/com/adobe/epubcheck/xml/XMLValidator.java
-@@ -56,6 +56,9 @@ import net.sf.saxon.Configuration;
+@@ -56,6 +56,9 @@
import net.sf.saxon.TransformerFactoryImpl;
import net.sf.saxon.sxpath.IndependentContext;
import net.sf.saxon.sxpath.XPathStaticContext;
@@ -55,13 +55,13 @@ Origin: https://github.com/IDPF/epubcheck/commit/21cd661a19b58084175c97cb0e46ffd
public class XMLValidator
{
-@@ -171,19 +174,22 @@ public class XMLValidator
+@@ -171,19 +174,22 @@
public void initTransformerFactory(TransformerFactory factory)
{
super.initTransformerFactory(factory);
-+ SymbolicName lineNumberFn = new SymbolicName(StandardNames.XSL_FUNCTION, LineNumberFunction.QNAME, 0);
-+ SymbolicName columnNumberFn = new SymbolicName(StandardNames.XSL_FUNCTION, ColumnNumberFunction.QNAME, 0);
-+ SymbolicName systemIdFn = new SymbolicName(StandardNames.XSL_FUNCTION, SystemIdFunction.QNAME, 0);
++ SymbolicName.F lineNumberFn = new SymbolicName.F(LineNumberFunction.QNAME, 0);
++ SymbolicName.F columnNumberFn = new SymbolicName.F(ColumnNumberFunction.QNAME, 0);
++ SymbolicName.F systemIdFn = new SymbolicName.F(SystemIdFunction.QNAME, 0);
if (factory instanceof TransformerFactoryImpl)
{
Configuration configuration = ((TransformerFactoryImpl) factory).getConfiguration();
@@ -83,7 +83,7 @@ Origin: https://github.com/IDPF/epubcheck/commit/21cd661a19b58084175c97cb0e46ffd
}
--- a/src/main/java/org/idpf/epubcheck/util/saxon/Int64ValueSequence.java
+++ b/src/main/java/org/idpf/epubcheck/util/saxon/Int64ValueSequence.java
-@@ -21,7 +21,7 @@ class Int64ValueSequence implements Sequ
+@@ -21,7 +21,7 @@
}
@Override
@@ -94,7 +94,7 @@ Origin: https://github.com/IDPF/epubcheck/commit/21cd661a19b58084175c97cb0e46ffd
return item.iterate();
--- a/src/main/java/org/idpf/epubcheck/util/saxon/SystemIdFunction.java
+++ b/src/main/java/org/idpf/epubcheck/util/saxon/SystemIdFunction.java
-@@ -94,7 +94,7 @@ public class SystemIdFunction extends Ex
+@@ -94,7 +94,7 @@
}
@Override
diff --git a/debian/patches/series b/debian/patches/series
index db76d4a..e81361c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
fixed_classpath.patch
-compatibility_with_saxon_9.7.patch
+compatibility_with_saxon_9.8.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/epubcheck.git
More information about the pkg-java-commits
mailing list