This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository saxonb.
commit 5674ae8b2ab354ed3878cd61d865e0c5914edc9c Author: Emmanuel Bourg <ebo...@apache.org> Date: Fri Apr 6 16:20:54 2018 +0200 Build with the DH sequencer instead of CDBS --- debian/build.xml | 5 +++++ debian/changelog | 1 + debian/clean | 2 ++ debian/control | 2 +- debian/libsaxonb-java.install | 1 + debian/libsaxonb-java.links | 8 ++++++++ debian/libsaxonb-java.poms | 2 +- debian/rules | 39 +++++++-------------------------------- 8 files changed, 26 insertions(+), 34 deletions(-) diff --git a/debian/build.xml b/debian/build.xml index 4a94f9f..fc085bd 100644 --- a/debian/build.xml +++ b/debian/build.xml @@ -9,6 +9,11 @@ <mkdir dir="../build" /> <javac srcdir="../bj" destdir="../build" source="1.5" target="1.5" nowarn="true" encoding="ISO-8859-1"> <exclude name="**/dotnet/**" /> + <classpath> + <pathelement location="/usr/share/java/dom4j.jar"/> + <pathelement location="/usr/share/java/jdom1.jar"/> + <pathelement location="/usr/share/java/xom.jar"/> + </classpath> </javac> </target> diff --git a/debian/changelog b/debian/changelog index a35d949..ac9e1a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ saxonb (9.1.0.8+dfsg-2) UNRELEASED; urgency=medium [ Emmanuel Bourg ] * Fixed the build failure with Java 9 (Closes: #893412) + * Build with the DH sequencer instead of CDBS * Moved the package to Git * Standards-Version updated to 4.1.4 * Switch to debhelper level 11 diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..dbf010d --- /dev/null +++ b/debian/clean @@ -0,0 +1,2 @@ +build/net/ +dist/ diff --git a/debian/control b/debian/control index 4045c3d..c5c40fd 100644 --- a/debian/control +++ b/debian/control @@ -5,9 +5,9 @@ Maintainer: Debian Java Maintainers <pkg-java-maintain...@lists.alioth.debian.or Uploaders: Eugene Zhukov <jevgeni...@gmail.com> Build-Depends: ant (>= 1.7), - cdbs, debhelper (>= 11), default-jdk, + dh-exec, libdom4j-java, libjdom1-java, libxom-java, diff --git a/debian/libsaxonb-java.install b/debian/libsaxonb-java.install index e6a4a99..986d11f 100644 --- a/debian/libsaxonb-java.install +++ b/debian/libsaxonb-java.install @@ -1,2 +1,3 @@ debian/scripts/saxonb-xquery /usr/bin debian/scripts/saxonb-xslt /usr/bin +dist/*.jar /usr/share/java/ diff --git a/debian/libsaxonb-java.links b/debian/libsaxonb-java.links new file mode 100755 index 0000000..1df1dd1 --- /dev/null +++ b/debian/libsaxonb-java.links @@ -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 --git a/debian/libsaxonb-java.poms b/debian/libsaxonb-java.poms index 7bb4de5..3940a89 100644 --- a/debian/libsaxonb-java.poms +++ b/debian/libsaxonb-java.poms @@ -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 --git a/debian/rules b/debian/rules index bbc41ea..f639265 100755 --- a/debian/rules +++ b/debian/rules @@ -1,41 +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 +override_dh_auto_build: + dh_auto_build -- -f ../debian/build.xml jar javadoc -Dupstream-version=$(VERSION) -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 +override_dh_auto_clean: get-orig-pom: wget -O debian/saxonb.pom -U NoAgent-1.0 \ -- 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