[libnetx-java] 09/13: 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 libnetx-java.

commit 1120b9f0bbb18c53b9a3f65842dd82741f4cf7f8
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Nov 28 12:39:39 2017 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 1f5292d..4572031 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,12 @@
 libnetx-java (0.5-3) UNRELEASED; urgency=low
 
   * Team upload.
-
-  [ Varun Hiremath ]
-  * NOT RELEASED YET
-  * Replace ANT_OPTS with ANT_ARGS in debian/rules
-
-  [ Emmanuel Bourg ]
+  * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 4.1.1
   * Switch to debhelper level 10
 
- -- Varun Hiremath <varun at debian.org>  Sun, 11 Apr 2010 01:49:16 -0400
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 28 Nov 2017 12:32:46 +0100
 
 libnetx-java (0.5-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index b71357d..fed6a1b 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Uploaders:
  Torsten Werner <twerner at debian.org>
 Build-Depends:
  ant,
- cdbs,
  debhelper (>= 10),
  default-jdk
 Standards-Version: 4.1.1
diff --git a/debian/rules b/debian/rules
index d3641d8..c100c87 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,18 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/dpkg/pkg-info.mk
 
-JAVA_HOME 		:= /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET	:= jar javadoc
-ANT_ARGS	        := -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4
+%:
+	dh $@
 
-install/libnetx-java::
-	install -m 644 -D netx.jar $(DEB_DESTDIR)/usr/share/java/netx-$(DEB_UPSTREAM_VERSION).jar
-	dh_link /usr/share/java/netx-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/netx.jar
+override_dh_auto_build:
+	dh_auto_build -- jar javadoc -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4
+
+override_dh_auto_install:
+	install -m 644 -D netx.jar debian/libnetx-java/usr/share/java/netx-$(DEB_VERSION_UPSTREAM).jar
+	dh_link /usr/share/java/netx-$(DEB_VERSION_UPSTREAM).jar /usr/share/java/netx.jar
+
+override_dh_auto_clean:
 
 get-orig-source:
-	-uscan --upstream-version 0	
+	-uscan --upstream-version 0

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