[osmosis] 10/28: Remove dependencies on ant, gradle now used for build.

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch master
in repository osmosis.

commit 9df36e44f0094791f7480bddce91ffe8550fe4e3
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Mar 16 15:28:08 2014 +0100

    Remove dependencies on ant, gradle now used for build.
---
 debian/changelog | 2 ++
 debian/control   | 5 ++---
 debian/rules     | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 86a0d08..75b8fc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ osmosis (0.43.1-1) UNRELEASED; urgency=low
   * Restructure control file with cme, changes: Vcs-* URLs.
   * Add gbp.conf to use pristine-tar by default.
   * Drop get-orig-source target, repacking no longer required.
+  * Remove dependencies on ant, gradle now used for build.
+    (closes: 703635)
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sun, 16 Mar 2014 15:17:02 +0100
 
diff --git a/debian/control b/debian/control
index 0f9c043..b9c847f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Uploaders: David Paleino <dapal at debian.org>,
            Bas Couwenberg <sebastic at xs4all.nl>
 Section: utils
 Priority: optional
-Build-Depends: ant,
+Build-Depends: gradle,
                ant-optional,
                debhelper (>= 8~),
                libcommons-codec-java,
@@ -36,8 +36,7 @@ Homepage: http://wiki.openstreetmap.org/wiki/Osmosis
 
 Package: osmosis
 Architecture: all
-Depends: ant,
-         default-jre-headless | java6-runtime-headless,
+Depends: default-jre-headless | java6-runtime-headless,
          libcommons-codec-java,
          libcommons-compress-java (>= 1.2),
          libcommons-dbcp-java,
diff --git a/debian/rules b/debian/rules
index 4c71d24..f9c94b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,11 +36,11 @@ debian/osmosis.1: debian/osmosis.xml
 
 override_dh_auto_build:
 	echo $(CLASSPATH)
-	dh_auto_build -- -Dproject.version=$(CURVER)
+	gradle build
 
 override_dh_clean:
 	dh_clean
-	rm -rf build/ package/build/ package/lib/ debian/ivy-cache/
+	gradle clean
 
 override_dh_installchangelogs:
 	dh_installchangelogs -- package/changes.txt

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