Merge branch 'master' of git+ssh://git.debian.org/git/pkg-kde/qt/qt4-x11

6 files changed, 20 insertions, 15 deletions

diff --git a/debian/changelog b/debian/changelog
index 08a1cef..679538c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,11 @@ 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.
+  * Rename qt4config.desktop to qtconfig-qt4.desktop.
+
  -- Fathi Boudra <fabo@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..dd8fc65 100644
--- a/debian/desktop/assistant-qt4.desktop
+++ b/debian/desktop/assistant-qt4.desktop
@@ -31,6 +31,7 @@ GenericName[hu]=Dokumentumböngésző
 GenericName[is]=Skjalavafri
 GenericName[it]=Visualizzatore di documenti
 GenericName[ja]=ドキュメントブラウザ
+GenericName[km]=កម្មវិធី​រុករក​ឯកសារ
 GenericName[ko]=문서 탐색기
 GenericName[lo]=ເຄື່ອງມືເລືອກເບິ່ງແຟ້ມເອກະສານ
 GenericName[lt]=Dokumentų žiūriklis
@@ -71,7 +72,7 @@ GenericName[zh_CN]=文档浏览器
 GenericName[zh_TW]=文件閱讀器
 GenericName[zu]=Umcingi Woshicilelo
 X-KDE-StartupNotify=true
-Icon=assistant
+Icon=assistant-qt4
 Terminal=false
 Type=Application
 
@@ -81,7 +82,6 @@ Name[cs]=Qt4 asistent
 Name[hu]=Qt 4 Asszisztens
 Name[ja]=Qt 4アシスタント
 Name[km]=អ្នក​ជំនួយការ Qt 4
-GenericName[km]=កម្មវិធី​រុករក​ឯកសារ
 Name[nb]=Qt 4-assistent
 Name[pa]=Qt 4 ਸਹਾਇਕ
 Name[sv]=Qt 4-assistent
diff --git a/debian/desktop/designer-qt4.desktop b/debian/desktop/designer-qt4.desktop
index f47ecf1..4adf95c 100644
--- a/debian/desktop/designer-qt4.desktop
+++ b/debian/desktop/designer-qt4.desktop
@@ -6,6 +6,7 @@ GenericName=Interface Designer
 GenericName[af]=Koppelvlak Ontwerper
 GenericName[ar]=أداة لتصميم واجهة البرامج
 GenericName[az]=Ara Üz Tərtibçisi
+GenericName[bg]=Дизайнер на интерфейси
 GenericName[bn]=ইন্টারফেস পরিকল্পনা
 GenericName[bs]=Qt alat za dizajniranje interfejsa
 GenericName[ca]=Dissenyador d'interfícies
@@ -30,6 +31,7 @@ GenericName[hu]=Felülettervező
 GenericName[is]=Viðmótshönnun
 GenericName[it]=Disegnatore di interfacce
 GenericName[ja]=インターフェースデザイナー
+GenericName[km]=កម្មវិធី​រចនា​ចំណុច​ប្រទាក់
 GenericName[ko]=인터페이스 디자이너
 GenericName[lo]=ເຄື່ອງມືອອກແບບສ່ວນຕິດຕໍ່ຜູ້ໃຊ້
 GenericName[lt]=Sąsajos redaktorius
@@ -70,19 +72,17 @@ GenericName[zh_TW]=界面設計師
 GenericName[zu]=Umakhi Womxhumanisi
 X-KDE-StartupNotify=true
 MimeType=application/x-designer;
-Icon=designer
+Icon=designer-qt4
 Terminal=false
 Type=Application
 
 
 
-GenericName[bg]=Дизайнер на интерфейси
 Name[el]=Σχεδιαστής Qt 4
 Name[hu]=Qt 4 Tervező
 Name[it]=Progettazione Qt 4
 Name[ja]=Qt 4デザイナ
 Name[km]=កម្មវិធី​រចនា Qt 4
-GenericName[km]=កម្មវិធី​រចនា​ចំណុច​ប្រទាក់
 Name[nl]=Qt 4 ontwerper
 Name[pa]=Qt 4 ਡਿਜ਼ਾਇਨਰ
 Name[pl]=Projektowanie interfejsów w Qt 4
diff --git a/debian/desktop/linguist-qt4.desktop b/debian/desktop/linguist-qt4.desktop
index 3a3b769..eee0f9a 100644
--- a/debian/desktop/linguist-qt4.desktop
+++ b/debian/desktop/linguist-qt4.desktop
@@ -6,6 +6,7 @@ GenericName=Translation Tool
 GenericName[af]=Vertaling Program
 GenericName[ar]=أداة للترجمة
 GenericName[az]=Tərcümə Vasitəsi
+GenericName[bg]=Инструмент за превод
 GenericName[bn]=অনুবাদ টুল
 GenericName[bs]=Alat za prevođenje
 GenericName[ca]=Eina de traducció
@@ -30,6 +31,7 @@ GenericName[hu]=Fordítássegítő
 GenericName[is]=Þýðingartól
 GenericName[it]=Strumento per le traduzioni
 GenericName[ja]=翻訳ツール
+GenericName[km]=ឧបករណ៍​បកប្រែ
 GenericName[ko]=번역 도구
 GenericName[lo]=ເຄື່ອງມືແປພາສາ
 GenericName[lt]=Vertimo įrankis
@@ -72,13 +74,11 @@ 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
 Name[ja]=Qt 4リンギスト
 Name[km]=ភាសាវិទូ Qt 4
-GenericName[km]=ឧបករណ៍​បកប្រែ
 Name[nb]=Qt 4-Linguist
 Name[pa]=Qt 4 ਅਨੁਵਾਦਕ
 Name[pl]=Lingwista Qt 4
diff --git a/debian/desktop/qt4config.desktop b/debian/desktop/qtconfig-qt4.desktop
index fc00dc1..2b68c3f 100644
--- a/debian/desktop/qt4config.desktop
+++ b/debian/desktop/qtconfig-qt4.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..6a1c721 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-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.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