[qgis] 06/07: Drop unused lintian override for binaries-have-file-conflict.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository qgis.

commit bcba857e5e4030adb954e081705b085ca5793b55
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Mar 11 01:47:10 2016 +0100

    Drop unused lintian override for binaries-have-file-conflict.
---
 debian/changelog                | 1 +
 debian/source.lintian-overrides | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c10703a..c3f538f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qgis (2.14.0+dfsg0-3) UNRELEASED; urgency=medium
     independent packages are built in the -arch target.
     (closes: #817811)
   * Update various URLs to use HTTPS.
+  * Drop unused lintian override for binaries-have-file-conflict.
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 10 Mar 2016 17:37:19 +0100
 
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index 2703c1a..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# False positive, the qgis-provider-grass maintainer scripts use dpkg-divert to
-# use its LD_PRELOAD wrappers instead.
-qgis source: binaries-have-file-conflict qgis qgis-provider-grass usr/bin/qbrowser
-qgis source: binaries-have-file-conflict qgis qgis-provider-grass usr/bin/qgis

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git