Applied patch by hanno boeck (ctulhu) to fix .desktop files.

.desktop.in are now useless so I removed them from the svn
and added the .desktop instead. Updated configure script
accordingly.

desmume/INSTALL

@@ -2,7 +2,7 @@ Installation Instructions
 *************************
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
+2006, 2007 Free Software Foundation, Inc.
 
 This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
@@ -67,6 +67,9 @@ The simplest way to compile this package is:
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
+  6. Often, you can also type `make uninstall' to remove the installed
+     files again.
+
 Compilers and Options
 =====================
 

desmume/configure.ac

@@ -196,9 +196,7 @@ AC_CONFIG_FILES([Makefile
                  src/cli/Makefile
                  src/cocoa/Makefile
                  src/gtk/Makefile
-                 src/gtk/desmume.desktop
                  src/gtk-glade/Makefile
-                 src/gtk-glade/desmume-glade.desktop
                  src/windows/Makefile
 		 src/gdbstub/Makefile
 		 autopackage/default.apspec

desmume/src/gtk-glade/desmume-glade.desktop

@@ -1,10 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
-Version=@VERSION@
+Version=1.0
 Type=Application
 Name=DeSmuME (Gtk-Glade)
 Comment=Nintento DS emulator
 TryExec=desmume-glade
 Exec=desmume-glade
-Icon=DeSmuME.xpm
-Categories=GNOME;GTK;Game;Emulator
+Icon=DeSmuME
+Categories=GNOME;GTK;Game;Emulator;

desmume/src/gtk/desmume.desktop

@@ -1,10 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
-Version=@VERSION@
+Version=1.0
 Type=Application
 Name=DeSmuME (Gtk)
 Comment=Nintento DS emulator
 TryExec=desmume
 Exec=desmume
-Icon=DeSmuME.xpm
-Categories=GNOME;GTK;Game;Emulator
+Icon=DeSmuME
+Categories=GNOME;GTK;Game;Emulator;