[Pkg-osm-commits] [SCM] jmapviewer branch, master, updated. upstream/0.0+svn29245+dfsg-27-gc4a178a

[Felix Natter]

The following commit has been merged in the master branch:
commit c4a178ae84614283aad235e3c60e54c4d7b79645
Author: Felix Natter <fnatter at gmx.net>
Date:   Thu Oct 3 12:44:39 2013 +0200

    remove svn stuff from debian/rules

diff --git a/debian/rules b/debian/rules
index e6090f4..69fa67d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,15 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+# SVNREPO := http://svn.openstreetmap.org/applications/viewer/jmapviewer/
 
-SVNREPO := http://svn.openstreetmap.org/applications/viewer/jmapviewer/
+# SVNREV=$(shell dpkg-parsechangelog | sed -rne 's,^Version: .*[+~]svn([0-9]+).*,\1,p')
+# VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
 
-SVNREV=$(shell dpkg-parsechangelog | sed -rne 's,^Version: .*[+~]svn([0-9]+).*,\1,p')
-VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
+# DESTDIR := ../tarballs/jmapviewer-${VER}
+# DESTTGZ := ../tarballs/jmapviewer_${VER}.orig.tar.gz
 
-DESTDIR := ../tarballs/jmapviewer-${VER}
-DESTTGZ := ../tarballs/jmapviewer_${VER}.orig.tar.gz
+VER=1.0
 
 %:
 	dh $@
@@ -19,23 +20,11 @@ override_dh_auto_clean:
 
 override_dh_auto_install:
 	dh_auto_install
-	install -m 644 $(CURDIR)/JMapViewer.jar $(CURDIR)/debian/jmapviewer/usr/share/java/jmapviewer-${SVNREV}.jar
-	dh_link usr/share/java/jmapviewer-${SVNREV}.jar usr/share/java/jmapviewer.jar
+	install -m 644 $(CURDIR)/JMapViewer.jar $(CURDIR)/debian/jmapviewer/usr/share/java/jmapviewer-${VER}.jar
+	dh_link usr/share/java/jmapviewer-${VER}.jar usr/share/java/jmapviewer.jar
 	install -m 644 $(CURDIR)/JMapViewer_Demo.jar $(CURDIR)/debian/jmapviewer/usr/share/jmapviewer/JMapViewer_Demo.jar
 	install -m 755 $(CURDIR)/debian/jmapviewer_demo.sh $(CURDIR)/debian/jmapviewer/usr/bin/jmapviewer
 
-# get-orig-source:
-# #	dh_testdir
-# 	test -d ../tarballs/. || mkdir -p ../tarballs
-# 	@echo Downloading jmapviewer from ${SVNREPO}
-# 	svn export -r ${SVNREV} ${SVNREPO} ${DESTDIR}
-# 	@echo Removing non-source files
-# 	rm -rf ${DESTDIR}/releases/
-# 	rm ${DESTDIR}/src/org/openstreetmap/gui/jmapviewer/images/bing_maps.png
-# 	tar -cz --owner root --group root --mode a+rX -f ${DESTTGZ} -C `dirname ${DESTDIR}` `basename ${DESTDIR}`
-# 	@echo Cleaning up
-# 	rm -rf ${DESTDIR}
-
 get-orig-source:
 	uscan --download --repack --destdir ..
 

-- 
Java OpenStreetMap Tile Viewer