Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 21438)
+++ CMakeLists.txt	(working copy)
@@ -999,8 +999,13 @@
 ENDIF (APPLE)
 
 #Install the .desktop file
+CONFIGURE_FILE(
+	${CMAKE_CURRENT_SOURCE_DIR}/scribus.desktop.in
+	${CMAKE_CURRENT_SOURCE_DIR}/scribus.desktop
+)
 INSTALL(FILES
 	scribus.desktop
+	RENAME scribus${TAG_VERSION}.desktop
 	DESTINATION ${DESKTOPDIR}
 )
 
@@ -1007,14 +1012,20 @@
 #Install our MIME data
 INSTALL(FILES
 	scribus.xml
+	RENAME scribus${TAG_VERSION}.xml
 	DESTINATION ${MIMEDIR}
 )
 
 
 #Install the appdata file
+CONFIGURE_FILE(
+	${CMAKE_CURRENT_SOURCE_DIR}/scribus.appdata.xml.in
+	${CMAKE_CURRENT_SOURCE_DIR}/scribus.appdata.xml
+)
 INSTALL(FILES
-scribus.appdata.xml
-DESTINATION ${APPDATADIR}
+	scribus.appdata.xml
+	RENAME scribus${TAG_VERSION}.appdata.xml
+	DESTINATION ${APPDATADIR}
 )
 
 
Index: scribus.appdata.xml
===================================================================
--- scribus.appdata.xml	(revision 21438)
+++ scribus.appdata.xml	(nonexistent)
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2016 Peter Linnell  plinnell@scribus.net> -->
-<component>
-  <id type="desktop">scribus.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <name>Scribus</name>
-  <project_license>GPL-2.0+</project_license>
-  <summary>Open Source Page Layout and Desktop Publishing (DTP)</summary>
-  <url type="homepage">http://www.scribus.net/</url>
-  <description>
-    <p>Scribus is a open source page layout program which
-produces commercial grade output in PDF and Postscript, primarily,
-though not exclusively, for Linux.</p>
-    <p>
-While the goals of the program are ease of use and simple
-easy-to-understand tools, Scribus support for professional
-publishing features, such as CMYK and spot colors, easy PDF creation,
-Encapsulated Postscript import and export and creation of color
-separations.</p>
-  </description>
-  <screenshots>
-    <screenshot type="default">
-      <image height="708" width="1000">https://raw.githubusercontent.com/scribusproject/scribus/master/doc/en/images/Rembrandt2.png</image>
-      <caption>Main Window with blank page</caption>
-    </screenshot>
-    <screenshot>
-      <image height="702" width="1000">https://raw.githubusercontent.com/scribusproject/scribus/master/doc/en/images/Rembrandt18.png</image>
-      <caption>Properties window</caption>
-    </screenshot>
-    <screenshot>
-      <image height="477" width="629">https://raw.githubusercontent.com/scribusproject/scribus/master/doc/en/images/Rembrandt16.png</image>
-      <caption>Image effects tab</caption>
-    </screenshot>
-  </screenshots>
-  <update_contact>scribus-dev@lists.scribus.net</update_contact>
-</component>
Index: scribus.appdata.xml.in
===================================================================
--- scribus.appdata.xml.in	(nonexistent)
+++ scribus.appdata.xml.in	(working copy)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2016 Peter Linnell  plinnell@scribus.net> -->
+<component>
+  <id type="desktop">scribus@TAG_VERSION@.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <name>Scribus</name>
+  <project_license>GPL-2.0+</project_license>
+  <summary>Open Source Page Layout and Desktop Publishing (DTP)</summary>
+  <url type="homepage">http://www.scribus.net/</url>
+  <description>
+    <p>Scribus is a open source page layout program which
+produces commercial grade output in PDF and Postscript, primarily,
+though not exclusively, for Linux.</p>
+    <p>
+While the goals of the program are ease of use and simple
+easy-to-understand tools, Scribus support for professional
+publishing features, such as CMYK and spot colors, easy PDF creation,
+Encapsulated Postscript import and export and creation of color
+separations.</p>
+  </description>
+  <screenshots>
+    <screenshot type="default">
+      <image height="708" width="1000">https://raw.githubusercontent.com/scribusproject/scribus/master/doc/en/images/Rembrandt2.png</image>
+      <caption>Main Window with blank page</caption>
+    </screenshot>
+    <screenshot>
+      <image height="702" width="1000">https://raw.githubusercontent.com/scribusproject/scribus/master/doc/en/images/Rembrandt18.png</image>
+      <caption>Properties window</caption>
+    </screenshot>
+    <screenshot>
+      <image height="477" width="629">https://raw.githubusercontent.com/scribusproject/scribus/master/doc/en/images/Rembrandt16.png</image>
+      <caption>Image effects tab</caption>
+    </screenshot>
+  </screenshots>
+  <update_contact>scribus-dev@lists.scribus.net</update_contact>
+</component>
Index: scribus.desktop
===================================================================
--- scribus.desktop	(revision 21438)
+++ scribus.desktop	(nonexistent)
@@ -1,109 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Scribus
-Name[ar]=سكريبس
-Name[fa]=اسکریباس
-Name[lo]=ສະຄຣີບັດສ໌
-Name[ru]=Scribus
-Name[ta]=ஸ்கிரிபஸ்
-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]=Издателска програма
-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]=Edição Electrónica
-GenericName[pt_BR]=Editoração eletrônica
-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
-Icon=scribus
-Terminal=false
-MimeType=application/vnd.scribus;
-Categories=Qt;Graphics;Publishing;
-StartupWMClass=scribus
-DocPath=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

Property changes on: scribus.desktop
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Author Date Id Revision
\ No newline at end of property
Index: scribus.desktop.in
===================================================================
--- scribus.desktop.in	(nonexistent)
+++ scribus.desktop.in	(working copy)
@@ -0,0 +1,109 @@
+[Desktop Entry]
+Type=Application
+Name=Scribus
+Name[ar]=سكريبس
+Name[fa]=اسکریباس
+Name[lo]=ສະຄຣີບັດສ໌
+Name[ru]=Scribus
+Name[ta]=ஸ்கிரிபஸ்
+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]=Издателска програма
+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]=Edição Electrónica
+GenericName[pt_BR]=Editoração eletrônica
+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@TAG_VERSION@
+Exec=scribus@TAG_VERSION@ %f
+Icon=scribus@TAG_VERSION@
+Terminal=false
+MimeType=application/vnd.scribus;
+Categories=Qt;Graphics;Publishing;
+StartupWMClass=scribus@TAG_VERSION@
+DocPath=scribus@TAG_VERSION@
+StartupNotify=false
+X-AppInstall-Package=scribus@TAG_VERSION@
+X-AppInstall-Section=main
+X-KDE-SubstituteUID=false
+X-KDE-Username=
+[X-Property::X-KDE-NativeExtension]
+Type=QString
+Value=.sla

Property changes on: scribus.desktop.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
