[SCM] qtbase packaging branch, master, updated. debian/5.2.1+dfsg-3-12-g5cf31aa

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=df3e290

The following commit has been merged in the master branch:
commit df3e290c1932f0f758ed6ecefe320d51c2215b79
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun May 4 16:43:35 2014 -0300

    Override lintian false positive.
---
 debian/changelog                | 3 +++
 debian/source/lintian-overrides | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5afc64d..b8258a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ qtbase-opensource-src (5.2.1+dfsg-4) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Install the headers in a Multi-Arch qualified directory (Closes: #734677).
     - Fix related install files.
+  * Override Lintian warning about torrent.qdoc being under an RFC license,
+    it's just a false positive coming from the fact that the documentation is
+    listing the license, but it's really not licensed under the RFC license.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 29 Mar 2014 10:10:09 -0300
 
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 2a4ac36..07c3fe2 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -2,3 +2,6 @@
 qtbase-opensource-src source: outdated-autotools-helper-file src/3rdparty/freetype/builds/unix/config.guess 2009-12-30
 # unused copy of freetype
 qtbase-opensource-src source: outdated-autotools-helper-file src/3rdparty/freetype/builds/unix/config.sub 2010-01-22
+# This is a bug in Lintian. The file is *not* licensed under an RFC license
+# but just listing that some code was extracted from there.
+qtbase-opensource-src source: license-problem-non-free-RFC examples/network/doc/src/torrent.qdoc

-- 
qtbase packaging