[maven-bundle-plugin] 02/08: Build with the DH sequencer instead of CDBS

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Dec 7 11:25:32 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-bundle-plugin.

commit 2fed5b7a8daed77325482a35721613f582ab5b57
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 7 11:53:58 2015 +0100

    Build with the DH sequencer instead of CDBS
---
 debian/changelog | 7 +++++++
 debian/control   | 2 +-
 debian/rules     | 8 ++++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8ff5beb..cf716f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven-bundle-plugin (2.4.0-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Build with the DH sequencer instead of CDBS
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 07 Dec 2015 11:48:03 +0100
+
 maven-bundle-plugin (2.4.0-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 1e7c27b..fff014a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.4)
 Build-Depends-Indep: bnd (>= 2.1.0~),
                      default-jdk-doc,
                      libfelix-bundlerepository-java,
diff --git a/debian/rules b/debian/rules
index b76c54a..8dea969 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +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
+%:
+	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-bundle-plugin.git



More information about the pkg-java-commits mailing list