[localizer] 04/06: Build with the DH sequencer instead of CDBS

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Aug 2 10:29:24 UTC 2017


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

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

commit 85acf2ebc8d0b709ce0e4fdce821a838b44f93b8
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Aug 2 12:24:41 2017 +0200

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

diff --git a/debian/changelog b/debian/changelog
index c196ef4..b8c8d03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 localizer (1.13-3) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 4.0.0
   * Switch to debhelper level 10
   * Use secure Vcs-* URLs
diff --git a/debian/control b/debian/control
index 6513728..0da4df7 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: James Page <james.page at canonical.com>
-Build-Depends: cdbs, debhelper (>= 10), default-jdk, maven-debian-helper
+Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 2.2)
 Build-Depends-Indep:
  ant,
  ant-doc,
diff --git a/debian/rules b/debian/rules
index 25a33b8..5a6351f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +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
-DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate
-DEB_MAVEN_BUILD_TARGET := install
+%:
+	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/localizer.git



More information about the pkg-java-commits mailing list