[atinject-jsr330] 03/07: Ensure the build system used is ant and not maven

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository atinject-jsr330.

commit 3a63a69c7969c3ce79a03875495aed70399124ac
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Nov 13 20:23:00 2017 +0100

    Ensure the build system used is ant and not maven
---
 debian/changelog                        |  1 +
 debian/libatinject-jsr330-api-java.poms |  4 ++--
 debian/rules                            | 18 ++++--------------
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6b742be..770dfcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 atinject-jsr330 (1.0+ds1-4) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Ensure the build system used is ant and not maven
   * Updated the Homepage field
   * Track and download the releases from GitHub
 
diff --git a/debian/libatinject-jsr330-api-java.poms b/debian/libatinject-jsr330-api-java.poms
index 6171d85..135639a 100644
--- a/debian/libatinject-jsr330-api-java.poms
+++ b/debian/libatinject-jsr330-api-java.poms
@@ -25,5 +25,5 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-pom.xml
-debian/pom.xml
+debian/pom.xml --java-lib --usj-name=atinject-jsr330-api --artifact=build/javax.inject.jar
+pom.xml        --java-lib --usj-name=atinject-jsr330-tck --artifact=build/javax.inject-tck.jar
diff --git a/debian/rules b/debian/rules
index 359e101..e3df137 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,23 +2,13 @@
 
 include /usr/share/dpkg/default.mk
 
-export JAVA_HOME=/usr/lib/jvm/default-java
-VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed 's/\+ds1$$//')
-
 %:
-	dh $@ --with javahelper
-
-override_jh_build:
-	ant -f debian/build.xml
+	dh $@ --buildsystem=ant --with javahelper --with maven-repo-helper
 
-override_dh_install:
-	mh_installjar -plibatinject-jsr330-api-java -l --usj-name=atinject-jsr330-api -j$(VERSION) debian/pom.xml build/javax.inject.jar
-	mh_installjar -plibatinject-jsr330-api-java -l --usj-name=atinject-jsr330-tck -j$(VERSION) pom.xml build/javax.inject-tck.jar
-	mh_installpoms -plibatinject-jsr330-api-java
+override_dh_auto_build:
+	 dh_auto_build -- -f debian/build.xml
 
-override_dh_clean:
-	dh_clean
-	mh_clean
+override_dh_auto_clean:
 	rm -Rf build
 
 get-orig-source:

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