shithub: choc

Download patch

ref: bc50bd123e2b43ff404599b2a017a98261a66e47
parent: 4ec9978b44011e85eae623ce7be7c705f05ca491
author: Mike Swanson <mikeonthecomputer@gmail.com>
date: Sat Sep 7 06:57:50 EDT 2019 

use reverse-DNS naming for installing *.desktop files

This is similar to and consistent with the previous commit, and the
desktop entry specification recommends doing this as well.


--- a/configure.ac
+++ b/configure.ac
@@ -168,22 +168,22 @@
 data/Makefile
 src/Makefile
 src/Doom.metainfo.xml
-src/doom.desktop
-src/doom-screensaver.desktop
+src/Doom.desktop
+src/Doom_Screensaver.desktop
 src/doom/Makefile
 src/Heretic.metainfo.xml
-src/heretic.desktop
+src/Heretic.desktop
 src/heretic/Makefile
 src/Hexen.metainfo.xml
-src/hexen.desktop
+src/Hexen.desktop
 src/hexen/Makefile
 src/resource.rc
 src/setup-res.rc
 src/setup/Makefile
-src/setup/setup.desktop
+src/setup/Setup.desktop
 src/setup/setup-manifest.xml
 src/Strife.metainfo.xml
-src/strife.desktop
+src/Strife.desktop
 src/strife/Makefile
 textscreen/Makefile
 textscreen/examples/Makefile
--- /dev/null
+++ b/src/Doom.desktop.in
@@ -1,0 +1,8 @@
+[Desktop Entry]
+Name=@PACKAGE_SHORTNAME@ Doom
+Exec=@PROGRAM_PREFIX@doom
+Icon=@PROGRAM_PREFIX@doom
+Type=Application
+Comment=@PACKAGE_SHORTDESC@
+Categories=Game;ActionGame;
+Keywords=first;person;shooter;vanilla;
--- /dev/null
+++ b/src/Doom_Screensaver.desktop.in
@@ -1,0 +1,10 @@
+[Desktop Entry]
+Name=@PACKAGE_SHORTNAME@ Doom
+Comment=@PACKAGE_SHORTDESC@
+TryExec=@PROGRAM_PREFIX@doom
+Exec=@PROGRAM_PREFIX@doom
+StartupNotify=false
+Terminal=false
+Type=Application
+OnlyShowIn=GNOME;MATE;
+Categories=Screensaver;
--- /dev/null
+++ b/src/Heretic.desktop.in
@@ -1,0 +1,8 @@
+[Desktop Entry]
+Name=@PACKAGE_SHORTNAME@ Heretic
+Exec=@PROGRAM_PREFIX@heretic
+Icon=@PROGRAM_PREFIX@doom
+Type=Application
+Comment=@PACKAGE_SHORTDESC@
+Categories=Game;ActionGame;
+Keywords=first;person;shooter;doom;vanilla;
--- /dev/null
+++ b/src/Hexen.desktop.in
@@ -1,0 +1,8 @@
+[Desktop Entry]
+Name=@PACKAGE_SHORTNAME@ Hexen
+Exec=@PROGRAM_PREFIX@hexen
+Icon=@PROGRAM_PREFIX@doom
+Type=Application
+Comment=@PACKAGE_SHORTDESC@
+Categories=Game;ActionGame;
+Keywords=first;person;shooter;doom;vanilla;
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -217,7 +217,7 @@
 EXTRA_DIST =                        \
         CMakeLists.txt              \
         icon.c                      \
-        doom-screensaver.desktop.in \
+        Doom_Screensaver.desktop.in \
         manifest.xml
 
 metainfodir = $(prefix)/share/metainfo
@@ -241,28 +241,28 @@
 
 appdir = $(prefix)/share/applications
 app_DATA =                                 \
-           @PROGRAM_PREFIX@doom.desktop    \
-           @PROGRAM_PREFIX@heretic.desktop \
-           @PROGRAM_PREFIX@hexen.desktop   \
-           @PROGRAM_PREFIX@strife.desktop
+           @PACKAGE_RDNS@.Doom.desktop    \
+           @PACKAGE_RDNS@.Heretic.desktop \
+           @PACKAGE_RDNS@.Hexen.desktop   \
+           @PACKAGE_RDNS@.Strife.desktop
 
-@PROGRAM_PREFIX@doom.desktop : doom.desktop
-	cp doom.desktop $@
+@PACKAGE_RDNS@.Doom.desktop : Doom.desktop
+	cp Doom.desktop $@
 
-@PROGRAM_PREFIX@heretic.desktop : heretic.desktop
-	cp heretic.desktop $@
+@PACKAGE_RDNS@.Heretic.desktop : Heretic.desktop
+	cp Heretic.desktop $@
 
-@PROGRAM_PREFIX@hexen.desktop : hexen.desktop
-	cp hexen.desktop $@
+@PACKAGE_RDNS@.Hexen.desktop : Hexen.desktop
+	cp Hexen.desktop $@
 
-@PROGRAM_PREFIX@strife.desktop : strife.desktop
-	cp strife.desktop $@
+@PACKAGE_RDNS@.Strife.desktop : Strife.desktop
+	cp Strife.desktop $@
 
 screensaverdir = $(prefix)/share/applications/screensavers
-screensaver_DATA = @PROGRAM_PREFIX@doom-screensaver.desktop
+screensaver_DATA = @PACKAGE_RDNS@.Doom_Screensaver.desktop
 
-@PROGRAM_PREFIX@doom-screensaver.desktop: doom-screensaver.desktop
-	cp doom-screensaver.desktop $@
+@PACKAGE_RDNS@.Doom_Screensaver.desktop: Doom_Screensaver.desktop
+	cp Doom_Screensaver.desktop $@
 
 CLEANFILES = $(execgames_SCRIPTS) $(app_DATA) $(screensaver_DATA)
 
--- /dev/null
+++ b/src/Strife.desktop.in
@@ -1,0 +1,8 @@
+[Desktop Entry]
+Name=@PACKAGE_SHORTNAME@ Strife
+Exec=@PROGRAM_PREFIX@strife
+Icon=@PROGRAM_PREFIX@doom
+Type=Application
+Comment=@PACKAGE_SHORTDESC@
+Categories=Game;ActionGame;
+Keywords=first;person;shooter;doom;vanilla;
--- a/src/doom-screensaver.desktop.in
+++ /dev/null
@@ -1,10 +1,0 @@
-[Desktop Entry]
-Name=@PACKAGE_SHORTNAME@ Doom
-Comment=@PACKAGE_SHORTDESC@
-TryExec=@PROGRAM_PREFIX@doom
-Exec=@PROGRAM_PREFIX@doom
-StartupNotify=false
-Terminal=false
-Type=Application
-OnlyShowIn=GNOME;MATE;
-Categories=Screensaver;
--- a/src/doom.desktop.in
+++ /dev/null
@@ -1,8 +1,0 @@
-[Desktop Entry]
-Name=@PACKAGE_SHORTNAME@ Doom
-Exec=@PROGRAM_PREFIX@doom
-Icon=@PROGRAM_PREFIX@doom
-Type=Application
-Comment=@PACKAGE_SHORTDESC@
-Categories=Game;ActionGame;
-Keywords=first;person;shooter;vanilla;
--- a/src/heretic.desktop.in
+++ /dev/null
@@ -1,8 +1,0 @@
-[Desktop Entry]
-Name=@PACKAGE_SHORTNAME@ Heretic
-Exec=@PROGRAM_PREFIX@heretic
-Icon=@PROGRAM_PREFIX@doom
-Type=Application
-Comment=@PACKAGE_SHORTDESC@
-Categories=Game;ActionGame;
-Keywords=first;person;shooter;doom;vanilla;
--- a/src/hexen.desktop.in
+++ /dev/null
@@ -1,8 +1,0 @@
-[Desktop Entry]
-Name=@PACKAGE_SHORTNAME@ Hexen
-Exec=@PROGRAM_PREFIX@hexen
-Icon=@PROGRAM_PREFIX@doom
-Type=Application
-Comment=@PACKAGE_SHORTDESC@
-Categories=Game;ActionGame;
-Keywords=first;person;shooter;doom;vanilla;
--- a/src/setup/Makefile.am
+++ b/src/setup/Makefile.am
@@ -26,12 +26,12 @@
     setup_icon.c
 
 appdir = $(prefix)/share/applications
-app_DATA = @PROGRAM_PREFIX@setup.desktop
+app_DATA = @PACKAGE_RDNS@.Setup.desktop
 
 CLEANFILES = $(app_DATA)
 
-@PROGRAM_PREFIX@setup.desktop : setup.desktop
-	cp setup.desktop $@
+@PACKAGE_RDNS@.Setup.desktop : Setup.desktop
+	cp Setup.desktop $@
 
 if HAVE_PYTHON
 
--- /dev/null
+++ b/src/setup/Setup.desktop.in
@@ -1,0 +1,8 @@
+[Desktop Entry]
+Name=@PACKAGE_SHORTNAME@ Setup
+Exec=@PROGRAM_PREFIX@setup
+Icon=@PROGRAM_PREFIX@setup
+Type=Application
+Comment=Setup tool for @PACKAGE_SHORTNAME@
+Categories=Settings;
+Keywords=first;person;shooter;doom;heretic;hexen;strife;vanilla;
--- a/src/setup/setup.desktop.in
+++ /dev/null
@@ -1,8 +1,0 @@
-[Desktop Entry]
-Name=@PACKAGE_SHORTNAME@ Setup
-Exec=@PROGRAM_PREFIX@setup
-Icon=@PROGRAM_PREFIX@setup
-Type=Application
-Comment=Setup tool for @PACKAGE_SHORTNAME@
-Categories=Settings;
-Keywords=first;person;shooter;doom;heretic;hexen;strife;vanilla;
--- a/src/strife.desktop.in
+++ /dev/null
@@ -1,8 +1,0 @@
-[Desktop Entry]
-Name=@PACKAGE_SHORTNAME@ Strife
-Exec=@PROGRAM_PREFIX@strife
-Icon=@PROGRAM_PREFIX@doom
-Type=Application
-Comment=@PACKAGE_SHORTDESC@
-Categories=Game;ActionGame;
-Keywords=first;person;shooter;doom;vanilla;