scribusproject · eszlari · Dec 6, 2020
diff --git a/AppImage-package/bundle.sh b/AppImage-package/bundle.sh
@@ -46,10 +46,7 @@ make DESTDIR=appdir -j$(nproc) install
 cp AppImage-package/AppRun appdir/
 chmod +x appdir/AppRun
 
-cp ./appdir/usr/share/icons/hicolor/256x256/apps/scribus.png ./appdir/
-
-# TODO: is this needed?
-sed -i -e 's|^Icon=.*|Icon=scribus|g' ./appdir/usr/share/applications/scribus.desktop
+cp ./appdir/usr/share/icons/hicolor/256x256/apps/net.scribus.Scribus.png ./appdir/
 
 ########################################################################
 # Bundle everyhting
@@ -121,7 +118,7 @@ EOF
 # Finalize AppDir but do not turn into AppImage just yet
 wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
 chmod a+x linuxdeployqt-continuous-x86_64.AppImage
-ARCH=x86_64 VERSION=$SCRIBUS_VERSION ./linuxdeployqt-continuous-x86_64.AppImage --appimage-extract-and-run appdir/usr/share/applications/scribus.desktop \
+ARCH=x86_64 VERSION=$SCRIBUS_VERSION ./linuxdeployqt-continuous-x86_64.AppImage --appimage-extract-and-run appdir/usr/share/applications/net.scribus.Scribus.desktop \
                                                -appimage -unsupported-bundle-everything \
                                                -executable=appdir/usr/bin/python3.6 \
                                                -executable=appdir/usr/lib/python3.6/lib-dynload/_tkinter.cpython-36m-x86_64-linux-gnu.so \

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -514,36 +514,23 @@ if (APPLE)
 endif()
 
 #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
+	net.scribus.Scribus.desktop
 	DESTINATION ${DESKTOPDIR}
 )
 
 #Install our MIME data
 install(FILES
-	scribus.xml
-	RENAME scribus${TAG_VERSION}.xml
+	net.scribus.Scribus.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
-	RENAME scribus${TAG_VERSION}.appdata.xml
+	net.scribus.Scribus.metainfo.xml
 	DESTINATION ${APPDATADIR}
 )
 
-
 #If building an Apple bundle, install these specific files
 if(APPLEBUNDLE)
 	install(FILES

diff --git a/doc/de/old/install3.html b/doc/de/old/install3.html
@@ -59,7 +59,7 @@ <h2>Kompilieren und Installieren</h2>
 </pre>
 </td></tr></table></blockquote>
 <p>Standardm&auml;&szlig;ig befindet sich die ausf&uuml;hrbare Scribus-Datei in <code>/usr/local/bin</code>. Die Dokumentation befindet sich in <code>/usr/local/lib/scribus/doc. </code></p>
-<p>Au&szlig;erdem gibt es noch eine <code>desktop.config</code>-Datei namens <code>scribus.desktop</code>, die als Men&uuml;k&uuml;rzel oder als Schnellstarter auf dem Desktop dienen kann. Kopieren Sie die Datei einfach aus dem Installationverzeichnis auf Ihren KDE-Desktop, dort k&ouml;nnen Sie dann Scribus starten. Wenn Sie die Datei auf den Desktop gezogen haben, m&uuml;ssen Sie noch daf&uuml;r sorgen, da&szlig; sie &quot;ausf&uuml;hrbar&quot; ist. Mit einem Rechtsklick k&ouml;nnen Sie pr&uuml;fen, ob das entsprechende Kontrollk&auml;stchen aktiviert ist. Diese Datei entspricht den j&uuml;ngsten Spezifikationen von <a href="http://www.freedesktop.org">www.freedesktop.org</a>.</p>
+<p>Au&szlig;erdem gibt es noch eine <code>desktop.config</code>-Datei namens <code>net.scribus.Scribus.desktop</code>, die als Men&uuml;k&uuml;rzel oder als Schnellstarter auf dem Desktop dienen kann. Kopieren Sie die Datei einfach aus dem Installationverzeichnis auf Ihren KDE-Desktop, dort k&ouml;nnen Sie dann Scribus starten. Wenn Sie die Datei auf den Desktop gezogen haben, m&uuml;ssen Sie noch daf&uuml;r sorgen, da&szlig; sie &quot;ausf&uuml;hrbar&quot; ist. Mit einem Rechtsklick k&ouml;nnen Sie pr&uuml;fen, ob das entsprechende Kontrollk&auml;stchen aktiviert ist. Diese Datei entspricht den j&uuml;ngsten Spezifikationen von <a href="http://www.freedesktop.org">www.freedesktop.org</a>.</p>
 <p>Da Scribus <code>autoconf</code> verwendet, sollten Sie - sofern Sie die korrekten Versionen der Entwickler-Bibliotheken besitzen - kaum Probleme beim Kompilieren haben. Falls es dennoch zu Schwierigkeiten kommt, wenden Sie sich bitte an die Scribus-Mailingliste oder unseren IRC-Channel. Beachten Sie hierzu das Kapitel <a href="resources.html">Community Resources</a> in diesem Handbuch.</p>
 <p>Zuguterletzt:</p>
 <blockquote><table width="100%" border="1" bgcolor="#eeeeee"><tr><td border="0">

diff --git a/doc/en/install2.html b/doc/en/install2.html
@@ -47,6 +47,6 @@ <h3>Optionally:</h3>
 <h4>Using CMake</h4>
 <p>In 1.3.3.6+, we added support for CMake as an alternative to the traditional autotools. Since 1.3.5 it is mandatory, and autotools are no longer supported. Currently, building on Linux, UNIX and Mac&nbsp;OS&nbsp;X is working reliably. Please see the <a href="install4.html">CMake instructions</a> for more details.</p>
 <p>The default location for the Scribus executable is located in <code>/usr/local/bin</code>. Documentation is located in <code>/usr/local/lib/scribus/doc</code></p>
-<p>In addition for Linux/UNIX desktops, there is a <code>desktop.config</code> file named <code>scribus.desktop</code> which can be used for a menu shortcut or desktop shortcut. Simply copy this from the base directory of the installation source directory to your KDE desktop and this will launch Scribus. After dragging the file to the desktop, right click and make sure the &ldquo;execute&rdquo; check box is checked. This file conforms to the latest <a href="http://www.freedesktop.org">www.freedesktop.org</a> specifications.</p>
+<p>In addition for Linux/UNIX desktops, there is a <code>desktop.config</code> file named <code>net.scribus.Scribus.desktop</code> which can be used for a menu shortcut or desktop shortcut. Simply copy this from the base directory of the installation source directory to your KDE desktop and this will launch Scribus. After dragging the file to the desktop, right click and make sure the &ldquo;execute&rdquo; check box is checked. This file conforms to the latest <a href="http://www.freedesktop.org">www.freedesktop.org</a> specifications.</p>
 </body>
 </html>
diff --git a/doc/en/qsg.html b/doc/en/qsg.html
@@ -132,7 +132,7 @@ <h2>Step Three: Adding Text</span></h2>
 
 <h2>Step Four: Adding the Publishing &ldquo;Company&rdquo;</h2>
 
-<p>The final steps include adding an imaginary publishing company and its logo. We'll decide in modesty to call the company &ldquo;Scribus Publishing&rdquo;. That way, we need not rack our brains about a logo, but can simply use the Scribus logo. You'll find it in the folder <code>~/share/scribus/icons</code>, where ~ is your Scribus installation directory. The filename is <code>scribus.png</code>.</p>
+<p>The final steps include adding an imaginary publishing company and its logo. We'll decide in modesty to call the company &ldquo;Scribus Publishing&rdquo;. That way, we need not rack our brains about a logo, but can simply use the Scribus logo. You'll find it in the folder <code>~/share/scribus/icons</code>, where ~ is your Scribus installation directory. The filename is <code>net.scribus.Scribus.png</code>.</p>
 
 <p>Now create a small Image Frame at the bottom the page, between the page border and the cover image(s). Make sure the fill color of the image frame is set to &ldquo;None&rdquo;, because we are going to import an image with a transparent background. Then, as with our first image, we import the icon via right-click &gt; <i>Get Image</i>. To prevent the icon's colors from interfering with the colors chosen for our layout, open the Image Effects dialog as explained in Step Two. Setting the image to &ldquo;Greyscale&rdquo; and raising the contrast makes sure the logo won't &ldquo;disappear&rdquo;, and at the same time it won't clash with the rest of our colors.</p>
 

diff --git a/doc/fr/install3.html b/doc/fr/install3.html
@@ -59,7 +59,7 @@ <h2>Compilation et installation</h2>
 </pre>
 </td></tr></table></blockquote>
 <p>L'ex&eacute;cutable de Scribus est situ&eacute; par d&eacute;faut dans<code>/usr/local/bin</code>. La documentation se trouve dans<code>/usr/local/lib/scribus/doc</code></p>
-<p>De plus, il y a un fichier <code>desktop.config</code> nomm&eacute; <code>scribus.desktop</code> qui peut &ecirc;tre utilis&eacute; comme raccourci menu ou raccourci bureau. Copiez-le simplement du r&eacute;pertoire de base de Scribus dans votre bureau KDE et il d&eacute;marrera Scribus. Apr&egrave;s avoir mis ce fichier sur le bureau, cliquez dessus avec le bouton droit et assurez-vous que la case ex&eacute;cuter est coch&eacute;e. Ce fichier se conforme aux plus r&eacute;centes sp&eacute;cifications <a href="http://www.freedesktop.org">www.freedesktop.org</a>.</p>
+<p>De plus, il y a un fichier <code>desktop.config</code> nomm&eacute; <code>net.scribus.Scribus.desktop</code> qui peut &ecirc;tre utilis&eacute; comme raccourci menu ou raccourci bureau. Copiez-le simplement du r&eacute;pertoire de base de Scribus dans votre bureau KDE et il d&eacute;marrera Scribus. Apr&egrave;s avoir mis ce fichier sur le bureau, cliquez dessus avec le bouton droit et assurez-vous que la case ex&eacute;cuter est coch&eacute;e. Ce fichier se conforme aux plus r&eacute;centes sp&eacute;cifications <a href="http://www.freedesktop.org">www.freedesktop.org</a>.</p>
 <p>Vu que Scribus utilise <code>autoconf</code>, aussi longtemps que vous avez les bonnes versions des librairies de d&eacute;veloppement, vous ne deriez pas avoir beaucoup de difficult&eacute;s lors de la compilation. Si vous avez quand m&ecirc;me des probl&egrave;mes, veuillez les signaler dans la liste de diffusion Scribus ou sur le canal IRC. Voir la section <a href="resources.html">Ressources de la communaut&eacute;</a> de ce manuel.</p>
 <p>Finalement :</p>
 <blockquote><table width="100%" border="1" bgcolor="#eeeeee"><tr><td border="0">

diff --git a/doc/it/install2.html b/doc/it/install2.html
@@ -47,6 +47,6 @@ <h3>Optionally:</h3>
 <h4>Using CMake</h4>
 <p>In 1.3.3.6+, we added support for CMake as an alternative to the traditional autotools. Since 1.3.5 it is mandatory, and autotools are no longer supported. Currently, building on Linux, UNIX and Mac&nbsp;OS&nbsp;X is working reliably. Please see the <a href="install4.html">CMake instructions</a> for more details.</p>
 <p>The default location for the Scribus executable is located in <code>/usr/local/bin</code>. Documentation is located in <code>/usr/local/lib/scribus/doc</code></p>
-<p>In addition for Linux/UNIX desktops, there is a <code>desktop.config</code> file named <code>scribus.desktop</code> which can be used for a menu shortcut or desktop shortcut. Simply copy this from the base directory of the installation source directory to your KDE desktop and this will launch Scribus. After dragging the file to the desktop, right click and make sure the &ldquo;execute&rdquo; check box is checked. This file conforms to the latest <a href="http://www.freedesktop.org">www.freedesktop.org</a> specifications.</p>
+<p>In addition for Linux/UNIX desktops, there is a <code>desktop.config</code> file named <code>net.scribus.Scribus.desktop</code> which can be used for a menu shortcut or desktop shortcut. Simply copy this from the base directory of the installation source directory to your KDE desktop and this will launch Scribus. After dragging the file to the desktop, right click and make sure the &ldquo;execute&rdquo; check box is checked. This file conforms to the latest <a href="http://www.freedesktop.org">www.freedesktop.org</a> specifications.</p>
 </body>
 </html>
diff --git a/doc/it/qsg.html b/doc/it/qsg.html
@@ -124,7 +124,7 @@ <h2>Passo tre: aggiungere il testo</span></h2>
 
 <h2>Passo quattro: aggiungere l&rsquo;&ldquo;Editore&rdquo;</h2>
 
-<p>Le operazioni conclusive consistono nell&rsquo;aggiungere un editore immaginario e il suo logo. Con uno sfoggio di modestia, chiameremo il nostro editore &ldquo;Scribus Publishing&rdquo;. Cos&igrave; non dovremo scervellarci per inventare un logo, ma potremo usare quello di Scribus. Potete trovarlo nella cartella <code>~/share/scribus/icons</code>, dove ~ &egrave; la directory in cui Scribus &egrave; installato sul vostro computer. Il file si chiama <code>scribus.png</code>.</p>
+<p>Le operazioni conclusive consistono nell&rsquo;aggiungere un editore immaginario e il suo logo. Con uno sfoggio di modestia, chiameremo il nostro editore &ldquo;Scribus Publishing&rdquo;. Cos&igrave; non dovremo scervellarci per inventare un logo, ma potremo usare quello di Scribus. Potete trovarlo nella cartella <code>~/share/scribus/icons</code>, dove ~ &egrave; la directory in cui Scribus &egrave; installato sul vostro computer. Il file si chiama <code>net.scribus.Scribus.png</code>.</p>
 
 <p>Ora create una piccola cornice immagine in fondo alla pagina, tra il bordo e le immagini di copertina. Assicuratevi che il colore di riempimento di questa cornice sia impostato a &ldquo;Nessuno&rdquo;, Perch&eacute; vi importeremo un&rsquo;immagine con sfondo trasparente. Poi, come abbiamo fatto con la prima immagine, importiamo l&rsquo;icona con clic sul tasto destro &gt; <i>Carica immagine</i>. Per evitare che i colori dell&rsquo;icona interferiscano con i colori che abbiamo scelto per la pagina, aprite la finestra di dialogo Effetti Immagine come spiegato al passo 2. Trasformate l&rsquo;immagine in &ldquo;Scala di grigi&rdquo; e aumentate il contrasto: in questo modo il logo rester&agrave; ben visibile, e allo stesso tempo non contraster&agrave; con i colori scelti prima.</p>
 

diff --git a/doc/ru/qsg.html b/doc/ru/qsg.html
@@ -93,7 +93,7 @@ <h2>Шаг третий: добавление текста</h2>
 
 <h2>Шаг четвёртый: добавление издательской &#171;фирмы&#187;</h2>
 
-<p>Заключительные шаги включают добавление воображаемой издательской фирмы и её логотипа. Из соображений скромности назовём фирму &#171;Издательство Scribus&#187;. Благодаря этому нам не нужно ломать голову над логотипом — можно просто использовать логотип Scribus. Его можно найти в папке <code>~/share/scribus/icons</code>, где &#171;~&#187; — каталог установки Scribus. Файл называется <code>scribus.png</code>.</p>
+<p>Заключительные шаги включают добавление воображаемой издательской фирмы и её логотипа. Из соображений скромности назовём фирму &#171;Издательство Scribus&#187;. Благодаря этому нам не нужно ломать голову над логотипом — можно просто использовать логотип Scribus. Его можно найти в папке <code>~/share/scribus/icons</code>, где &#171;~&#187; — каталог установки Scribus. Файл называется <code>net.scribus.Scribus.png</code>.</p>
 
 <p>Теперь создайте небольшой блок изображения в нижней части страницы, где-то между её краем и изображением обложки. Убедитесь, что цвет заливки блока изображения установлен в &#171;Нет&#187;, потому что мы будем вставлять изображение с прозрачным фоном. После этого, как и в случае с нашим первым изображением, импортируем значок, щёлкнув правой кнопкой мыши и выбрав в контекстном меню пункт <i>Содержимое &gt; Вставить изображение</i>. Чтобы цвета значка не мешали цветам, использующимся в макете, откройте диалоговое окно эффектов изображения, как описано во втором шаге. Выбор для изображения &#171;Градаций серого&#187; и повышение контрастности гарантирует, что логотип не &#171;исчезнет&#187;, и в то же время не будет конфликтовать с остальными нашими цветами.</p>
 

diff --git a/scribus.desktop.in → net.scribus.Scribus.desktop b/scribus.desktop.in → net.scribus.Scribus.desktop
@@ -93,16 +93,16 @@ 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@
+TryExec=scribus
+Exec=scribus %f
+Icon=net.scribus.Scribus
 Terminal=false
 MimeType=application/vnd.scribus;
 Categories=Qt;Graphics;Publishing;
-StartupWMClass=scribus@TAG_VERSION@
-DocPath=scribus@TAG_VERSION@
+StartupWMClass=scribus
+DocPath=scribus
 StartupNotify=false
-X-AppInstall-Package=scribus@TAG_VERSION@
+X-AppInstall-Package=scribus
 X-AppInstall-Section=main
 X-KDE-SubstituteUID=false
 X-KDE-Username=

diff --git a/scribus.appdata.xml.in → net.scribus.Scribus.metainfo.xml b/scribus.appdata.xml.in → net.scribus.Scribus.metainfo.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2016 Peter Linnell  plinnell@scribus.net> -->
 <component>
-  <id type="desktop">scribus@TAG_VERSION@.desktop</id>
+<id type="desktop">net.scribus.Scribus</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>
+  <url type="homepage">https://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>
+       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>
+     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">
@@ -37,6 +37,6 @@ separations.</p>
   <releases>
     <release version="1.5.6.1" date="2020-11-14" type="development"/>
     <release version="1.5.6" date="2020-11-07" type="development"/>
-	<release version="1.5.5" date="2019-07-30" type="development"/>
+    <release version="1.5.5" date="2019-07-30" type="development"/>
   </releases>
 </component>
diff --git a/scribus.xml → net.scribus.Scribus.xml b/scribus.xml → net.scribus.Scribus.xml
@@ -27,5 +27,6 @@
     <glob pattern="*.scd" />
     <glob pattern="*.scd.gz" />
     <glob pattern="*.slaz" />
+    <generic-icon name="net.scribus.Scribus"/>
   </mime-type>
 </mime-info>
diff --git a/resources/iconsets/artwork/CMakeLists.txt b/resources/iconsets/artwork/CMakeLists.txt
@@ -11,7 +11,7 @@ if(NOT WIN32 AND NOT APPLE)
 	FOREACH(res 16x16 32x32 128x128 256x256 512x512 1024x1024)
 		INSTALL(FILES
 			icon_${res}.png
-			RENAME scribus${TAG_VERSION}.png
+			RENAME net.scribus.Scribus.png
 			DESTINATION ${SYSICONDIR}/${res}/apps/
 		)
 	ENDFOREACH(res)