Add freedesktop.org desktop files for chocolate-doom, chocolate-setup

(thanks Adrián Chaves Fernández).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2337

Makefile.am

@@ -23,16 +23,6 @@ CODEBLOCKS_FILES=                              \
 	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 @@ EXTRA_DIST=                             \
         $(AUX_DIST_GEN)                 \
         $(MSVC_FILES)                   \
         $(CODEBLOCKS_FILES)             \
-        $(DATA_FILES)                   \
         $(DOC_FILES)                    \
         .lvimrc                         \
         HACKING                         \
@@ -57,7 +46,7 @@ doc_DATA=$(DOC_FILES)
 
 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

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

configure.in

@@ -154,9 +154,12 @@ pkg/config.make
 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

data/.gitignore

@@ -0,0 +1,4 @@
+Makefile.in
+Makefile
+*-doom.png
+*-setup.png

data/Makefile.am

@@ -0,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 = @PROGRAM_PREFIX@doom.png   \
+             @PROGRAM_PREFIX@setup.png
+
+@PROGRAM_PREFIX@doom.png : doom.png
+	cp $^ $@
+
+@PROGRAM_PREFIX@setup.png : setup.png
+	cp $^ $@
+

rpm.spec.in

@@ -51,4 +51,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man6/*
 /usr/share/doc/@PACKAGE@/*
 /usr/games/*
+/usr/share/icons/*
+/usr/share/applications/*
 

setup/.gitignore

@@ -1,7 +1,10 @@
 Makefile.in
 Makefile
 .deps
-chocolate-setup
+setup-manifest.xml
+setup.desktop
+*-setup
+*-setup.desktop
 *.rc
 *.exe
 tags

setup/Makefile.am

@@ -36,6 +36,12 @@ endif
                        @SDLMIXER_LIBS@               \
                        @LDFLAGS@
 
+appdir = $(prefix)/share/applications
+app_DATA = @PROGRAM_PREFIX@setup.desktop
+
+@PROGRAM_PREFIX@setup.desktop : setup.desktop
+	cp $^ $@
+
 .rc.o:
 	$(WINDRES) $^ -o $@
 %.o : %.rc

setup/setup.desktop.in

@@ -0,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;

src/Makefile.am

@@ -185,6 +185,16 @@ EXTRA_DIST =                        \
         icon.c                      \
         doom-screensaver.desktop.in
 
+appdir = $(prefix)/share/applications
+app_DATA = @PROGRAM_PREFIX@doom.desktop              \
+           @PROGRAM_PREFIX@doom-screensaver.desktop
+
+@PROGRAM_PREFIX@doom-screensaver.desktop: doom-screensaver.desktop
+	cp $^ $@
+
+@PROGRAM_PREFIX@doom.desktop : doom.desktop
+	cp $^ $@
+
 .rc.o:
 	$(WINDRES) $^ -o $@
 %.o : %.rc

src/doom-screensaver.desktop.in

@@ -1,8 +1,8 @@
 
 [Desktop Entry]
 Encoding=UTF-8
-Name=Doom
+Name=@PACKAGE_NAME@
-Comment=DOOM by Id Software.
+Comment=@PACKAGE_SHORTDESC@
 TryExec=@PACKAGE_PREFIX@doom
 Exec=@PACKAGE_PREFIX@doom
 StartupNotify=false

src/doom.desktop.in

@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=@PACKAGE_NAME@
+Exec=@PROGRAM_PREFIX@doom
+Icon=@PROGRAM_PREFIX@doom
+Type=Application
+Comment=@PACKAGE_SHORTDESC@
+Categories=Game;ActionGame;