[SCM] qtcreator packaging branch, master, updated. debian/2.7.0-1-14-gd9ccaab

[Pino Toscano]

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

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

    move qtcreator.desktop back in qtcreator
    
    this way a stray qtcreator-data won't add any broken menu item
---
 debian/qtcreator-data.install           |    1 -
 debian/qtcreator-data.lintian-overrides |    3 ---
 debian/qtcreator.install                |    1 +
 debian/qtcreator.install.linux          |    1 +
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/qtcreator-data.install b/debian/qtcreator-data.install
index 0e4286e..c325a04 100644
--- a/debian/qtcreator-data.install
+++ b/debian/qtcreator-data.install
@@ -1,5 +1,4 @@
 debian/Nokia-QtCreator.xml usr/share/mime/packages/
-debian/qtcreator.desktop usr/share/applications/
 usr/share/icons/hicolor/128x128/apps/QtProject-qtcreator.png
 usr/share/icons/hicolor/16x16/apps/QtProject-qtcreator.png
 usr/share/icons/hicolor/24x24/apps/QtProject-qtcreator.png
diff --git a/debian/qtcreator-data.lintian-overrides b/debian/qtcreator-data.lintian-overrides
index cadad78..7bbb0a8 100644
--- a/debian/qtcreator-data.lintian-overrides
+++ b/debian/qtcreator-data.lintian-overrides
@@ -1,5 +1,2 @@
 # qtcreator's changelog is not the usual one. It's splited in several files.
 qtcreator-data: wrong-name-for-upstream-changelog
-# We ship the .desktop file in qtcreator-data. qtcreator depends on it, so it
-# should be safe.
-qtcreator-data: desktop-command-not-in-package
diff --git a/debian/qtcreator.install b/debian/qtcreator.install
index 96b8568..4ed5642 100644
--- a/debian/qtcreator.install
+++ b/debian/qtcreator.install
@@ -1,3 +1,4 @@
+debian/qtcreator.desktop usr/share/applications/
 usr/bin/qmlpuppet
 usr/bin/qtcreator
 usr/bin/qtcreator.sh
diff --git a/debian/qtcreator.install.linux b/debian/qtcreator.install.linux
index ea4ca37..ea98849 100644
--- a/debian/qtcreator.install.linux
+++ b/debian/qtcreator.install.linux
@@ -1,3 +1,4 @@
+debian/qtcreator.desktop usr/share/applications/
 usr/bin/qmlpuppet
 usr/bin/qtcreator
 usr/bin/qtcreator.sh

-- 
qtcreator packaging