[libjettison-java] 19/34: 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 libjettison-java.

commit f64d8ba903ef3b38e0bcc0fcf0987c4aa80461c0
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Apr 20 14:12:27 2018 +0200

    Build with the DH sequencer instead of CDBS
---
 debian/changelog             |  1 +
 debian/control               |  1 -
 debian/libjettison-java.poms |  1 +
 debian/rules                 | 18 +++++++-----------
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aba32c3..4bac269 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libjettison-java (1.2-4) UNRELEASED; urgency=medium
 
   * Team upload.
+  * 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/control b/debian/control
index bba585b..98a12a5 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,
  maven-repo-helper
diff --git a/debian/libjettison-java.poms b/debian/libjettison-java.poms
new file mode 100644
index 0000000..8863dec
--- /dev/null
+++ b/debian/libjettison-java.poms
@@ -0,0 +1 @@
+debian/pom.xml --has-package-version --java-lib --artifact=jettison.jar
diff --git a/debian/rules b/debian/rules
index d71df49..b2037e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,14 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+%:
+	dh $@ --buildsystem=ant --with maven-repo-helper
 
-JAVA_HOME         := /usr/lib/jvm/default-java
-DEB_ANT_BUILDFILE := debian/build.xml
-PACKAGE           := jettison
-MAVEN_REPO        := http://repo1.maven.org/maven2
+override_dh_auto_build:
+	dh_auto_build -- -f debian/build.xml
 
-install/libjettison-java:: 
-	mh_installpom -plib$(PACKAGE)-java -e$(DEB_UPSTREAM_VERSION) debian/pom.xml
-	mh_installjar -plib$(PACKAGE)-java -e$(DEB_UPSTREAM_VERSION) -l debian/pom.xml $(PACKAGE).jar 
+override_dh_auto_clean:
+	dh_auto_build -- -f debian/build.xml clean
 
 get-orig-pom:
 	wget -U NoSuchBrowser/1.0 -O debian/pom.xml \
-        $(MAVEN_REPO)/org/codehaus/jettison/$(PACKAGE)/$(DEB_UPSTREAM_VERSION)/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).pom
-
+        https://repo1.maven.org/maven2/org/codehaus/jettison/jettison/$(DEB_UPSTREAM_VERSION)/jettison-$(DEB_UPSTREAM_VERSION).pom

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