[maven-javadoc-plugin] 04/05: Build with the DH sequencer instead of CDBS

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Nov 16 00:29:51 UTC 2015


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

ebourg-guest pushed a commit to branch master
in repository maven-javadoc-plugin.

commit 8ce31ab4d41a64e518f29f12a4137ae0f06e654a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Nov 16 01:27:20 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index dbd4161..2c500d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ maven-javadoc-plugin (2.10.3-2) UNRELEASED; urgency=medium
   * Use the SOURCE_DATE_EPOCH variable to set the current year displayed
     in the javadoc footer generated by the plugin.
   * No longer install maven-metadata-local.xml
+  * Build with the DH sequencer instead of CDBS
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 16 Nov 2015 01:00:40 +0100
 
diff --git a/debian/control b/debian/control
index 1ba467d..795ce07 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: Ludovic Claude <ludovic.claude at laposte.net>
-Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper (>> 0.4)
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>> 0.4)
 Build-Depends-Indep: clirr,
                      libbcel-java,
                      libcommons-lang-java,
diff --git a/debian/rules b/debian/rules
index b76c54a..9d34bb7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,9 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+export JAVA_HOME := /usr/lib/jvm/default-java
 
-JAVA_HOME := /usr/lib/jvm/default-java
+%:
+	dh $@ --buildsystem=maven
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-javadoc-plugin.git



More information about the pkg-java-commits mailing list