[args4j] 01/06: 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 args4j.

commit 9eac929491c774ccb38695958fb8e031569c1003
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jan 6 11:46:50 2016 +0100

    Build with the DH sequencer instead of CDBS
---
 debian/changelog         |  7 +++++++
 debian/control           |  5 +----
 debian/maven.ignoreRules |  1 +
 debian/rules             | 10 ++++------
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a1f78e2..d2479fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+args4j (2.0.30-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Build with the DH sequencer instead of CDBS
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 06 Jan 2016 11:41:25 +0100
+
 args4j (2.0.30-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 5c0d325..3e9d739 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,9 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: James Page <james.page at ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper
 Build-Depends-Indep: default-jdk-doc,
                      junit,
-                     libmaven-compiler-plugin-java (>= 2.0.2),
-                     libmaven-install-plugin-java,
-                     libmaven-jar-plugin-java (>= 2.2),
                      libmaven-javadoc-plugin-java,
                      libmaven-shade-plugin-java,
                      libmockito-java
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 62c9f7d..cf69e82 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -15,5 +15,6 @@
 #   junit junit jar s/3\\..*/3.x/
 
 org.apache.maven.plugins maven-changes-plugin * * * *
+org.apache.maven.plugins maven-project-info-reports-plugin * * * *
 org.apache.felix maven-bundle-plugin * * * *
 ant * * * * *
diff --git a/debian/rules b/debian/rules
index 25a33b8..8dea969 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,9 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+export JAVA_HOME = /usr/lib/jvm/default-java
 
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate
-DEB_MAVEN_BUILD_TARGET := install
+%:
+	dh $@ --buildsystem=maven
 
 get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+	uscan --download-current-version --force-download --rename

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