r21433 by mrdocs -

[scribus-commit]

Author: mrdocs
Date: Sun Aug 28 03:32:02 2016
New Revision: 21433

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21433
Log:
Resolves #14257 and #14256

Modified:
    trunk/Scribus/CMakeLists.txt
    trunk/Scribus/scribus.desktop

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21433&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/CMakeLists.txt	Sun Aug 28 03:32:02 2016
@@ -412,7 +412,6 @@
 
 # Set the XDG mime stuff
 SET(MIMEDIR "${CMAKE_INSTALL_DATAROOTDIR}/mime/packages/")
-SET(MIMELNKDIR "${CMAKE_INSTALL_DATAROOTDIR}/mimelnk/application/")
 
 ##############################################################################################################
 ########## Build Setup                                                                              ##########
@@ -999,15 +998,16 @@
 
 ENDIF (APPLE)
 
+#Install the .desktop file
+INSTALL(FILES
+	scribus.desktop
+	DESTINATION ${DESKTOPDIR}
+)
+
 #Install our MIME data
 INSTALL(FILES
 	scribus.xml
 	DESTINATION ${MIMEDIR}
-)
-#KDE workaround until it starts supporting freedesktop spec
-INSTALL(FILES
-	vnd.scribus.desktop
-	DESTINATION ${MIMELNKDIR}
 )
 
 

Modified: trunk/Scribus/scribus.desktop
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21433&path=/trunk/Scribus/scribus.desktop
==============================================================================
--- trunk/Scribus/scribus.desktop	(original)
+++ trunk/Scribus/scribus.desktop	Sun Aug 28 03:32:02 2016
@@ -1,13 +1,54 @@
 [Desktop Entry]
 Type=Application
-Name=Scribus (Development)
+Name=Scribus
 Name[ar]=سكريبس
 Name[fa]=اسکریباس
 Name[lo]=ສະຄຣີບັດສ໌
-Name[ru]=Scribus (нестабильная версия)
+Name[ru]=Scribus
 Name[ta]=ஸ்கிரிபஸ்
-Comment=Graphic Page Layout and Publication (Development)
-Comment[ru]=Настольная издательская система
+Comment=Page Layout and Publication
+Comment[ar]=سكريبس
+Comment[fa]=اسکریباس
+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[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
 GenericName=Page Layout (Development)
 GenericName[af]=Werkskerm Publisering
 GenericName[bg]=Издателска програма