ref: d07b88e469abbb7c82d10fbe17473d529aaa4388
parent: 184ea9ba501adf04b9b352760774fde268c0cc7f
author: Simon Howard <[email protected]>
date: Sat May 14 17:07:55 EDT 2011
Add freedesktop.org desktop files for chocolate-doom, chocolate-setup (thanks Adrián Chaves Fernández). Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2337
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,16 +23,6 @@
codeblocks/setup-res.rc \
codeblocks/textscreen.cbp
-DATA_FILES= \
- data/README \
- data/doom.ico \
- data/doom8.ico \
- data/doom.png \
- data/setup.ico \
- data/setup8.ico \
- data/setup.png \
- data/convert-icon
-
DOC_FILES= \
CMDLINE \
README \
@@ -45,7 +35,6 @@
$(AUX_DIST_GEN) \
$(MSVC_FILES) \
$(CODEBLOCKS_FILES) \
- $(DATA_FILES) \
$(DOC_FILES) \
.lvimrc \
HACKING \
@@ -57,7 +46,7 @@
MAINTAINERCLEANFILES = $(AUX_DIST_GEN)
-SUBDIRS=wince textscreen opl pcsound src man setup
+SUBDIRS=wince textscreen opl pcsound data src man setup
DIST_SUBDIRS=pkg $(SUBDIRS)
if HAVE_PYTHON
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,10 @@
more polished.
* In Mac OS X, it is now possible to simply double click an IWAD
file in the Finder to configure its location within the launcher.
+ * Freedesktop.org desktop files are now installed for Doom and
+ the setup tool, which will appear in the main menu on desktop
+ environments such as Gnome and KDE (thanks Adrián Chaves
+ Fernández).
Compatibility:
* Added support for the alternate version of the Final Doom
--- a/configure.in
+++ b/configure.in
@@ -154,9 +154,12 @@
pkg/osx/Info.plist
pkg/osx/Info-gnustep.plist
setup/Makefile
+setup/setup.desktop
setup/setup-res.rc
setup/setup-manifest.xml
+data/Makefile
src/Makefile
+src/doom.desktop
src/doom-screensaver.desktop
src/resource.rc
textscreen/Makefile
--- /dev/null
+++ b/data/.gitignore
@@ -1,0 +1,4 @@
+Makefile.in
+Makefile
+*-doom.png
+*-setup.png
--- /dev/null
+++ b/data/Makefile.am
@@ -1,0 +1,21 @@
+
+EXTRA_DIST= \
+ README \
+ doom.ico \
+ doom8.ico \
+ doom.png \
+ setup.ico \
+ setup8.ico \
+ setup.png \
+ convert-icon
+
+iconsdir = $(prefix)/share/icons
+icons_DATA = @[email protected] \
+ @[email protected]
+
+@[email protected] : doom.png
+ cp $^ $@
+
+@[email protected] : setup.png
+ cp $^ $@
+
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -51,4 +51,6 @@
%doc %{_mandir}/man6/*/usr/share/doc/@PACKAGE@/*
/usr/games/*
+/usr/share/icons/*
+/usr/share/applications/*
--- a/setup/.gitignore
+++ b/setup/.gitignore
@@ -1,7 +1,10 @@
Makefile.in
Makefile
.deps
-chocolate-setup
+setup-manifest.xml
+setup.desktop
+*-setup
+*-setup.desktop
*.rc
*.exe
tags
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -36,6 +36,12 @@
@SDLMIXER_LIBS@ \
@LDFLAGS@
+appdir = $(prefix)/share/applications
+app_DATA = @[email protected]
+
+@[email protected] : setup.desktop
+ cp $^ $@
+
.rc.o:
$(WINDRES) $^ -o $@
%.o : %.rc
--- /dev/null
+++ b/setup/setup.desktop.in
@@ -1,0 +1,7 @@
+[Desktop Entry]
+Name=@PACKAGE_NAME@ Setup
+Exec=@PROGRAM_PREFIX@setup
+Icon=@PROGRAM_PREFIX@setup
+Type=Application
+Comment=Setup tool for @PACKAGE_NAME@
+Categories=Settings;ConsoleOnly;
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -185,6 +185,16 @@
icon.c \
doom-screensaver.desktop.in
+appdir = $(prefix)/share/applications
+app_DATA = @[email protected] \
+ @[email protected]
+
+@[email protected]: doom-screensaver.desktop
+ cp $^ $@
+
+@[email protected] : doom.desktop
+ cp $^ $@
+
.rc.o:
$(WINDRES) $^ -o $@
%.o : %.rc
--- a/src/doom-screensaver.desktop.in
+++ b/src/doom-screensaver.desktop.in
@@ -1,8 +1,8 @@
[Desktop Entry]
Encoding=UTF-8
-Name=Doom
-Comment=DOOM by Id Software.
+Name=@PACKAGE_NAME@
+Comment=@PACKAGE_SHORTDESC@
TryExec=@PACKAGE_PREFIX@doom
Exec=@PACKAGE_PREFIX@doom
StartupNotify=false
--- /dev/null
+++ b/src/doom.desktop.in
@@ -1,0 +1,7 @@
+[Desktop Entry]
+Name=@PACKAGE_NAME@
+Exec=@PROGRAM_PREFIX@doom
+Icon=@PROGRAM_PREFIX@doom
+Type=Application
+Comment=@PACKAGE_SHORTDESC@
+Categories=Game;ActionGame;