[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.3-1-7-g0470728

[Fathi Boudra]

The following commit has been merged in the experimental-snapshots branch:
commit 09150e2f1f686e69e0ae2fd2ffc12a4ab96581ff
Author: Pino Toscano <pino at kde.org>
Date:   Sat Mar 5 21:44:23 2011 +0100

    Add a -qt4 suffix for the shipped icons of assistant, designer, linguist, and qtconfig.
---
 debian/changelog                     |    4 ++++
 debian/desktop/assistant-qt4.desktop |    2 +-
 debian/desktop/designer-qt4.desktop  |    2 +-
 debian/desktop/linguist-qt4.desktop  |    2 +-
 debian/desktop/qt4config.desktop     |    2 +-
 debian/rules                         |    8 ++++----
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 40e9448..9e146ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,10 @@ qt4-x11 (4:4.7.2-1) UNRELEASED; urgency=low
     - Suggests/Recommends QML plugin packages to libqt4-declarative and
       qt4-demos packages. (Closes: #597900)
 
+  [ Pino Toscano ]
+  * Add a -qt4 suffix for the shipped icons of assistant, designer, linguist,
+    and qtconfig.
+
  -- Fathi Boudra <fabo at debian.org>  Thu, 03 Mar 2011 20:58:36 +0200
 
 qt4-x11 (4:4.7.1-2) experimental; urgency=low
diff --git a/debian/desktop/assistant-qt4.desktop b/debian/desktop/assistant-qt4.desktop
index ee6a440..61882e4 100644
--- a/debian/desktop/assistant-qt4.desktop
+++ b/debian/desktop/assistant-qt4.desktop
@@ -71,7 +71,7 @@ GenericName[zh_CN]=文档浏览器
 GenericName[zh_TW]=文件閱讀器
 GenericName[zu]=Umcingi Woshicilelo
 X-KDE-StartupNotify=true
-Icon=assistant
+Icon=assistant-qt4
 Terminal=false
 Type=Application
 
diff --git a/debian/desktop/designer-qt4.desktop b/debian/desktop/designer-qt4.desktop
index f47ecf1..b966d93 100644
--- a/debian/desktop/designer-qt4.desktop
+++ b/debian/desktop/designer-qt4.desktop
@@ -70,7 +70,7 @@ GenericName[zh_TW]=界面設計師
 GenericName[zu]=Umakhi Womxhumanisi
 X-KDE-StartupNotify=true
 MimeType=application/x-designer;
-Icon=designer
+Icon=designer-qt4
 Terminal=false
 Type=Application
 
diff --git a/debian/desktop/linguist-qt4.desktop b/debian/desktop/linguist-qt4.desktop
index 3a3b769..6536a14 100644
--- a/debian/desktop/linguist-qt4.desktop
+++ b/debian/desktop/linguist-qt4.desktop
@@ -72,7 +72,7 @@ X-KDE-StartupNotify=true
 MimeType=application/x-linguist;
 Terminal=false
 Type=Application
-Icon=linguist
+Icon=linguist-qt4
 
 GenericName[bg]=Инструмент за превод
 Name[hu]=Qt 4 Nyelvész
diff --git a/debian/desktop/qt4config.desktop b/debian/desktop/qt4config.desktop
index fc00dc1..2b68c3f 100644
--- a/debian/desktop/qt4config.desktop
+++ b/debian/desktop/qt4config.desktop
@@ -3,7 +3,7 @@ Categories=Qt;Settings;
 Exec=/usr/bin/qtconfig-qt4
 Name=Qt 4 Settings
 X-KDE-StartupNotify=true
-Icon=qtconfig
+Icon=qtconfig-qt4
 Terminal=false
 Type=Application
 
diff --git a/debian/rules b/debian/rules
index 65be7c6..c3a20bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -229,21 +229,21 @@ override_dh_auto_install:
 	install -D -p -m0644 debian/desktop/designer-qt4.desktop \
 		debian/qt4-designer/usr/share/applications/designer-qt4.desktop
 	install -D -p -m0644 debian/desktop/designer.png \
-		debian/qt4-designer/usr/share/pixmaps/designer.png
+		debian/qt4-designer/usr/share/pixmaps/designer-qt4.png
 
 	install -D -p -m0644 debian/desktop/assistant-qt4.desktop \
 		debian/qt4-dev-tools/usr/share/applications/assistant-qt4.desktop
 	install -D -p -m0644 debian/desktop/linguist-qt4.desktop \
 		debian/qt4-dev-tools/usr/share/applications/linguist-qt4.desktop
 	install -D -p -m0644 debian/desktop/assistant.png \
-		debian/qt4-dev-tools/usr/share/pixmaps/assistant.png
+		debian/qt4-dev-tools/usr/share/pixmaps/assistant-qt4.png
 	install -D -p -m0644 debian/desktop/linguist.png \
-		debian/qt4-dev-tools/usr/share/pixmaps/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.png \
-		debian/qt4-qtconfig/usr/share/pixmaps/qtconfig.png
+		debian/qt4-qtconfig/usr/share/pixmaps/qtconfig-qt4.png
 
 	# QTBUG-12159 workaround
 	rm -f debian/tmp//usr/share/qt4/mkspecs/modules/qt_webkit_version.pri

-- 
Qt 4 packaging