[SCM] qtcreator packaging branch, master, updated. debian/2.7.0-1-19-gf18c709

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 1adddbffde2e44fe960c85245ac2aa1f1fcc117f
Author: Pino Toscano <pino at debian.org>
Date:   Wed Jun 5 10:38:18 2013 +0200

    override the image-file-in-usr-lib warning
    
    qtcomponents images are expected in the library directory with qt components
---
 debian/changelog                   |    2 ++
 debian/qtcreator.lintian-overrides |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0cb47ec..947e07f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ qtcreator (2.7.0-2) UNRELEASED; urgency=low
   [ Pino Toscano ]
   * Switch Homepage to a qt-project.org page.
   * Remove obsolete gdbmacros symlinks.
+  * Override the image-file-in-usr-lib warning, since qtcomponents images
+    are expected in the library directory with qt components.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 28 May 2013 17:39:32 -0300
 
diff --git a/debian/qtcreator.lintian-overrides b/debian/qtcreator.lintian-overrides
index 1a5f706..a2d71bf 100644
--- a/debian/qtcreator.lintian-overrides
+++ b/debian/qtcreator.lintian-overrides
@@ -2,3 +2,5 @@
 qtcreator: script-with-language-extension
 # The changelog is shipped in qtcreator-data.
 qtcreator: no-upstream-changelog
+# lib data part of qtcomponents
+qtcreator: image-file-in-usr-lib

-- 
qtcreator packaging