[maven-resources-plugin] 22/24: Build with the DH sequencer instead of CDBS

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Dec 9 14:43:53 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-resources-plugin.

commit ce22779823e3dda0db9758a10a61302dbf09c44b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Dec 9 15:26:29 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index e07abc7..dc63380 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ maven-resources-plugin (2.6-1) UNRELEASED; urgency=medium
   * Moved the package to Git
   * Standards-Version updated to 3.9.6 (no changes)
   * Removed the javadoc package
+  * Build with the DH sequencer instead of CDBS
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 09 Dec 2015 10:49:02 +0100
 
diff --git a/debian/control b/debian/control
index a56d51d..a330c95 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: Torsten Werner <twerner 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: libmaven-filtering-java,
                      libmaven-plugin-testing-java,
                      libmaven-plugin-tools-java,
diff --git a/debian/rules b/debian/rules
index b76c54a..9867785 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 --no-symlink

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



More information about the pkg-java-commits mailing list