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

[Andrew Harvey]

The following commit has been merged in the master branch:
commit 4255c5a3aefa53f8d13e2d4fc57678215d329297
Author: Andrew Harvey <andrew.harvey4 at gmail.com>
Date:   Fri Mar 15 20:23:13 2013 +1100

    keep JMapViewer_Demo.jar separate from the jmapviewer.jar library

diff --git a/debian/jmapviewer_demo.sh b/debian/jmapviewer_demo.sh
index 9d430dc..ea62fa7 100644
--- a/debian/jmapviewer_demo.sh
+++ b/debian/jmapviewer_demo.sh
@@ -2,5 +2,5 @@
 # Simple wrapper script used to start JMapViewer_Demo in Debian
 set -e
 
-java -Djava.net.useSystemProxies=true -jar /usr/share/jmapviewer/JMapViewer.jar "$@"
+java -Djava.net.useSystemProxies=true -jar /usr/share/jmapviewer/JMapViewer_Demo.jar "$@"
 
diff --git a/debian/rules b/debian/rules
index d5309e3..4c23b1e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ 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_Demo.jar $(CURDIR)/debian/jmapviewer/usr/share/jmapviewer/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:

-- 
Java OpenStreetMap Tile Viewer