[maven-indexer] 01/03: Build with the DH sequencer instead of CDBS

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Dec 9 15:25:05 UTC 2015


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

ebourg-guest pushed a commit to branch master
in repository maven-indexer.

commit 828b892b41b40ea0e2741f0bf35191b3a4fa5c90
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Dec 9 16:18:13 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 5eaf383..5e03a13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven-indexer (5.1.1-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Build with the DH sequencer instead of CDBS
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 09 Dec 2015 16:14:04 +0100
+
 maven-indexer (5.1.1-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 4790009..f12f8d2 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: Andrew Ross <ubuntu at rossfamily.co.uk>
-Build-Depends: cdbs,
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                default-jdk,
                maven-debian-helper (>= 1.5)
 Build-Depends-Indep: libaether-java,
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index ce5447e..c6aa529 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -3,6 +3,7 @@ junit junit * * * *
 org.apache.maven.archetype archetype-common * * * *
 org.apache.maven.plugins maven-failsafe-plugin * * * *
 org.apache.maven.plugins maven-javadoc-plugin * * * *
+org.apache.maven.plugins maven-project-info-reports-plugin * * * *
 org.apache.maven.plugins maven-shade-plugin * * * *
 org.apache.maven.plugins maven-surefire-plugin * * * *
 org.apache.maven.wagon wagon-http-lightweight * * * *
diff --git a/debian/rules b/debian/rules
index 562f1f3..8dea969 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +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
+%:
+	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/maven-indexer.git



More information about the pkg-java-commits mailing list