[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. debian/0.0.svn22363-1-37-gb3d3d09

[David Paleino]

The following commit has been merged in the master branch:
commit 6c695af33543c6a8ae9304f14a89e683c808c908
Author: David Paleino <dapal at debian.org>
Date:   Mon Sep 13 19:37:13 2010 +0200

    debian/rules rewritten to use dh7

diff --git a/debian/changelog b/debian/changelog
index c35c125..4614f06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ josm-plugins (0.0.svn23040-2) UNRELEASED; urgency=low
 
   * debian/control:
     - added two new packages: webkit-image-qt and webkit-image-gtk
+  * debian/rules rewritten to use dh7
 
- -- David Paleino <dapal at debian.org>  Mon, 13 Sep 2010 19:31:24 +0200
+ -- David Paleino <dapal at debian.org>  Mon, 13 Sep 2010 19:36:26 +0200
 
 josm-plugins (0.0.svn23040-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 7db6060..a74e686 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,7 @@
 #!/usr/bin/make -f
-# debian/rules file for josm-plugins (uses cdbs)
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-ANT_HOME  := /usr/share/ant
-DEB_JARS := /usr/share/josm/josm.jar
-DEB_JARS += /usr/share/java/metadata-extractor.jar
-DEB_ANT_BUILDFILE := $(CURDIR)/debian/master.xml
-
-DEB_ANT_BUILD_TARGET := build
-DEB_ANT_CLEAN_TARGET := clean
+export JAVA_HOME=/usr/lib/jvm/default-java
+export CLASSPATH=/usr/share/josm/josm.jar:/usr/share/java/metadata-extractor.jar
 
 SVNREPO := http://svn.openstreetmap.org/applications/editors/josm/plugins/
 PLUGINS := cadastre-fr colorscheme DirectUpload editgpx lakewalker livegps measurement openvisible routing slippymap surveyor wmsplugin remotecontrol
@@ -25,6 +15,15 @@ endif
 DESTDIR := ../tarballs/josm-plugins-${VERSION}
 DESTTGZ := ../tarballs/josm-plugins_${VERSION}.orig.tar.gz
 
+%:
+	dh $@ --with ant
+
+override_dh_auto_build:
+	and -f $(CURDIR)/debian/master.xml build
+
+override_dh_auto_clean:
+	ant -f $(CURDIR)/debian/master.xml clean
+
 get-orig-source:
 	dh_testdir
 	test -d ../tarballs/. || mkdir -p ../tarballs

-- 
Plugins for josm