The following commit has been merged in the master branch:
commit 700b9ad3564fcd9e2aeaefc4bc65a8c50a95144b
Author: Felix Natter <fnat...@gmx.net>
Date:   Thu Oct 3 11:54:03 2013 +0200

    fix watch file / get-orig-source target

diff --git a/debian/rules b/debian/rules
index 04c075b..b774566 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,16 +23,19 @@ override_dh_auto_install:
        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:
-#      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}
+       uscan --download --repack --destdir ..
 
 .PHONY: override_dh_auto_clean override_dh_auto_install
diff --git a/debian/watch b/debian/watch
index 8fd4dbc..2a1835f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,4 @@
-# This package pulls new versions directly from upstream vcs.
-# Access is via,
-# http://svn.openstreetmap.org/applications/viewer/jmapviewer/
+version=3
+opts=dversionmangle=s/\+dfsg\d*// \
+  
http://svn.openstreetmap.org/applications/viewer/jmapviewer/releases/\d+(?:\.\d+(?:\.\d+)?)?/JMapViewer-(\d+(?:\.\d+(?:\.\d+)?)?)-Source\.zip
 
-# Upstream doesn't tag their vcs with releases and the releases it produces in
-# the releases directory are binary only, not source releases.

-- 
Java OpenStreetMap Tile Viewer

_______________________________________________
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits

Reply via email to