[libcommons-cli-java] 25/31: use maven-debian-helper

[Tony Mancill]

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

tmancill pushed a commit to branch master
in repository libcommons-cli-java.

commit b0288d1c1276306b0c54ff6a66ceec0330f142d5
Author: tony mancill <tmancill at debian.org>
Date:   Mon Jun 22 05:04:58 2015 +0000

    use maven-debian-helper
---
 debian/control | 11 +++++++++--
 debian/rules   | 12 ++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index 709aa93..836e9e3 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,15 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Ludovic Claude <ludovic.claude at laposte.net>,
  tony mancill <tmancill at debian.org>
-Build-Depends: debhelper (>= 9), cdbs (>= 0.4.8), default-jdk
-Build-Depends-Indep: maven-ant-helper, maven-repo-helper, ant, ant-optional, libcommons-lang-java (>= 2.0), junit
+Build-Depends: debhelper (>= 9),
+ cdbs (>= 0.4.8),
+ default-jdk,
+ maven-debian-helper,
+ maven-repo-helper,
+ ant,
+ ant-optional,
+ libcommons-lang-java (>= 2.0),
+ junit
 Standards-Version: 3.9.6
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-cli-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-cli-java/
diff --git a/debian/rules b/debian/rules
index abd5653..8148c10 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,17 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/class/maven.mk
 
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := ant-nodeps junit commons-lang ant-junit
-DEB_ANT_BUILD_TARGET := package #javadoc
-DEB_ANT_BUILDFILE    := /usr/share/maven-ant-helper/maven-build.xml
-DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dbin.package=$(PACKAGE) -Dversion=$(VERSION)
+#DEB_JARS             := ant-nodeps junit commons-lang ant-junit
+#DEB_ANT_BUILD_TARGET := package #javadoc
+#DEB_ANT_BUILDFILE    := /usr/share/maven-ant-helper/maven-build.xml
+#DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dbin.package=$(PACKAGE) -Dversion=$(VERSION)
 
 binary-post-install/$(PACKAGE)::
 	mh_installpoms -p$(PACKAGE)

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