[apache-log4j2] 02/04: Switch from cdbs to dh sequencer.

Markus Koschany apo-guest at moszumanska.debian.org
Sat Jan 9 13:38:11 UTC 2016


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

apo-guest pushed a commit to branch master
in repository apache-log4j2.

commit 624bc24dd6d699a0e9340916f040c0e9d38d0e31
Author: Markus Koschany <apo at debian.org>
Date:   Sat Jan 9 14:20:45 2016 +0100

    Switch from cdbs to dh sequencer.
---
 debian/control |  2 +-
 debian/rules   | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index f3a5fb0..57a642a 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: Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.5)
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.5)
 Build-Depends-Indep: default-jdk-doc,
                      libapache-pom-java (>= 10),
                      libcommons-compress-java,
diff --git a/debian/rules b/debian/rules
index 2219121..f503851 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,11 @@
 #!/usr/bin/make -f
+export JAVA_HOME=/usr/lib/jvm/default-java
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+%:
+	dh $@ --parallel --buildsystem=maven
 
-JAVA_HOME := /usr/lib/jvm/default-java
-
-DEB_MAVEN_DOC_TARGET := install javadoc:javadoc javadoc:aggregate
-DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt
+override_dh_installchangelogs:
+	dh_installchangelogs RELEASE-NOTES.txt
 
 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/apache-log4j2.git



More information about the pkg-java-commits mailing list