diff -u tuxpaint-config-0.0.8/debian/changelog tuxpaint-config-0.0.8/debian/changelog
--- tuxpaint-config-0.0.8/debian/changelog
+++ tuxpaint-config-0.0.8/debian/changelog
@@ -1,3 +1,15 @@
+tuxpaint-config (0.0.8-1ubuntu1) hardy; urgency=low
+
+  * Added quilt as patch system:
+    - Added quilt on debian/control as Build-depends
+    - Added quild.make at debian/rules 
+  * Modified Makefile for correct .desktop file installation 
+  * Modified .desktop file to match the freedesktop.org Specs
+    (Closes LP: #173294)
+  * Modified Maintainer value to match Debian-Mantainer-Field Spec
+
+ -- Nicolas Valcárcel <nvalcarcel@ubuntu-pe.org>  Tue, 25 Dec 2007 21:50:36 -0500
+
 tuxpaint-config (0.0.8-1) unstable; urgency=low
 
   * New upstream release.
diff -u tuxpaint-config-0.0.8/debian/control tuxpaint-config-0.0.8/debian/control
--- tuxpaint-config-0.0.8/debian/control
+++ tuxpaint-config-0.0.8/debian/control
@@ -1,8 +1,9 @@
 Source: tuxpaint-config
 Section: graphics
 Priority: optional
-Maintainer: Ben Armstrong <synrg@sanctuary.nslug.ns.ca>
-Build-Depends: debhelper (>= 4.0.0), libfltk1.1-dev, libxft-dev, libxinerama-dev, libpaper-dev
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Ben Armstrong <synrg@sanctuary.nslug.ns.ca>
+Build-Depends: quilt, debhelper (>= 4.0.0), libfltk1.1-dev, libxft-dev, libxinerama-dev, libpaper-dev
 Standards-Version: 3.7.2
 
 Package: tuxpaint-config
diff -u tuxpaint-config-0.0.8/debian/rules tuxpaint-config-0.0.8/debian/rules
--- tuxpaint-config-0.0.8/debian/rules
+++ tuxpaint-config-0.0.8/debian/rules
@@ -3,6 +3,8 @@
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
+include /usr/share/quilt/quilt.make
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -29,7 +31,7 @@
 
 build: build-stamp
 
-build-stamp: configure-stamp 
+build-stamp: configure-stamp patch
 	dh_testdir
 
 	# Add here commands to compile the package.
@@ -37,7 +39,7 @@
 
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
only in patch2:
unchanged:
--- tuxpaint-config-0.0.8.orig/debian/patches/series
+++ tuxpaint-config-0.0.8/debian/patches/series
@@ -0,0 +1 @@
+01desktop.install.diff
only in patch2:
unchanged:
--- tuxpaint-config-0.0.8.orig/debian/patches/01desktop.install.diff
+++ tuxpaint-config-0.0.8/debian/patches/01desktop.install.diff
@@ -0,0 +1,56 @@
+Index: tuxpaint-config-0.0.8/Makefile
+===================================================================
+--- tuxpaint-config-0.0.8.orig/Makefile	2007-12-25 23:53:37.000000000 -0500
++++ tuxpaint-config-0.0.8/Makefile	2007-12-25 23:55:23.000000000 -0500
+@@ -175,10 +175,10 @@
+ # are the same as they were when you installed, of course!!!
+ 
+ uninstall:
+-#	if [ "x$(GNOME_PREFIX)" != "x" ]; then \
+-#	  -rm $(GNOME_PREFIX)/share/gnome/apps/Graphics/tuxpaint-config.desktop; \
+-#	  -rm $(GNOME_PREFIX)/share/pixmaps/tuxpaint-config.png; \
+-#	fi
++	if [ "x$(GNOME_PREFIX)" != "x" ]; then \
++	  -rm $(GNOME_PREFIX)/share/applications/tuxpaint-config.desktop; \
++	  -rm $(GNOME_PREFIX)/share/pixmaps/tuxpaint-config.png; \
++	fi
+ 	if [ "x$(KDE_PREFIX)" != "x" ]; then \
+ 	  rm $(KDE_PREFIX)/Preferences/tuxpaint-config.desktop; \
+ 	fi
+@@ -193,16 +193,16 @@
+ # Install a launcher icon in the Gnome menu, under "???"
+ 
+ install-gnome:
+-#	@echo
+-#	@echo "...Installing launcher icon into GNOME..."
+-#	if [ "x$(GNOME_PREFIX)" != "x" ]; then \
+-#	 install -d $(GNOME_PREFIX)/share/pixmaps; \
+-#	 cp data/images/icon.png $(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
+-#	 chmod 644 $(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
+-#	 install -d $(GNOME_PREFIX)/share/gnome/apps/Graphics; \
+-#	 cp src/tuxpaint.desktop $(GNOME_PREFIX)/share/gnome/apps/Graphics/; \
+-#	 chmod 644 $(GNOME_PREFIX)/share/gnome/apps/Graphics/tuxpaint.desktop; \
+-#	fi
++	@echo
++	@echo "...Installing launcher icon into GNOME..."
++	if [ "x$(GNOME_PREFIX)" != "x" ]; then \
++	 install -d $(GNOME_PREFIX)/share/pixmaps; \
++	 cp data/images/icon.png $(GNOME_PREFIX)/share/pixmaps/tuxpaint-config.png; \
++	 chmod 644 $(GNOME_PREFIX)/share/pixmaps/tuxpaint-config.png; \
++	 install -d $(GNOME_PREFIX)/share/applications; \
++	 cp src/tuxpaint-config.desktop $(GNOME_PREFIX)/share/applications/; \
++	 chmod 644 $(GNOME_PREFIX)/share/applications/tuxpaint-config.desktop; \
++	fi
+ 
+ 
+ # Install a launcher icon in the KDE menu...
+Index: tuxpaint-config-0.0.8/src/tuxpaint-config.desktop
+===================================================================
+--- tuxpaint-config-0.0.8.orig/src/tuxpaint-config.desktop	2007-12-25 23:55:36.000000000 -0500
++++ tuxpaint-config-0.0.8/src/tuxpaint-config.desktop	2007-12-25 23:55:53.000000000 -0500
+@@ -6,4 +6,4 @@
+ Exec=tuxpaint-config
+ Terminal=false
+ Type=Application
+-Categories=Settings;
++Categories=Education; Art;