[SCM] Qt 4 packaging branch, master, updated. debian/4.7.1-2-17-g6857cd0

[Pino Toscano]

The following commit has been merged in the master branch:
commit ba529551bf7a7a9be904f6646b3b15b148665551
Author: Pino Toscano <pino at kde.org>
Date:   Sat Mar 5 21:46:34 2011 +0100

    rename qt4config.desktop to qtconfig-qt4.desktop
    
    more coherent with the other .desktop files we provide
---
 .../{qt4config.desktop => qtconfig-qt4.desktop}    |    0
 debian/rules                                       |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/desktop/qt4config.desktop b/debian/desktop/qtconfig-qt4.desktop
similarity index 100%
rename from debian/desktop/qt4config.desktop
rename to debian/desktop/qtconfig-qt4.desktop
diff --git a/debian/rules b/debian/rules
index c3a20bf..6a1c721 100755
--- a/debian/rules
+++ b/debian/rules
@@ -240,8 +240,8 @@ override_dh_auto_install:
 	install -D -p -m0644 debian/desktop/linguist.png \
 		debian/qt4-dev-tools/usr/share/pixmaps/linguist-qt4.png
 
-	install -D -p -m0644 debian/desktop/qt4config.desktop \
-		debian/qt4-qtconfig/usr/share/applications/qt4config.desktop
+	install -D -p -m0644 debian/desktop/qtconfig-qt4.desktop \
+		debian/qt4-qtconfig/usr/share/applications/qtconfig-qt4.desktop
 	install -D -p -m0644 debian/desktop/qtconfig.png \
 		debian/qt4-qtconfig/usr/share/pixmaps/qtconfig-qt4.png
 

-- 
Qt 4 packaging