[apache-log4j-extras1.2] 05/07: Build with the DH sequencer instead of CDBS

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Aug 22 22:16:39 UTC 2017


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

ebourg-guest pushed a commit to branch master
in repository apache-log4j-extras1.2.

commit 1ec0cde3599d98585ee016ea610b0484a480c414
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Aug 23 00:09:46 2017 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 9ccdae8..17d7fc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 apache-log4j-extras1.2 (1.2.17-1.1) UNRELEASED; urgency=medium
 
   * Non-maintainer upload.
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 4.1.0
   * Switch to debhelper level 10
   * Use a secure Vcs-Git URL
diff --git a/debian/control b/debian/control
index 53efb91..de70a30 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Hilko Bengen <bengen at debian.org>
 Build-Depends:
- cdbs,
  debhelper (>= 10),
  default-jdk,
  default-jdk-doc,
@@ -16,7 +15,7 @@ Build-Depends:
  libmaven-assembly-plugin-java,
  libmaven-bundle-plugin-java,
  libmaven-javadoc-plugin-java,
- maven-debian-helper (>= 1.5)
+ maven-debian-helper (>= 2.2)
 Standards-Version: 4.1.0
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/apache-log4j-extras1.2.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/apache-log4j-extras1.2.git
diff --git a/debian/rules b/debian/rules
index 4a061cf..5985cac 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-current-version --force-download --no-symlink

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/apache-log4j-extras1.2.git



More information about the pkg-java-commits mailing list