[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn6502+dfsg1-1-21-g413ac40

[David Paleino]

The following commit has been merged in the master branch:
commit 17822c69850f0424702ad06284c57b9bb3befd57
Author: David Paleino <dapal at debian.org>
Date:   Thu Mar 6 17:57:07 2014 +0100

    More overrides

diff --git a/debian/josm.lintian-overrides b/debian/josm.lintian-overrides
index 62a5127..d78c409 100644
--- a/debian/josm.lintian-overrides
+++ b/debian/josm.lintian-overrides
@@ -1,4 +1,7 @@
 # these are meant to be like that
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml wiki.openstreetmap.org/wiki/tag:shop=kitchen
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml wiki.openstreetmap.org/wiki/tag:shop=curtain
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml wiki.openstreetmap.org/wiki/tag:shop=fram
 josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml wiki.openstreetmap.org/wiki/tag:highway=motorway
 josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml wiki.openstreetmap.org/wiki/tag:highway=motorway_link
 josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml wiki.openstreetmap.org/wiki/tag:highway=trunk
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..004ce10
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
+# OBVIOUSLY a false positive...
+josm source: license-problem-json-evil debian/patches/08-use_external_json_library.patch

-- 
Editor for OpenStreetMap