[libcofoja-java] 08/12: Removed debian/local.properties and use Ant command line arguments instead

[Emmanuel Bourg]

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

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

commit aa8398b7868e3bcdf3d7637f8bc69a2554c68adf
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Apr 14 22:50:08 2014 +0200

    Removed debian/local.properties and use Ant command line arguments instead
---
 debian/changelog        |  1 +
 debian/local.properties | 23 -----------------------
 debian/rules            | 14 ++++----------
 3 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cffe9ad..7e599a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 cofoja (1.0~r139-3) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Removed debian/local.properties, use Ant command line arguments instead
   * debian/control:
     - Standards-Version updated to 3.9.5 (no changes)
     - Updated the package description
diff --git a/debian/local.properties b/debian/local.properties
deleted file mode 100644
index 4b389d0..0000000
--- a/debian/local.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-## You can override the following properties by creating
-## a 'local.properties' configuration file.
-
-## Version information. Set 'snapshot' to false if you are building
-## a release.
-version=1.0
-snapshot=false
-debug=false
-
-## Location of an older build of Cofoja, for bootstrapping purposes.
-bootstrap.jar=build/bootstrap.jar
-
-## Location of dependency JAR files needed to build Cofoja. The
-## defaults assume the JAR files are in the 'build' subdirectory,
-## except for 'tools.jar', which is probably not what you want.
-asm.jar=/usr/share/java/asm3-all.jar
-junit.jar=/usr/share/java/junit4.jar
-tools.jar=${java.home}/../lib/tools.jar
-
-## If you use Maven, the following may help, instead.
-# maven.repo.dir=${user.home}/.m2/repository
-# asm.jar=${maven.repo.dir}/asm/asm-all/3.3.1/asm-all-3.3.1.jar
-# junit.jar=${maven.repo.dir}/junit/junit/4.8.2/junit-4.8.2.jar
diff --git a/debian/rules b/debian/rules
index c5a18af..e10f70d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,12 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-JAVA_HOME=/usr/lib/jvm/default-java
-CLASSPATH=/usr/share/java/asm3-all.jar
+export JAVA_HOME=/usr/lib/jvm/default-java
 
 %:
-	dh $@  --with javahelper
+	dh $@  --with javahelper --buildsystem ant
 
-override_dh_auto_configure:
-	cp debian/local.properties local.properties
-	dh_auto_configure
+override_dh_auto_build:
+	dh_auto_build -- -Dasm.jar=/usr/share/java/asm3-all.jar -Djunit.jar=/usr/share/java/junit4.jar
 
 get-orig-source:
 	debian/get-orig-source.sh

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