ref: fc334b080914a2694983d9d121e709ccceb4006f
parent: 0fb3f5cd0d297de8e10610e4a6cc98d9ca41af4a
parent: 46dbe96efd039d49a4a43603f823340520eccfaa
author: Simon Howard <fraggle+github@gmail.com>
date: Fri Jun 13 13:39:43 EDT 2014
Merge pull request #410 from chungy/desktop Add desktop entries for all the games, make the Setup launch generic
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
AC_INIT(Chocolate Doom, 2.0.0, fraggle@gmail.com, chocolate-doom)
-PACKAGE_SHORTDESC="Conservative Doom source port"
+PACKAGE_SHORTNAME=${PACKAGE_NAME% Doom}+PACKAGE_SHORTDESC="Conservative source port"
PACKAGE_COPYRIGHT="Copyright (C) 1993-2013"
PACKAGE_LICENSE="GNU General Public License, version 2"
PACKAGE_MAINTAINER="Simon Howard"
@@ -135,6 +136,7 @@
AC_SUBST(ac_aux_dir)
+AC_SUBST(PACKAGE_SHORTNAME)
AC_SUBST(PACKAGE_SHORTDESC)
AC_SUBST(PACKAGE_COPYRIGHT)
AC_SUBST(PACKAGE_LICENSE)
@@ -160,7 +162,9 @@
src/doom.desktop
src/doom-screensaver.desktop
src/doom/Makefile
+src/heretic.desktop
src/heretic/Makefile
+src/hexen.desktop
src/hexen/Makefile
src/resource.rc
src/setup-res.rc
@@ -167,6 +171,7 @@
src/setup/Makefile
src/setup/setup.desktop
src/setup/setup-manifest.xml
+src/strife.desktop
src/strife/Makefile
textscreen/Makefile
textscreen/examples/Makefile
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -218,10 +218,23 @@
manifest.xml
appdir = $(prefix)/share/applications
-app_DATA = @PROGRAM_PREFIX@doom.desktop
+app_DATA = \
+ @PROGRAM_PREFIX@doom.desktop \
+ @PROGRAM_PREFIX@heretic.desktop \
+ @PROGRAM_PREFIX@hexen.desktop \
+ @PROGRAM_PREFIX@strife.desktop
@PROGRAM_PREFIX@doom.desktop : doom.desktop
cp doom.desktop $@
+
+@PROGRAM_PREFIX@heretic.desktop : heretic.desktop
+ cp heretic.desktop $@
+
+@PROGRAM_PREFIX@hexen.desktop : hexen.desktop
+ cp hexen.desktop $@
+
+@PROGRAM_PREFIX@strife.desktop : strife.desktop
+ cp strife.desktop $@
screensaverdir = $(prefix)/share/applications/screensavers
screensaver_DATA = @PROGRAM_PREFIX@doom-screensaver.desktop
--- a/src/doom-screensaver.desktop.in
+++ b/src/doom-screensaver.desktop.in
@@ -1,6 +1,5 @@
-
[Desktop Entry]
-Name=@PACKAGE_NAME@
+Name=@PACKAGE_SHORTNAME@ Doom
Comment=@PACKAGE_SHORTDESC@
TryExec=@PROGRAM_PREFIX@doom
Exec=@PROGRAM_PREFIX@doom
@@ -7,6 +6,5 @@
StartupNotify=false
Terminal=false
Type=Application
-OnlyShowIn=GNOME;
+OnlyShowIn=GNOME;MATE;
Categories=Screensaver;
-
--- a/src/doom.desktop.in
+++ b/src/doom.desktop.in
@@ -1,5 +1,5 @@
[Desktop Entry]
-Name=@PACKAGE_NAME@
+Name=@PACKAGE_SHORTNAME@ Doom
Exec=@PROGRAM_PREFIX@doom
Icon=@PROGRAM_PREFIX@doom
Type=Application
--- /dev/null
+++ b/src/heretic.desktop.in
@@ -1,0 +1,7 @@
+[Desktop Entry]
+Name=@PACKAGE_SHORTNAME@ Heretic
+Exec=@PROGRAM_PREFIX@heretic
+Icon=@PROGRAM_PREFIX@doom
+Type=Application
+Comment=@PACKAGE_SHORTDESC@
+Categories=Game;ActionGame;
--- /dev/null
+++ b/src/hexen.desktop.in
@@ -1,0 +1,7 @@
+[Desktop Entry]
+Name=@PACKAGE_SHORTNAME@ Hexen
+Exec=@PROGRAM_PREFIX@hexen
+Icon=@PROGRAM_PREFIX@doom
+Type=Application
+Comment=@PACKAGE_SHORTDESC@
+Categories=Game;ActionGame;
--- a/src/setup/setup.desktop.in
+++ b/src/setup/setup.desktop.in
@@ -1,7 +1,7 @@
[Desktop Entry]
-Name=@PACKAGE_NAME@ Setup
-Exec=@PROGRAM_PREFIX@doom-setup
+Name=@PACKAGE_SHORTNAME@ Setup
+Exec=@PROGRAM_PREFIX@setup
Icon=@PROGRAM_PREFIX@setup
Type=Application
-Comment=Setup tool for @PACKAGE_NAME@
+Comment=Setup tool for @PACKAGE_SHORTNAME@
Categories=Settings
--- /dev/null
+++ b/src/strife.desktop.in
@@ -1,0 +1,7 @@
+[Desktop Entry]
+Name=@PACKAGE_SHORTNAME@ Strife
+Exec=@PROGRAM_PREFIX@strife
+Icon=@PROGRAM_PREFIX@doom
+Type=Application
+Comment=@PACKAGE_SHORTDESC@
+Categories=Game;ActionGame;