[netty-tcnative] 03/04: 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-tcnative.

commit 0f81d4c457592572b745cbcbb90a5b4ffef338de
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Jan 31 15:42:14 2016 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 4a7b334..dfabddf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ netty-tcnative (1.1.33.Fork11-1) UNRELEASED; urgency=medium
 
   * New upstream release:
     - Removed 805165_ssl.patch (fixed upstream)
+  * Build with the DH sequencer instead of CDBS
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sun, 31 Jan 2016 15:24:11 +0100
 
diff --git a/debian/control b/debian/control
index 0419f29..007cce9 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: Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: automake,
-               cdbs,
                debhelper (>= 9),
                default-jdk,
                libapr1-dev,
diff --git a/debian/rules b/debian/rules
index ca794f8..1bab9ea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,18 @@
 #!/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
-
 export DEB_BUILD_HARDENING=1
 
-common-build-arch::
+%:
+	dh $@ --buildsystem=maven
+
+override_dh_auto_build-arch:
 	mkdir -p target/native-build/src
 	cp -Rvp src/main/native-package/* target/native-build/
 	cp -Rvp src/main/c/* target/native-build/src/
 	cp -Rvp debian/native-build/* target/native-build/
 	cd target/native-build/ ; autoreconf --force --install -I m4 ; ./configure ; make
 
-common-install-arch::
+override_dh_auto_install-arch:
 	mv target/native-build/.libs/libnetty-tcnative- at VERSION@.so target/native-build/.libs/libnetty-tcnative.so
 	dh_install -p libnetty-tcnative-jni target/native-build/.libs/libnetty-tcnative.so usr/lib/${DEB_HOST_MULTIARCH}/jni
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netty-tcnative.git