[libaopalliance-java] 12/14: 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 libaopalliance-java.

commit cd3ef27c760c5641079e2dc590b263a5767205fb
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jan 12 14:13:48 2018 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 92f5f0d..f39171b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libaopalliance-java (20070526-6) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 4.1.3
   * Switch to debhelper level 10
diff --git a/debian/control b/debian/control
index 06961d1..56e90da 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 (>= 10),
  default-jdk,
  maven-repo-helper
diff --git a/debian/libaopalliance-java.poms b/debian/libaopalliance-java.poms
new file mode 100644
index 0000000..8795234
--- /dev/null
+++ b/debian/libaopalliance-java.poms
@@ -0,0 +1 @@
+debian/pom.xml --java-lib --artifact=build/aopalliance.jar
diff --git a/debian/rules b/debian/rules
index 0411459..3c20f9d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,10 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+%:
+	dh $@ --with maven-repo-helper
 
-JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET := zip
-
-binary-post-install/libaopalliance-java::
-	mh_installpom -plibaopalliance-java debian/pom.xml
-	mh_installjar -plibaopalliance-java -l debian/pom.xml build/aopalliance.jar
+override_dh_auto_build:
+	dh_auto_build -- zip
 
 get-orig-source:
 	sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION)
-

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