[Pkg-osm-commits] [SCM] jmapviewer branch, master, updated. upstream/0.0+svn27079+dfsg-2-gbc2d9a7

[Andrew Harvey]

The following commit has been merged in the master branch:
commit bc2d9a7d043fa525b2f2717ca4971336171dcbf9
Author: Andrew Harvey <andrew.harvey4 at gmail.com>
Date:   Sat Nov 19 20:03:59 2011 +1100

    install library to /usr/share/java/

diff --git a/debian/jmapviewer.dirs b/debian/jmapviewer.dirs
index a08fbd0..7960fb1 100644
--- a/debian/jmapviewer.dirs
+++ b/debian/jmapviewer.dirs
@@ -1,2 +1,3 @@
 /usr/bin
+/usr/share/java
 /usr/share/jmapviewer
diff --git a/debian/rules b/debian/rules
index 187bc69..d5309e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,9 +14,9 @@ DESTTGZ := ../tarballs/jmapviewer_${VER}.orig.tar.gz
 
 override_dh_auto_install:
 	dh_auto_install
-	install -m 644 $(CURDIR)/JMapViewer.jar $(CURDIR)/debian/jmapviewer/usr/share/jmapviewer/jmapviewer-${SVNREV}.jar
-	install -m 644 $(CURDIR)/JMapViewer_Demo.jar $(CURDIR)/debian/jmapviewer/usr/share/jmapviewer/JMapViewer_Demo.jar
-	dh_link usr/share/jmapviewer/jmapviewer-${SVNREV}.jar usr/share/jmapviewer/JMapViewer.jar
+	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 755 $(CURDIR)/debian/jmapviewer_demo.sh $(CURDIR)/debian/jmapviewer/usr/bin/jmapviewer
 
 get-orig-source:

-- 
Java OpenStreetMap Tile Viewer