[mkgmap] 04/05: Use ant buildsystem instead of custom override.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository mkgmap.

commit ddfb496cffc66dc03503110cfc947cbdd327c26e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Dec 1 23:14:30 2015 +0100

    Use ant buildsystem instead of custom override.
    
    Bump -source from 1.5 to 1.7.
---
 debian/ant.properties | 4 ++--
 debian/changelog      | 1 +
 debian/rules          | 7 +++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
index 7385c7f..3eb03b7 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -1,2 +1,2 @@
-ant.build.javac.source=1.5
-ant.build.javac.target=1.5
+ant.build.javac.source=1.7
+ant.build.javac.target=1.7
diff --git a/debian/changelog b/debian/changelog
index cab20c7..7492397 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mkgmap (0.0.0+svn3652-1) UNRELEASED; urgency=medium
 
   * New upstream SVN snapshot.
+  * Use ant buildsystem instead of custom override.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 01 Dec 2015 22:59:16 +0100
 
diff --git a/debian/rules b/debian/rules
index 52e6104..e3b28dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,10 +7,9 @@
 JAVA_HOME=/usr/lib/jvm/default-java
 
 %:
-	dh $@ --with javahelper --parallel
-
-override_dh_auto_build:
-	ant
+	dh $@ --buildsystem=ant \
+	      --with javahelper \
+	      --parallel
 
 override_dh_auto_install:
 	dh_auto_install

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