[jexcelapi] 23/27: 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 jexcelapi.

commit a2b0195b5b4fae9fb8d326b077ecaced4764190c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Mar 26 02:37:21 2018 +0200

    Build with the DH sequencer instead of CDBS
---
 debian/changelog              |  1 +
 debian/control                |  1 -
 debian/libjexcelapi-java.poms |  2 +-
 debian/rules                  | 21 ++++++++-------------
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8cfe575..1492f5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ jexcelapi (2.6.12-3) UNRELEASED; urgency=medium
 
   * Team upload.
   * Removed Damien Raude-Morvan from the uploaders (Closes: #88935)
+  * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 4.1.3
   * Switch to debhelper level 11
diff --git a/debian/control b/debian/control
index b0d60fe..77592cd 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Torsten Werner <twerner at debian.org>
 Build-Depends:
  ant,
- cdbs,
  debhelper (>= 11),
  default-jdk,
  jflex,
diff --git a/debian/libjexcelapi-java.poms b/debian/libjexcelapi-java.poms
index 1a7e280..cb155d6 100644
--- a/debian/libjexcelapi-java.poms
+++ b/debian/libjexcelapi-java.poms
@@ -1 +1 @@
-debian/pom.xml
+debian/pom.xml --java-lib --artifact=jxl.jar
diff --git a/debian/rules b/debian/rules
index a9905c0..2de61be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,18 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
 POM_VERSION          := 2.6
 MAVEN_REPO           := http://repository.sonatype.org/service/local/repositories/central/content
 
-DEB_BUILDDIR         := build
-JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET := jxlall
-DEB_ANT_CLEAN_TARGET := init clean
-
+%:
+	dh $@ --buildsystem=ant --sourcedirectory=build --with maven-repo-helper
 
-binary-post-install/libjexcelapi-java::
-	mh_installpoms -plibjexcelapi-java
-	mh_installjar -plibjexcelapi-java -l debian/pom.xml jxl.jar
+override_dh_auto_build:
+	dh_auto_build -- jxlall
 
-clean::
-	-rm -rf debian/tmp
+override_dh_auto_clean:
+	mkdir -p build/out
+	dh_auto_clean -- init clean
+	rm -Rf docs
 
 get-orig-source:
 	uscan --upstream-version 0 --rename

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