diff -Nru saxonb-9.1.0.8+dfsg/debian/build.xml saxonb-9.1.0.8+dfsg/debian/build.xml
--- saxonb-9.1.0.8+dfsg/debian/build.xml 2013-05-15 11:08:12.000000000 +0000
+++ saxonb-9.1.0.8+dfsg/debian/build.xml 2018-04-06 13:34:52.000000000 +0000
@@ -7,8 +7,13 @@
-
+
+
+
+
+
+
diff -Nru saxonb-9.1.0.8+dfsg/debian/changelog saxonb-9.1.0.8+dfsg/debian/changelog
--- saxonb-9.1.0.8+dfsg/debian/changelog 2013-09-18 12:48:18.000000000 +0000
+++ saxonb-9.1.0.8+dfsg/debian/changelog 2018-04-06 14:23:04.000000000 +0000
@@ -1,3 +1,20 @@
+saxonb (9.1.0.8+dfsg-2) unstable; urgency=medium
+
+ * Team upload.
+
+ [ Rene Engelhard ]
+ * remove myself from Uploaders:
+
+ [ Emmanuel Bourg ]
+ * Fixed the build failure with Java 9 (Closes: #893412)
+ * Build with the DH sequencer instead of CDBS
+ * Moved the javadoc to /usr/share/doc/libsaxonb-java/api/
+ * Moved the package to Git
+ * Standards-Version updated to 4.1.4
+ * Switch to debhelper level 11
+
+ -- Emmanuel Bourg Fri, 06 Apr 2018 16:23:04 +0200
+
saxonb (9.1.0.8+dfsg-1) unstable; urgency=low
* Non-free upstream source removed, dfsg suffix added (Closes: #721925)
diff -Nru saxonb-9.1.0.8+dfsg/debian/clean saxonb-9.1.0.8+dfsg/debian/clean
--- saxonb-9.1.0.8+dfsg/debian/clean 1970-01-01 00:00:00.000000000 +0000
+++ saxonb-9.1.0.8+dfsg/debian/clean 2018-04-06 13:38:48.000000000 +0000
@@ -0,0 +1,2 @@
+build/net/
+dist/
diff -Nru saxonb-9.1.0.8+dfsg/debian/compat saxonb-9.1.0.8+dfsg/debian/compat
--- saxonb-9.1.0.8+dfsg/debian/compat 2009-09-25 18:46:44.000000000 +0000
+++ saxonb-9.1.0.8+dfsg/debian/compat 2018-04-06 13:17:22.000000000 +0000
@@ -1 +1 @@
-7
+11
diff -Nru saxonb-9.1.0.8+dfsg/debian/control saxonb-9.1.0.8+dfsg/debian/control
--- saxonb-9.1.0.8+dfsg/debian/control 2013-09-18 12:42:53.000000000 +0000
+++ saxonb-9.1.0.8+dfsg/debian/control 2018-04-06 13:22:52.000000000 +0000
@@ -2,20 +2,27 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers
-Uploaders: Rene Engelhard , Eugene Zhukov
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant (>= 1.7), maven-repo-helper
-Build-Depends-Indep: libdom4j-java, libjdom1-java, libxom-java
-Standards-Version: 3.9.4
+Uploaders: Eugene Zhukov
+Build-Depends:
+ ant (>= 1.7),
+ debhelper (>= 11),
+ default-jdk,
+ dh-exec,
+ libdom4j-java,
+ libjdom1-java,
+ libxom-java,
+ maven-repo-helper
+Standards-Version: 4.1.4
+Vcs-Git: https://anonscm.debian.org/git/pkg-java/saxonb.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/saxonb.git
Homepage: http://saxon.sourceforge.net/
-Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/saxonb
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/saxonb/
Package: libsaxonb-java
Architecture: all
Depends: libdom4j-java, libjdom1-java, libxom-java, ${misc:Depends}
Suggests: libsaxonb-java-doc
Description: Saxon-B XSLT Processor
- The saxon package is a collection of tools for processing XML documents and
+ The saxon package is a collection of tools for processing XML documents and
implements XSLT 2.0, XPath 2.0, and XQuery 1.0.
.
Saxon is known to work well for processing DocBook XML documents
@@ -27,7 +34,7 @@
Architecture: all
Depends: ${misc:Depends}
Description: Saxon-B XSLT Processor's documentation and javadoc
- The saxon package is a collection of tools for processing XML documents and
+ The saxon package is a collection of tools for processing XML documents and
implements XSLT 2.0, XPath 2.0, and XQuery 1.0.
.
This package contains the documentation and javadoc for Saxon.
diff -Nru saxonb-9.1.0.8+dfsg/debian/copyright saxonb-9.1.0.8+dfsg/debian/copyright
--- saxonb-9.1.0.8+dfsg/debian/copyright 2008-08-22 20:57:21.000000000 +0000
+++ saxonb-9.1.0.8+dfsg/debian/copyright 2018-04-06 13:16:16.000000000 +0000
@@ -1,4 +1,4 @@
-This package was debianized by Michael Koch on
+This package was debianized by Michael Koch on
Fri, 28 Dec 2007 17:18:24 -0400
It was downloaded from
@@ -439,4 +439,4 @@
copyright notice and this permission notice appear in supporting
documentation. CERN makes no representations about the suitability of
this software for any purpose. It is provided "as is" without expressed
- or implied warranty.
+ or implied warranty.
diff -Nru saxonb-9.1.0.8+dfsg/debian/libsaxonb-java-doc.doc-base saxonb-9.1.0.8+dfsg/debian/libsaxonb-java-doc.doc-base
--- saxonb-9.1.0.8+dfsg/debian/libsaxonb-java-doc.doc-base 2008-02-06 21:51:24.000000000 +0000
+++ saxonb-9.1.0.8+dfsg/debian/libsaxonb-java-doc.doc-base 2018-04-06 14:21:53.000000000 +0000
@@ -5,5 +5,5 @@
Section:Text
Format: HTML
-Index: /usr/share/doc/libsaxon8-java-doc/api/index.html
-Files: /usr/share/doc/libsaxon8-java-doc/api/*
+Index: /usr/share/doc/libsaxonb-java/api/index.html
+Files: /usr/share/doc/libsaxonb-java/api/*
diff -Nru saxonb-9.1.0.8+dfsg/debian/libsaxonb-java-doc.install saxonb-9.1.0.8+dfsg/debian/libsaxonb-java-doc.install
--- saxonb-9.1.0.8+dfsg/debian/libsaxonb-java-doc.install 2008-02-06 21:51:24.000000000 +0000
+++ saxonb-9.1.0.8+dfsg/debian/libsaxonb-java-doc.install 2018-04-06 14:21:15.000000000 +0000
@@ -1 +1 @@
-dist/api usr/share/doc/libsaxon8-java-doc
+dist/api usr/share/doc/libsaxonb-java
diff -Nru saxonb-9.1.0.8+dfsg/debian/libsaxonb-java.install saxonb-9.1.0.8+dfsg/debian/libsaxonb-java.install
--- saxonb-9.1.0.8+dfsg/debian/libsaxonb-java.install 2008-02-15 20:40:24.000000000 +0000
+++ saxonb-9.1.0.8+dfsg/debian/libsaxonb-java.install 2018-04-06 13:52:28.000000000 +0000
@@ -1,2 +1,3 @@
debian/scripts/saxonb-xquery /usr/bin
debian/scripts/saxonb-xslt /usr/bin
+dist/*.jar /usr/share/java/
diff -Nru saxonb-9.1.0.8+dfsg/debian/libsaxonb-java.links saxonb-9.1.0.8+dfsg/debian/libsaxonb-java.links
--- saxonb-9.1.0.8+dfsg/debian/libsaxonb-java.links 1970-01-01 00:00:00.000000000 +0000
+++ saxonb-9.1.0.8+dfsg/debian/libsaxonb-java.links 2018-04-06 13:55:22.000000000 +0000
@@ -0,0 +1,8 @@
+#!/usr/bin/dh-exec
+/usr/share/java/saxonb-ant-${VERSION}.jar /usr/share/java/saxonb-ant.jar
+/usr/share/java/saxonb-dom4j-${VERSION}.jar /usr/share/java/saxonb-dom4j.jar
+/usr/share/java/saxonb-dom-${VERSION}.jar /usr/share/java/saxonb-dom.jar
+/usr/share/java/saxonb-jdom-${VERSION}.jar /usr/share/java/saxonb-jdom.jar
+/usr/share/java/saxonb-sql-${VERSION}.jar /usr/share/java/saxonb-spl.jar
+/usr/share/java/saxonb-xom-${VERSION}.jar /usr/share/java/saxonb-xom.jar
+/usr/share/java/saxonb-xpath-${VERSION}.jar /usr/share/java/saxonb-xpath.jar
diff -Nru saxonb-9.1.0.8+dfsg/debian/libsaxonb-java.poms saxonb-9.1.0.8+dfsg/debian/libsaxonb-java.poms
--- saxonb-9.1.0.8+dfsg/debian/libsaxonb-java.poms 2013-04-03 10:56:27.000000000 +0000
+++ saxonb-9.1.0.8+dfsg/debian/libsaxonb-java.poms 2018-04-06 13:29:39.000000000 +0000
@@ -1 +1 @@
-debian/saxonb.pom --has-package-version
+debian/saxonb.pom --has-package-version --java-lib --usj-name=saxonb --artifact=dist/saxonb-9*.jar
diff -Nru saxonb-9.1.0.8+dfsg/debian/rules saxonb-9.1.0.8+dfsg/debian/rules
--- saxonb-9.1.0.8+dfsg/debian/rules 2013-09-18 12:42:53.000000000 +0000
+++ saxonb-9.1.0.8+dfsg/debian/rules 2018-04-06 14:17:08.000000000 +0000
@@ -1,45 +1,16 @@
#!/usr/bin/make -f
-#export DH_VERBOSE=1
+include /usr/share/dpkg/pkg-info.mk
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+export VERSION = $(DEB_VERSION_UPSTREAM)
-VERSION := $(DEB_UPSTREAM_VERSION)
+%:
+ dh $@ --buildsystem=ant --with maven-repo-helper --sourcedirectory=bj
-JAVA_HOME := /usr/lib/jvm/default-java
-ANT_HOME := /usr/share/ant
-
-DEB_JARS := dom4j jdom1 xom
-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-ant-$(VERSION).jar debian/libsaxonb-java/usr/share/java/saxonb-ant-$(VERSION).jar
- install -m 644 -D dist/saxonb-dom4j-$(VERSION).jar debian/libsaxonb-java/usr/share/java/saxonb-dom4j-$(VERSION).jar
- install -m 644 -D dist/saxonb-dom-$(VERSION).jar debian/libsaxonb-java/usr/share/java/saxonb-dom-$(VERSION).jar
- install -m 644 -D dist/saxonb-jdom-$(VERSION).jar debian/libsaxonb-java/usr/share/java/saxonb-jdom-$(VERSION).jar
- install -m 644 -D dist/saxonb-sql-$(VERSION).jar debian/libsaxonb-java/usr/share/java/saxonb-sql-$(VERSION).jar
- install -m 644 -D dist/saxonb-xom-$(VERSION).jar debian/libsaxonb-java/usr/share/java/saxonb-xom-$(VERSION).jar
- install -m 644 -D dist/saxonb-xpath-$(VERSION).jar debian/libsaxonb-java/usr/share/java/saxonb-xpath-$(VERSION).jar
- dh_link -p libsaxonb-java /usr/share/java/saxonb-ant-$(VERSION).jar /usr/share/java/saxonb-ant.jar
- dh_link -p libsaxonb-java /usr/share/java/saxonb-dom4j-$(VERSION).jar /usr/share/java/saxonb-dom4j.jar
- dh_link -p libsaxonb-java /usr/share/java/saxonb-dom-$(VERSION).jar /usr/share/java/saxonb-dom.jar
- dh_link -p libsaxonb-java /usr/share/java/saxonb-jdom-$(VERSION).jar /usr/share/java/saxonb-jdom.jar
- dh_link -p libsaxonb-java /usr/share/java/saxonb-sql-$(VERSION).jar /usr/share/java/saxonb-spl.jar
- 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
- mh_installpoms -plibsaxonb-java
- mh_installjar -l -nsaxonb -plibsaxonb-java debian/saxonb.pom dist/saxonb-$(VERSION).jar
-
-clean::
- mh_clean
-
-VERSION_DFSG := $(shell echo $(VERSION) | sed 's/+dfsg//')
-get-orig-source:
- uscan --download-version $(VERSION_DFSG) --force-download
+override_dh_auto_build:
+ dh_auto_build -- -f ../debian/build.xml jar javadoc -Dupstream-version=$(VERSION)
+
+override_dh_auto_clean:
get-orig-pom:
wget -O debian/saxonb.pom -U NoAgent-1.0 \