tuxpaint.desktop installation updates for Freedesktop.org adherence.

Makefile

@@ -7,7 +7,7 @@
 # bill@newbreedsoftware.com
 # http://www.tuxpaint.org/
 
-# June 14, 2002 - February 28, 2008
+# June 14, 2002 - April 3, 2008
 
 
 # The version number, for release:
@@ -566,10 +566,10 @@ clean-win32:
 
 uninstall:	uninstall-i18n
 	-if [ "x$(GNOME_PREFIX)" != "x" ]; then \
-	  rm $(GNOME_PREFIX)/share/gnome/apps/Graphics/tuxpaint.desktop; \
+	  rm $(GNOME_PREFIX)/share/applications/tuxpaint.desktop; \
 	  rm $(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
 	else \
-	  rm /usr/share/gnome/apps/Graphics/tuxpaint.desktop; \
+	  rm /usr/share/applications/tuxpaint.desktop; \
 	  rm /usr/share/pixmaps/tuxpaint.png; \
 	fi
 	-if [ "x$(KDE_PREFIX)" != "x" ]; then \
@@ -633,7 +633,7 @@ install-example-starters:
 	@chmod -R a+rX,g-w,o-w $(DATA_PREFIX)/starters
 
 
-# Install a launcher icon in the Gnome menu, under "Graphics"
+# Install a launcher icon in the Gnome menu
 
 install-gnome:
 	@echo
@@ -642,9 +642,9 @@ install-gnome:
 	 install -d $(PKG_ROOT)$(GNOME_PREFIX)/share/pixmaps; \
 	 cp data/images/icon.png $(PKG_ROOT)/$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
 	 chmod 644 $(PKG_ROOT)$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
-	 install -d $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/Graphics; \
-	 cp src/tuxpaint.desktop $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/Graphics/; \
-	 chmod 644 $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/Graphics/tuxpaint.desktop; \
+	 install -d $(PKG_ROOT)$(GNOME_PREFIX)/share/applications; \
+	 cp src/tuxpaint.desktop $(PKG_ROOT)$(GNOME_PREFIX)/share/applications/; \
+	 chmod 644 $(PKG_ROOT)$(GNOME_PREFIX)/share/applications/tuxpaint.desktop; \
 	fi
 
 

docs/CHANGES.txt

@@ -9,7 +9,7 @@ http://www.tuxpaint.org/
 $Id$
 
 
-2008.March.24 (0.9.20)
+2008.April.3 (0.9.20)
   * Localization Updates:
     ---------------------
     * German translation
@@ -40,6 +40,17 @@ $Id$
       + Separated devel packages in RPM spec.
       + Added dependency on SDL_Pango.
       TOYAMA Shin-ichi <shin1@wmail.plala.or.jp>
+
+    * Placing Tux Paint launcher icon ("tuxpaint.desktop") in
+      'applications', rather than 'gnome/apps/Graphics', per Freedesktop.org
+      standards.
+      (SourceForge Bug #1932808, via Ubuntu)
+
+    * Added "Categories" back to the 'tuxpaint.desktop' file
+      ("Education," and "Art").  NOTE: You need to edit 'tuxpaint.desktop.in',
+      otherwise changes will be overwritten the next time 'tuxpaint.desktop'
+      is generated!
+      (SourceForge Bug #1932808, via Ubuntu)
     
   * Documentation Improvements:
     ---------------------------

src/tuxpaint.desktop

@@ -71,6 +71,7 @@ Type=Application
 Exec=tuxpaint
 Icon=tuxpaint
 Terminal=false
+Categories=Education; Art;
 GenericName=Drawing program
 GenericName[af]=Tekenprogram
 GenericName[ar]=برنامج رسم

src/tuxpaint.desktop.in

@@ -5,5 +5,6 @@ Type=Application
 Exec=tuxpaint
 Icon=tuxpaint
 Terminal=false
+Categories=Education; Art;
 _GenericName=Drawing program
 _Comment=A drawing program for children.