[SCM] qgis branch, master, updated. upstream/2.0.1-13436-g7969474

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit b237f8de09b97a6db1b2993fcfb7c27197b7045f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Sep 27 15:33:56 2013 +0200

    Add lintian overrides for binaries-have-file-conflict false positive.

diff --git a/debian/changelog b/debian/changelog
index 5ea3c17..96f3900 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ qgis (2.0.1-1) UNRELEASED; urgency=low
   * Split libqgis libraries into separate packages.
   * Remove automatically generated files on clean.
   * Add lintian overrides for no-fortify-functions false positive.
+  * Add lintian overrides for binaries-have-file-conflict false positive.
   * Add patch to fix 'an other' typo.
   * Add patch to fix 'allows to' typo.
 
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644
index 0000000..5078a06
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1,4 @@
+# False positive, the qgis-plugin-grass maintainer scripts use dpkg-divert to
+# use its LD_PRELOAD wrappers instead.
+qgis source: binaries-have-file-conflict qgis qgis-plugin-grass usr/bin/qbrowser
+qgis source: binaries-have-file-conflict qgis qgis-plugin-grass usr/bin/qgis

-- 
The Quantum GIS in Debian project