[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3208-1-11-g45abf2d

[David Paleino]

The following commit has been merged in the master branch:
commit 1261d874598a0242f0bf861aff5d1eac32810549
Author: David Paleino <dapal at debian.org>
Date:   Tue Jun 15 21:14:56 2010 +0200

    debian/rules converted to dh7

diff --git a/debian/changelog b/debian/changelog
index bd5ea87..60603e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ josm (0.0.svn3329-1) UNRELEASED; urgency=low
 
   * New upstream release
   * debian/patches/* refreshed
+  * debian/rules converted to dh7
 
- -- David Paleino <dapal at debian.org>  Sat, 12 Jun 2010 13:15:25 +0200
+ -- David Paleino <dapal at debian.org>  Tue, 15 Jun 2010 21:14:44 +0200
 
 josm (0.0.svn3208-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 45da31a..3e16eae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,7 @@
 #!/usr/bin/make -f
-# debian/rules file for josm (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
-ANT_ARGS := -Ddebian.version=${DEB_VERSION}
-DEB_ANT_BUILD_TARGET := dist
-
-# Dependencies
-DEB_JARS := /usr/share/java/gettext-commons.jar
-DEB_JARS += /usr/share/java/metadata-extractor.jar
-# Docs are already included in the jar file and can be accessed from within josm.
-#DEB_INSTALL_DOCS_ALL :=
+
+export JAVA_HOME=/usr/lib/jvm/default-java
+export CLASSPATH=/usr/share/java/gettext-commons.jar:/usr/share/java/metadata-extractor.jar
 
 SVNREPO := http://josm.openstreetmap.de/svn/trunk
 SVNI18NREPO := http://svn.openstreetmap.org/applications/editors/josm/i18n/
@@ -27,7 +15,19 @@ endif
 DESTDIR := ../tarballs/josm-${VERSION}
 DESTTGZ := ../tarballs/josm_${VERSION}.orig.tar.gz
 
-install/josm::
+DEB_VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d\  -f2)
+
+# Docs are already included in the jar file and can be accessed from within josm.
+#DEB_INSTALL_DOCS_ALL :=
+
+%:
+	dh $@
+
+override_dh_auto_build:
+	dh_auto_build -- -Ddebian.version=${DEB_VERSION} dist
+
+override_dh_auto_install:
+	dh_auto_install
 	install -m 644 $(CURDIR)/dist/josm-custom.jar $(CURDIR)/debian/josm/usr/share/josm/josm-${DEB_UPSTREAM_VERSION}.jar
 	dh_link usr/share/josm/josm-${DEB_UPSTREAM_VERSION}.jar usr/share/josm/josm.jar
 	install -m 755 $(CURDIR)/debian/josm.sh $(CURDIR)/debian/josm/usr/bin/josm
@@ -35,6 +35,7 @@ install/josm::
 	install -m 644 $(CURDIR)/debian/icons/josm-32.xpm $(CURDIR)/debian/josm/usr/share/pixmaps/josm-32.xpm
 	install -m 644 $(CURDIR)/debian/josm.desktop $(CURDIR)/debian/josm/usr/share/applications/josm.desktop
 
+
 get-orig-source:
 	dh_testdir
 	test -d ../tarballs/. || mkdir -p ../tarballs
@@ -57,4 +58,3 @@ get-orig-source:
 	@echo To update debian/changelog type
 	@echo dch -v ${VERSION}-1
 	@echo .
-

-- 
Java OpenStreetMap editor