[netty] 03/05: Build with the DH sequencer instead of CDBS

[Emmanuel Bourg]

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

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

commit 61a978d7a6439d193587113b523d5123f08e2ff3
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Jan 31 22:13:07 2016 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 7dcc012..408c314 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ netty (1:4.0.34-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - Depend on netty-tcnative (>= 1.1.33.Fork11)
+  * Build with the DH sequencer instead of CDBS
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sun, 31 Jan 2016 22:03:38 +0100
 
diff --git a/debian/control b/debian/control
index 451ba83..e0f4f47 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Uploaders: Chris Grzegorczyk <grze at eucalyptus.com>,
            Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends: ant,
                ant-contrib (>= 1.0~b3+svn177-7~),
-               cdbs,
                debhelper (>= 9),
                default-jdk,
                ivy,
diff --git a/debian/rules b/debian/rules
index b6d95b5..aba914b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +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
-
-common-configure-indep::
-	# Create an empty manifest to workaround an issue with maven-jar-plugin
-	mkdir -p all/target/classes/META-INF/
-	touch all/target/classes/META-INF/MANIFEST.MF
+%:
+	dh $@ --buildsystem=maven
 
 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/netty.git