diff -u gkrellm-2.3.1/debian/control gkrellm-2.3.1/debian/control
--- gkrellm-2.3.1/debian/control
+++ gkrellm-2.3.1/debian/control
@@ -1,16 +1,18 @@
 Source: gkrellm
 Section: x11
 Priority: optional
-Maintainer: Jose Luis Rivas <ghostbar38@gmail.com>
-Standards-Version: 3.7.3
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Jose Luis Rivas <ghostbar38@gmail.com>
 Build-Depends: gdk-imlib1-dev, libglib2.0-dev, libgtk2.0-dev, debhelper (>= 5), libsm-dev, x-dev, gettext, libgnutls-dev, quilt, cdbs
+Homepage: http://gkrellm.net/
+Standards-Version: 3.7.3
 
 Package: gkrellm
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Provides: gkrellm-common
-Conflicts: gkrellm-common (<= 2.2.7-5), gkrellmd (<= 2.2.7-8)
-Replaces: gkrellm-common (<= 2.2.7-5)
+Conflicts: gkrellm-common (<< 2.2.10-2), gkrellmd (<< 2.2.10-2)
+Replaces: gkrellm-common (<< 2.2.10-2)
 Description: The GNU Krell Monitors
  With a single process, gkrellm manages multiple stacked monitors and supports
  applying themes to match the monitors appearance to your window manager, Gtk,
diff -u gkrellm-2.3.1/debian/changelog gkrellm-2.3.1/debian/changelog
--- gkrellm-2.3.1/debian/changelog
+++ gkrellm-2.3.1/debian/changelog
@@ -1,3 +1,12 @@
+gkrellm (2.3.1-1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable, remaining Ubuntu changes: (LP: #176807)
+    - debian/gkrellmd.postrm added to remove gkrellmd user on remove/purge
+    - Homepage
+  * Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Pedro Fragoso <emberez@gmail.com>  Sun, 16 Dec 2007 21:43:47 +0000
+
 gkrellm (2.3.1-1) unstable; urgency=low
 
   * New upstream release
@@ -22,6 +31,28 @@
 
  -- Jose Luis Rivas <ghostbar38@gmail.com>  Sat, 15 Dec 2007 22:10:55 -0430
 
+gkrellm (2.3.1-0ubuntu1) hardy; urgency=low
+
+  * New upstream release:
+    - debian/patches dropped 02_configure 03_mail fixed on upstream.
+    - debian/patches updated 01_gkrellmd.conf.
+    - debian/gkrellmd.postrm added to remove gkrellmd user on remove/purge.
+    - debian/rules remove commented lines.
+    - debian/gkrellm.menu changed  //gkrellm.xpm to /gkrellm.xpm.
+    - debian/control added Homepage.
+    - debian/copyright added GPLv3.
+  * Fixes (LP: #174575)
+ 
+ -- Pedro Fragoso <emberez@gmail.com>  Fri, 07 Dec 2007 00:54:57 +0000
+
+gkrellm (2.2.10-2ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Adjust Conflicts/Replaces versions for Ubuntu
+    - Update Maintainer field in debian/control
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Fri, 29 Jun 2007 23:32:37 +0200
+
 gkrellm (2.2.10-2) unstable; urgency=low
 
   * New maintainer (Closes: #424890)
@@ -33,6 +64,14 @@
 
  -- Jose Luis Rivas <ghostbar38@gmail.com>  Sat, 02 Jun 2007 00:50:52 -0400
 
+gkrellm (2.2.10-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - debian/control: Adjust Conflicts/Replaces versions for Ubuntu
+  * Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Stephan Hermann <sh@sourcecode.de>  Sat,  5 May 2007 13:15:24 +0200
+
 gkrellm (2.2.10-1) unstable; urgency=low
 
   * New upstream release (Closes: #407154)
@@ -43,6 +82,13 @@
 
  -- Cai Qian <caiqian@debian.org>  Thu, 15 Feb 2007 16:42:45 +0800
 
+gkrellm (2.2.9-1ubuntu2) edgy; urgency=low
+
+  * debian/control:
+    + Adjust Conflicts/Replaces versions for Ubuntu
+
+ -- Sebastian Dröge <slomo@ubuntu.com>  Tue, 18 Jul 2006 09:47:30 +0200
+
 gkrellm (2.2.9-1) unstable; urgency=low
 
   * New upstream release (fixed segfault on battery plugin)
@@ -88,13 +134,13 @@
   * dropped header files.
 
  -- Cai Qian <caiqian@debian.org>  Tue, 17 Jan 2006 13:00:01 +0000
-	
+
 gkrellm (2.2.7-5) unstable; urgency=low
 
   * Prevented gkrellm linked to libssl. (Closes: #337728)
 	
  -- Cai Qian <caiqian@debian.org>  Mon, 8 Nov 2005 23:36:00 +0000
-	
+
 gkrellm (2.2.7-4) unstable; urgency=low
 
   * Changed "Architecture" for d4x-common to "all".
@@ -895,0 +942 @@
+
only in patch2:
unchanged:
--- gkrellm-2.3.1.orig/debian/gkrellmd.postrm
+++ gkrellm-2.3.1/debian/gkrellmd.postrm
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+USER=`/usr/bin/getent passwd gkrellmd`
+
+if [ "$1" = "purge" ]; then
+	if [ "x$USER" != "x" ]; then
+		deluser --remove-all-files gkrellmd
+	fi
+fi
+
+#DEBHELPER#
+
+exit 0
+