Description: Drop mimelnk file, actually install .desktop file, improve .desktop
Author: Mattia Rizzolo <mattia@debian.org>
Bug: https://bugs.scribus.net/view.php?id=14256
Bug: https://bugs.scribus.net/view.php?id=14257
Origin: upstream,
 https://www.scribus.net/websvn/comp.php?repname=Scribus&compare[]=/trunk/Scribus/@21432&compare[]=/trunk/Scribus/@21433
 https://www.scribus.net/websvn/comp.php?repname=Scribus&compare[]=/trunk/Scribus/@21433&compare[]=/trunk/Scribus/@21434
Last-Updated: 2016-08-29

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -411,7 +411,6 @@
 
 # Set the XDG mime stuff
 SET(MIMEDIR "${CMAKE_INSTALL_DATAROOTDIR}/mime/packages/")
-SET(MIMELNKDIR "${CMAKE_INSTALL_DATAROOTDIR}/mimelnk/application/")
 
 ##############################################################################################################
 ########## Build Setup                                                                              ##########
@@ -1010,16 +1009,17 @@
 
 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}
-)
 
 
 #Install the appdata file
--- a/scribus.desktop
+++ b/scribus.desktop
@@ -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]=Издателска програма
--- a/vnd.scribus.desktop
+++ /dev/null
@@ -1,107 +0,0 @@
-[Desktop Entry]
-Name=Scribus
-Type=Application
-Icon=scribus
-Comment=Page Layout and Publication
-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
-#Comment[ru]=Настольная издательская система
-GenericName=Page Layout (Development)
-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[tt]=Өстәл нәшрияты
-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
-TryExec=scribus
-Exec=scribus %f
-Terminal=false
-MimeType=application/vnd.scribus;
-Categories=Qt;Graphics;Publishing;
-StartupWMClass=scribus
-StartupNotify=false
-X-AppInstall-Package=scribus
-X-AppInstall-Section=main
-X-KDE-SubstituteUID=false
-X-KDE-Username=
-[X-Property::X-KDE-NativeExtension]
-Type=QString
-Value=.sla
-DocPath=scribus
\ No newline at end of file
