[jtharness] 01/04: Replaced 02_dependencies.patch with debian/ant.properties

[Emmanuel Bourg]

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

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

commit 9141e9fd74e773c004b6a92c7db522c82212f8f7
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Nov 28 13:09:55 2017 +0100

    Replaced 02_dependencies.patch with debian/ant.properties
---
 debian/ant.properties                |  5 +++++
 debian/changelog                     |  7 +++++++
 debian/patches/02_dependencies.patch | 29 -----------------------------
 debian/patches/series                |  1 -
 debian/rules                         |  5 ++---
 5 files changed, 14 insertions(+), 33 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
new file mode 100644
index 0000000..a51ca88
--- /dev/null
+++ b/debian/ant.properties
@@ -0,0 +1,5 @@
+jcommjar = /usr/share/java/RXTXcomm.jar
+servletjar = /usr/share/java/servlet-api-3.1.jar
+bytecodelib = /usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar
+junitlib = /usr/share/java/junit4.jar
+BUILD_DIR = ./jar-build
diff --git a/debian/changelog b/debian/changelog
index f5b2a3e..dfe7425 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jtharness (5.0-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Replaced 02_dependencies.patch with debian/ant.properties
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 28 Nov 2017 13:09:07 +0100
+
 jtharness (5.0-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/02_dependencies.patch b/debian/patches/02_dependencies.patch
deleted file mode 100644
index abf00f1..0000000
--- a/debian/patches/02_dependencies.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-## Description: Locate JAR on the system.
-## Origin/Author: Guillaume Mazoyer
-## Bug: bug URL
---- a/build/local.properties
-+++ b/build/local.properties
-@@ -26,18 +26,18 @@
- #
- 
- # location of jar with with implementation of java serial communications API
--jcommjar = comm.jar
-+jcommjar = /usr/share/java/RXTXcomm.jar
- 
- # location of jar with servlet API implementation
--servletjar = servlet-api.jar
-+servletjar = /usr/share/java/servlet-api-3.1.jar
- 
- # bytecode library (BCEL or ASM)
- # these are not interchangable
--bytecodelib = asm-3.1.jar:asm-commons-3.1.jar
-+bytecodelib = /usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar
- 
- # JUnit Library - Version 4 currently used to compile 3 and 4 support
--junitlib = junit-4.4.jar
-+junitlib = /usr/share/java/junit4.jar
- 
- # Please specify location where the build distribution (output) will be created
--BUILD_DIR = ../JTHarness-build
-+BUILD_DIR = ./jar-build
- 
diff --git a/debian/patches/series b/debian/patches/series
index c62e561..6e1ea93 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01_imports.patch
-02_dependencies.patch
diff --git a/debian/rules b/debian/rules
index c4419e3..a65b3e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,10 +3,10 @@
 JAVA_HOME = /usr/lib/jvm/default-java
 
 %:
-	dh $@ --with javahelper
+	dh $@ --buildsystem=ant --with javahelper
 
 override_dh_auto_build:
-	ant -f build/build.xml
+	dh_auto_build -- -f build/build.xml
 
 	# Remove javatest.jar in the tutorial...
 	rm jar-build/binaries/examples/tutorial/demots/lib/javatest.jar
@@ -22,4 +22,3 @@ override_dh_compress:
 
 override_dh_auto_clean:
 	rm -Rf jar-build
-	dh_auto_clean

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