[maven-file-management] 14/21: Build with the DH sequencer instead of CDBS

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Jul 19 15:38:45 UTC 2017


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

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

commit d4d6b5272f07d57ce2ebf2cbf34a116f6e025e85
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jul 19 17:05:17 2017 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 74ed37d..7a6a569 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 maven-file-management (1.2.1-4) 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 a13a7e4..150fed2 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders:
  Torsten Werner <twerner at debian.org>,
  Ludovic Claude <ludovic.claude at laposte.net>
 Build-Depends:
- cdbs,
  debhelper (>= 10),
  default-jdk,
  default-jdk-doc,
@@ -20,7 +19,7 @@ Build-Depends:
  libplexus-container-default-java-doc,
  libplexus-utils-java,
  libplexus-utils-java-doc,
- maven-debian-helper (>= 1.4)
+ maven-debian-helper (>= 2.2)
 Standards-Version: 4.0.0
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven-file-management.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/maven-file-management.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/maven-file-management.git



More information about the pkg-java-commits mailing list