[vorbis-java] 03/07: Build with the DH sequencer instead of CDBS

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Dec 16 08:15:41 UTC 2016


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

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

commit e5b1a5255e5d585a4fa7855b88d0677acceb4b6d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Dec 16 09:07:47 2016 +0100

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

diff --git a/debian/changelog b/debian/changelog
index fc667e2..9886452 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 vorbis-java (0.6-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build with the DH sequencer instead of CDBS
   * Use a secure Vcs-Git URL
   * Switch to debhelper level 10
 
diff --git a/debian/control b/debian/control
index 0a40c18..9caeeca 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,11 @@ 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 (>= 10),
+Build-Depends: debhelper (>= 10),
                default-jdk,
                junit4,
                libtika-java,
-               maven-debian-helper (>= 1.5)
+               maven-debian-helper (>= 2.0)
 Standards-Version: 3.9.6
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/vorbis-java.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/vorbis-java.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/vorbis-java.git



More information about the pkg-java-commits mailing list