[SCM] jmapviewer branch, master, updated. upstream/1.02+dfsg1-45-ge415e85

[Felix Natter]

The following commit has been merged in the master branch:
commit e415e85f2ed0f95744c3b6237c54ee68350150a3
Author: Felix Natter <fnatter at gmx.net>
Date:   Tue Oct 22 19:03:10 2013 +0200

    add Files-Excluded: in debian/copyright for removal of bing_maps.png

diff --git a/debian/README.source b/debian/README.source
index 568a08b..3a7225a 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -2,4 +2,8 @@ JMapViewer-1.0-Source.tar.gz is generated by 'get-orig-source' target.
 
 +dfsg1 suffix has been added because bing_maps.png shall be removed at import:
   gbp import-orig --filter bing_maps.png --filter-pristine-tar --pristine-tar -u1.0+dfsg1 \
-      ../JMapViewer-1.0-Source.tar.gz
\ No newline at end of file
+      ../JMapViewer-1.0-Source.tar.gz
+
+As an alternative, you can use the result of uscan (get-orig-source target),
+which is also configured for removal of bing_maps.png (by means of Files-Excluded:
+in debian/copyright).
\ No newline at end of file
diff --git a/debian/copyright b/debian/copyright
index eb0e86a..95a1f90 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,8 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: JMapViewer
 Source: http://svn.openstreetmap.org/applications/viewer/jmapviewer
+Files-Excluded:
+  src/org/openstreetmap/gui/jmapviewer/images/bing_maps.png
 
 Files: *
 Copyright: 2008 Jan Peter Stotz and others

-- 
Java OpenStreetMap Tile Viewer