diff -u gtweakui-0.4.0/debian/changelog gtweakui-0.4.0/debian/changelog
--- gtweakui-0.4.0/debian/changelog
+++ gtweakui-0.4.0/debian/changelog
@@ -1,3 +1,30 @@
+gtweakui (0.4.0-2ubuntu1) gutsy; urgency=low
+
+  * gtweakui-galeon.desktop.in:
+    - fixed icon field (LP: #37990)
+    - removed encoding field
+    - removed deprecated value Applications from Categories field
+  * gtweakui-session.desktop.in:  
+    - fixed icon field 
+    - removed encoding field
+    - removed deprecated value Applications from Categories field
+  * gtweakui-nautiilus.desktop.in:
+    - fixed icon field 
+    - removed encoding field
+    - removed deprecated value Applications from Categories field
+  * gtweakui-menus.desktop.in:
+    - fixed icon field 
+    - removed encoding field
+    - removed deprecated value Applications from Categories field
+  * debian/control:
+    - updated maintainer field
+  * debian/dirs:
+    - added default icon directory installation
+  * debian/rules:
+    - installed icon 
+
+ -- Mario Bonino <mariobonino@ubuntu-it.org>  Thu, 04 Oct 2007 18:55:20 +0200
+
 gtweakui (0.4.0-2) unstable; urgency=low
 
   * Minor build cleanups
diff -u gtweakui-0.4.0/debian/dirs gtweakui-0.4.0/debian/dirs
--- gtweakui-0.4.0/debian/dirs
+++ gtweakui-0.4.0/debian/dirs
@@ -4,0 +5 @@
+usr/share/pixmaps
diff -u gtweakui-0.4.0/debian/control gtweakui-0.4.0/debian/control
--- gtweakui-0.4.0/debian/control
+++ gtweakui-0.4.0/debian/control
@@ -1,7 +1,8 @@
 Source: gtweakui
 Section: gnome
 Priority: optional
-Maintainer: Remco van de Meent <remco@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Remco van de Meent <remco@debian.org>
 Build-Depends: debhelper (>= 4.0.0), perl-base (>= 5.8), libgtk2.0-dev, pkg-config, libgnomeui-dev (>= 2.6), libgconf2-dev (>= 2.6), libglade2-dev (>= 1:2.4.0), intltool, libgnome2-dev, scrollkeeper, autotools-dev
 Standards-Version: 3.6.1
 
diff -u gtweakui-0.4.0/debian/rules gtweakui-0.4.0/debian/rules
--- gtweakui-0.4.0/debian/rules
+++ gtweakui-0.4.0/debian/rules
@@ -68,6 +68,9 @@
 	# Add here commands to install the package into debian/gtweakui.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/gtweakui
 
+	# Install icon 
+	install -m 0644 src/g.png $(CURDIR)/debian/gtweakui/usr/share/pixmaps
+
 
 # Build architecture-independent files here.
 binary-indep: build install
only in patch2:
unchanged:
--- gtweakui-0.4.0.orig/gtweakui-menus.desktop.in
+++ gtweakui-0.4.0/gtweakui-menus.desktop.in
@@ -1,12 +1,11 @@
 [Desktop Entry]
-Encoding=UTF-8
 _Name=gTweakUI - Menus
 _Comment=Extra preferences for application menus
 Exec=gtweakui-menus
-Icon=/usr/share/gTweakUI/g.png
+Icon=g
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=GNOME;Application;Settings;
+Categories=GNOME;Settings;
 X-Desktop-File-Install-Version=0.3
 OnlyShowIn=GNOME;
only in patch2:
unchanged:
--- gtweakui-0.4.0.orig/gtweakui-nautilus.desktop.in
+++ gtweakui-0.4.0/gtweakui-nautilus.desktop.in
@@ -1,12 +1,11 @@
 [Desktop Entry]
-Encoding=UTF-8
 _Name=gTweakUI - Nautilus
 _Comment=Extra nautilus preferences
 Exec=gtweakui-nautilus
-Icon=/usr/share/gTweakUI/g.png
+Icon=g
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=GNOME;Application;Settings;
+Categories=GNOME;Settings;
 X-Desktop-File-Install-Version=0.3
 OnlyShowIn=GNOME;
only in patch2:
unchanged:
--- gtweakui-0.4.0.orig/gtweakui-session.desktop.in
+++ gtweakui-0.4.0/gtweakui-session.desktop.in
@@ -1,12 +1,11 @@
 [Desktop Entry]
-Encoding=UTF-8
 _Name=gTweakUI - Session
 _Comment=Extra session preferences
 Exec=gtweakui-session
-Icon=/usr/share/gTweakUI/g.png
+Icon=g
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=GNOME;Application;Settings;
+Categories=GNOME;Settings;
 X-Desktop-File-Install-Version=0.3
 OnlyShowIn=GNOME;
only in patch2:
unchanged:
--- gtweakui-0.4.0.orig/gtweakui-galeon.desktop.in
+++ gtweakui-0.4.0/gtweakui-galeon.desktop.in
@@ -1,12 +1,11 @@
 [Desktop Entry]
-Encoding=UTF-8
 _Name=gTweakUI - Galeon
 _Comment=Extra galeon preferences
 Exec=gtweakui-galeon
-Icon=/usr/share/gTweakUI/g.png
+Icon=g
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=GNOME;Application;Settings;
+Categories=GNOME;Settings;
 X-Desktop-File-Install-Version=0.3
 OnlyShowIn=GNOME;