[plexus-resources] 13/24: Build with the DH sequencer instead of CDBS

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Jul 27 11:07:35 UTC 2017


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

ebourg-guest pushed a commit to branch master
in repository plexus-resources.

commit 3d2951343e993a5ea7b47816e1255d21b516b6cb
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 27 11:16:45 2017 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 92d50c2..b9f02df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 plexus-resources (1.0~alpha7-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 4.0.0
   * Switch to debhelper level 10
diff --git a/debian/control b/debian/control
index 61e3bcc..4fcd631 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: Eugene Zhukov <jevgeni.zh at gmail.com>
-Build-Depends: debhelper (>= 10), cdbs, default-jdk, maven-debian-helper (>= 1.6.1)
+Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 1.6.1)
 Build-Depends-Indep: libplexus-containers1.5-java (>= 1.5.5), libplexus-utils-java, libmaven-antrun-plugin-java (>= 1.6)
 Standards-Version: 4.0.0
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/plexus-resources.git
diff --git a/debian/rules b/debian/rules
index b76c54a..5a6351f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
+%:
+	dh $@
 
 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/plexus-resources.git



More information about the pkg-java-commits mailing list