[Pkg-osm-commits] [SCM] osmium branch, master, updated. debian/0.0_20111213-g7f3500a-1-6-g538d969

[David Paleino]

The following commit has been merged in the master branch:
commit c245ae718fdf15714135227ebbf19eacad8e09f5
Author: David Paleino <dapal at debian.org>
Date:   Tue Mar 13 09:53:48 2012 +0100

    Override three more invalid "duplicate files" by lintian

diff --git a/debian/changelog b/debian/changelog
index 0fd20f2..be49dd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ osmium (0.0~20111213-g7f3500a-2) UNRELEASED; urgency=low
   * Fix FTBFS with the new geos library (02-support_new_libgeos++.patch)
   * Standards-Version bump to 3.9.3, no changes needed
   * Updated debian/copyright
+  * Override three more invalid "duplicate files" by lintian
 
- -- David Paleino <dapal at debian.org>  Tue, 13 Mar 2012 09:52:26 +0100
+ -- David Paleino <dapal at debian.org>  Tue, 13 Mar 2012 09:53:32 +0100
 
 osmium (0.0~20111213-g7f3500a-1) unstable; urgency=low
 
diff --git a/debian/osmium-doc.lintian-overrides b/debian/osmium-doc.lintian-overrides
index bd60051..7b41676 100644
--- a/debian/osmium-doc.lintian-overrides
+++ b/debian/osmium-doc.lintian-overrides
@@ -1,4 +1,7 @@
 osmium-doc: duplicate-files usr/share/doc/osmium-doc/html/search/all_79.js usr/share/doc/osmium-doc/html/search/functions_79.js
+osmium-doc: duplicate-files usr/share/doc/osmium-doc/html/search/all_7e.js usr/share/doc/osmium-doc/html/search/functions_7e.js
+osmium-doc: duplicate-files usr/share/doc/osmium-doc/html/search/all_7a.js usr/share/doc/osmium-doc/html/search/functions_7a.js
+osmium-doc: duplicate-files usr/share/doc/osmium-doc/html/search/all_6b.js usr/share/doc/osmium-doc/html/search/functions_6b.js
 osmium-doc: duplicate-files usr/share/doc/osmium-doc/html/classOsmium_1_1Storage_1_1SparseTable__coll__graph.png usr/share/doc/osmium-doc/html/classOsmium_1_1Storage_1_1SparseTable__inherit__graph.png
 osmium-doc: duplicate-files usr/share/doc/osmium-doc/html/classOsmium_1_1Handler_1_1CoordinatesForWays__coll__graph.md5 usr/share/doc/osmium-doc/html/classOsmium_1_1Handler_1_1CoordinatesForWays__inherit__graph.md5
 osmium-doc: duplicate-files usr/share/doc/osmium-doc/html/classOsmium_1_1Storage_1_1FixedArray__coll__graph.md5 usr/share/doc/osmium-doc/html/classOsmium_1_1Storage_1_1FixedArray__inherit__graph.md5

-- 
C++ framework for working with OSM data files