r13800 by mrdocs - remove the old .desktop file and merge the changes into vnd.scribus.desktop

[scribus-commit]

Revision: 13800
Author: mrdocs
Date: 2009-07-30T22:02:43.606194Z
Commit message: remove the old .desktop file and merge the changes into vnd.scribus.desktop

Changeset: 
M  /branches/Version133x/Scribus/CMakeLists.txt
D  /branches/Version133x/Scribus/scribus.desktop
M  /branches/Version133x/Scribus/vnd.scribus.desktop

Diffs:
Index: scribus.desktop
===================================================================
--- scribus.desktop	(revision 13799)
+++ scribus.desktop	(revision 13800)
@@ -1,63 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Scribus
-Name[ar]=سكريبس
-Name[fa]=اسکریباس
-Name[lo]=ສະຄຣີບັດສ໌
-Name[ta]=ஸ்கிரிபஸ்
-Comment=Graphic Page Layout and Publication (Stable)
-GenericName=Page Layout (Stable)
-GenericName[af]=Werkskerm Publisering
-GenericName[bg]=Издателска програма
-GenericName[bs]=Stono izdavaštvo (DTP)
-GenericName[ca]=Publicació d'escriptori
-GenericName[cs]=Publikační systém (DTP)
-GenericName[cy]=Cyhoeddi Penbwrdd
-GenericName[da]=Dtp
-GenericName[eo]=DTP-programo
-GenericName[es]=Publicación de escritorio
-GenericName[et]=Küljendusrakendus
-GenericName[fa]=نشر میزکار
-GenericName[fi]=Julkaisuohjelma
-GenericName[fr]=Publication assistée par ordinateur (PAO)
-GenericName[he]=הוצאה לאור ×©×•×œ×—× ×™×ª
-GenericName[hr]=Stolno izdavaštvo
-GenericName[hu]=Kiadványszerkesztés
-GenericName[it]=Pubblicazioni
-GenericName[ja]=デスクトップパブリッシング
-GenericName[lo]=ເດດທອບພັລບບີດຊິງ
-GenericName[lt]=Darbastalio leidykla
-GenericName[nb]=Datatrykkeprogram
-GenericName[nn]=Datatrykk
-GenericName[nso]=Kwalakwatso ya Desktop
-GenericName[pl]=Program do składu tekstu
-GenericName[pt]=Publicação no Ecrã
-GenericName[pt_BR]=Publicação do Ambiente de Trabalho
-GenericName[ru]=Настольное издательство
-GenericName[sl]=Namizno založništvo
-GenericName[sr]=Стоно издаваштво
-GenericName[ss]=Kushicelela ku desktop
-GenericName[sv]=Desktop Publishing
-GenericName[th]=เดสก์ทอปพับลิชชิง
-GenericName[tr]=Masaüstü Yayıncılık
-GenericName[uk]=Видавнича система
-GenericName[uz]=Кичик нашриёт
-GenericName[ven]=U andadza Desikithopo
-GenericName[xh]=Upapasho lwe Desktop
-GenericName[zh_CN]=桌面出版
-GenericName[zh_TW]=桌面出版
-GenericName[zu]=Ukushicilelwa kwe-Desktop
-Exec=scribus %f
-Icon=scribus
-Terminal=false
-MimeType=application/vnd.scribus;
-Categories=Qt;Publishing;Graphics;
-StartupWMClass=scribus
-X-AppInstall-Package=scribus
-X-AppInstall-Section=main
-StartupNotify=false
-X-KDE-SubstituteUID=false
-X-KDE-Username=
-[X-Property::X-KDE-NativeExtension]
-Type=QString
-Value=.sla
Index: vnd.scribus.desktop
===================================================================
--- vnd.scribus.desktop	(revision 13799)
+++ vnd.scribus.desktop	(revision 13800)
@@ -1,53 +1,63 @@
 [Desktop Entry]
+Type=Application
 Name=Scribus
-Type=Application
+Name[ar]=سكريبس
+Name[fa]=اسکریباس
+Name[lo]=ສະຄຣີບັດສ໌
+Name[ta]=ஸ்கிரிபஸ்
+Comment=Graphic Page Layout and Publication (Stable)
+GenericName=Page Layout (Stable)
+GenericName[af]=Werkskerm Publisering
+GenericName[bg]=Издателска програма
+GenericName[bs]=Stono izdavaštvo (DTP)
+GenericName[ca]=Publicació d'escriptori
+GenericName[cs]=Publikační systém (DTP)
+GenericName[cy]=Cyhoeddi Penbwrdd
+GenericName[da]=Dtp
+GenericName[eo]=DTP-programo
+GenericName[es]=Publicación de escritorio
+GenericName[et]=Küljendusrakendus
+GenericName[fa]=نشر میزکار
+GenericName[fi]=Julkaisuohjelma
+GenericName[fr]=Publication assistée par ordinateur (PAO)
+GenericName[he]=הוצאה לאור ×©×•×œ×—× ×™×ª
+GenericName[hr]=Stolno izdavaštvo
+GenericName[hu]=Kiadványszerkesztés
+GenericName[it]=Pubblicazioni
+GenericName[ja]=デスクトップパブリッシング
+GenericName[lo]=ເດດທອບພັລບບີດຊິງ
+GenericName[lt]=Darbastalio leidykla
+GenericName[nb]=Datatrykkeprogram
+GenericName[nn]=Datatrykk
+GenericName[nso]=Kwalakwatso ya Desktop
+GenericName[pl]=Program do składu tekstu
+GenericName[pt]=Publicação no Ecrã
+GenericName[pt_BR]=Publicação do Ambiente de Trabalho
+GenericName[ru]=Настольное издательство
+GenericName[sl]=Namizno založništvo
+GenericName[sr]=Стоно издаваштво
+GenericName[ss]=Kushicelela ku desktop
+GenericName[sv]=Desktop Publishing
+GenericName[th]=เดสก์ทอปพับลิชชิง
+GenericName[tr]=Masaüstü Yayıncılık
+GenericName[uk]=Видавнича система
+GenericName[uz]=Кичик нашриёт
+GenericName[ven]=U andadza Desikithopo
+GenericName[xh]=Upapasho lwe Desktop
+GenericName[zh_CN]=桌面出版
+GenericName[zh_TW]=桌面出版
+GenericName[zu]=Ukushicilelwa kwe-Desktop
+Exec=scribus %f
+Icon=scribus
+Terminal=false
 MimeType=application/vnd.scribus;
-Icon=scribus
-Comment=Page Layout and Publication (Stable)
-Comment[ar]=سكريبس
-Comment[fa]=اسکریباس
-#Comment[lo]=ສະຄຣີບັດສ໌
-Comment[ta]=ஸ்கிரிபஸ்
-Comment[af]=Werkskerm Publisering
-Comment[bg]=Издателска програма
-Comment[bs]=Stono izdavaštvo (DTP)
-Comment[ca]=Publicació d'escriptori
-Comment[cs]=Publikační systém (DTP)
-Comment[cy]=Cyhoeddi Penbwrdd
-Comment[da]=Dtp
-Comment[eo]=DTP-programo
-Comment[es]=Publicación de escritorio
-Comment[et]=Küljendusrakendus
-#Comment[fa]=نشر میزکار
-Comment[fi]=Julkaisuohjelma
-Comment[fr]=Publication assistée par ordinateur (PAO)
-Comment[he]=הוצאה לאור ×©×•×œ×—× ×™×ª
-Comment[hr]=Stolno izdavaštvo
-Comment[hu]=Kiadványszerkesztés
-Comment[it]=Pubblicazioni
-Comment[ja]=デスクトップパブリッシング
-Comment[lo]=ເດດທອບພັລບບີດຊິງ
-Comment[lt]=Darbastalio leidykla
-Comment[nb]=Datatrykkeprogram
-Comment[nn]=Datatrykk
-Comment[nso]=Kwalakwatso ya Desktop
-Comment[pl]=Program do składu tekstu
-Comment[pt]=Publicação no Ecrã
-Comment[pt_BR]=Publicação do Ambiente de Trabalho
-Comment[ru]=Настольное издательство
-Comment[sl]=Namizno založništvo
-Comment[sr]=Стоно издаваштво
-Comment[ss]=Kushicelela ku desktop
-Comment[sv]=Desktop Publishing
-Comment[th]=เดสก์ทอปพับลิชชิง
-Comment[tr]=Masaüstü Yayıncılık
-Comment[uk]=Видавнича система
-Comment[uz]=Кичик нашриёт
-Comment[ven]=U andadza Desikithopo
-Comment[xh]=Upapasho lwe Desktop
-Comment[zh_CN]=桌面出版
-Comment[zh_TW]=桌面出版
-Comment[zu]=Ukushicilelwa kwe-Desktop
+Categories=Qt;Publishing;Graphics;
+StartupWMClass=scribus
+X-AppInstall-Package=scribus
+X-AppInstall-Section=main
+StartupNotify=false
+X-KDE-SubstituteUID=false
+X-KDE-Username=
 [X-Property::X-KDE-NativeExtension]
 Type=QString
 Value=.sla
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 13799)
+++ CMakeLists.txt	(revision 13800)
@@ -500,12 +500,8 @@
   vnd.scribus.desktop
   DESTINATION ${MIMELNKDIR}
 )
-#Install the desktop file
-#INSTALL(FILES
-#scribus.desktop
-#DESTINATION ${DESKTOPDIR}
-#)
 
+
 # If the cmake version includes cpack, use it
 IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
   SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Scribus is an open source publishing application for Linux, Mac OSX and Windows")