[libandroid-json-org-java] 01/05: Build with maven-debian-helper

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository libandroid-json-org-java.

commit 6b8beef4f1852004699575d8aeb84cea24fb75ec
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 14 17:36:52 2015 +0100

    Build with maven-debian-helper
---
 debian/changelog                     |  7 +++++++
 debian/clean                         |  2 --
 debian/control                       |  3 +--
 debian/libandroid-json-org-java.poms |  2 +-
 debian/maven.rules                   |  1 +
 debian/rules                         | 17 +++++------------
 6 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c7f78cb..c631b6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libandroid-json-org-java (20121204-20090211-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Build with maven-debian-helper
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 14 Dec 2015 17:36:09 +0100
+
 libandroid-json-org-java (20121204-20090211-1) unstable; urgency=low
 
   * Initial release (Closes: #697311)
diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index c72ab03..0000000
--- a/debian/clean
+++ /dev/null
@@ -1,2 +0,0 @@
-pom.xml
-
diff --git a/debian/control b/debian/control
index 1a2fe2a..f56a6f2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Thomas Koch <thomas at koch.ro>
-Build-Depends: debhelper (>= 9), cdbs, default-jdk, maven-debian-helper (>= 1.5), junit4,
- maven-repo-helper (>= 1.7.1)
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.5), junit4
 Build-Depends-Indep: default-jdk-doc, libmaven-javadoc-plugin-java
 Standards-Version: 3.9.4
 Vcs-Git: git://anonscm.debian.org/pkg-java/libandroid-json-org-java.git
diff --git a/debian/libandroid-json-org-java.poms b/debian/libandroid-json-org-java.poms
index 1b39c11..d1bc50d 100644
--- a/debian/libandroid-json-org-java.poms
+++ b/debian/libandroid-json-org-java.poms
@@ -25,4 +25,4 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-pom.xml --has-package-version --java-lib --usj-name=json --artifact=target/json-20090211.jar
+pom.xml --has-package-version --java-lib --usj-name=json
diff --git a/debian/maven.rules b/debian/maven.rules
index e6f0470..9cf4b55 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -17,3 +17,4 @@
 #   junit junit jar s/3\..*/3.x/
 
 org.json json jar s/.*/debian/ * *
+junit junit jar s/4\..*/4.x/
diff --git a/debian/rules b/debian/rules
index 082fa2c..524ce16 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,21 +1,14 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/buildvars.mk
-include /usr/share/cdbs/1/class/maven-vars.mk
-
-JAVA_HOME      := /usr/lib/jvm/default-java
-#DEB_MAVEN_ARGS := --debug -e
+export JAVA_HOME = /usr/lib/jvm/default-java
 
 %:
-	dh $@ --with maven_repo_helper
+	dh $@ --buildsystem=maven
 
 override_dh_auto_configure:
-	dh_testdir
 	cp debian/debian.pom.xml pom.xml
-
-override_dh_auto_build:
-	$(DEB_MAVEN_INVOKE) $(DEB_MAVEN_BUILD_TARGET)
-	$(DEB_MAVEN_INVOKE) $(DEB_MAVEN_DOC_TARGET)
+	dh_auto_configure
 
 override_dh_auto_clean:
-	rm -rf target
+	dh_auto_clean
+	rm -f pom.xml

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