[libxerces2-java] 60/61: Build with the DH sequencer instead of CDBS

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libxerces2-java.

commit d8e17d35c0f4497cc3284de6ae7833318bddf75b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Jun 18 19:05:14 2017 +0200

    Build with the DH sequencer instead of CDBS
---
 debian/ant.properties              |  4 ++++
 debian/changelog                   |  1 +
 debian/clean                       |  1 +
 debian/control                     |  1 -
 debian/libxerces2-java-doc.install |  1 +
 debian/libxerces2-java.install     |  1 +
 debian/libxerces2-java.poms        |  3 +--
 debian/rules                       | 35 +++++++++--------------------------
 8 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
new file mode 100644
index 0000000..9771673
--- /dev/null
+++ b/debian/ant.properties
@@ -0,0 +1,4 @@
+ant.build.javac.source=1.4
+ant.build.javac.target=1.4
+javac.source=1.4
+javac.target=1.4
diff --git a/debian/changelog b/debian/changelog
index 90d604f..550ab94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxerces2-java (2.11.0-8) UNRELEASED; urgency=medium
 
   * Team upload.
   * Removed the GCJ package
+  * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 3.9.8
   * Switch to debhelper level 10
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..567609b
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+build/
diff --git a/debian/control b/debian/control
index bb438bf..7ad46e9 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,6 @@ Uploaders:
  Emmanuel Bourg <ebourg at apache.org>
 Build-Depends:
  ant,
- cdbs (>= 0.4.8),
  debhelper (>= 10),
  default-jdk,
  javahelper,
diff --git a/debian/libxerces2-java-doc.install b/debian/libxerces2-java-doc.install
new file mode 100644
index 0000000..e815b13
--- /dev/null
+++ b/debian/libxerces2-java-doc.install
@@ -0,0 +1 @@
+build/docs/javadocs/*  usr/share/doc/libxerces2-java-doc/api
diff --git a/debian/libxerces2-java.install b/debian/libxerces2-java.install
new file mode 100644
index 0000000..d922827
--- /dev/null
+++ b/debian/libxerces2-java.install
@@ -0,0 +1 @@
+build/xercesSamples.jar /usr/share/java/
diff --git a/debian/libxerces2-java.poms b/debian/libxerces2-java.poms
index 1b8f054..360e0d3 100644
--- a/debian/libxerces2-java.poms
+++ b/debian/libxerces2-java.poms
@@ -1,2 +1 @@
-debian/pom.xml --no-parent
-
+debian/pom.xml --no-parent --has-package-version --java-lib --artifact=build/xercesImpl.jar
diff --git a/debian/rules b/debian/rules
index af50d6d..4752ef1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,37 +1,20 @@
 #!/usr/bin/make -f
-# debian/rules file for libxerces2-java (uses cdbs)
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/javahelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+VERSION := 2.11.0
 
-PACKAGE              := $(DEB_SOURCE_PACKAGE)
-VERSION              := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME            := /usr/lib/jvm/default-java
-ANT_HOME             := /usr/share/ant
-ANT_OPTS = -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 -Djavac.source=1.4 -Djavac.target=1.4
+%:
+	dh $@ --with maven-repo-helper --with javahelper
 
-# Ant targets to call
-DEB_ANT_CLEAN_TARGET := clean
-DEB_ANT_BUILD_TARGET := jar sampjar javadocs 
-#docs
+override_dh_auto_build:
+	dh_auto_build -- jar sampjar javadocs
 
-install/$(PACKAGE)::
-	mh_installpoms -p$(PACKAGE);
-	mh_installjar -p$(PACKAGE) -l debian/pom.xml $(DEB_BUILDDIR)/build/xercesImpl.jar
-	dh_install -p$(PACKAGE) $(DEB_BUILDDIR)/build/xercesSamples.jar /usr/share/java/
+override_dh_compress:
+	dh_compress -X.java
 
-clean::
-	rm -rf build
-	-rm -rf debian/tmp
-	mh_clean
-
-binary-post-install/libxerces2-java-doc::
-	dh_install -plibxerces2-java-doc build/docs/javadocs/* \
-			usr/share/doc/libxerces2-java-doc/api
+override_dh_auto_clean:
 
 get-orig-source:
-	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename --repack
+	-uscan --download-current-version --force-download --rename --repack
 
 get-orig-pom:
 	wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/xerces/xercesImpl/$(VERSION)/xercesImpl-$(VERSION).pom

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libxerces2-java.git