diff -u htop-0.7/debian/control htop-0.7/debian/control
--- htop-0.7/debian/control
+++ htop-0.7/debian/control
@@ -1,7 +1,8 @@
 Source: htop
 Section: utils
 Priority: optional
-Maintainer: Bartosz Fenski <fenio@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Bartosz Fenski <fenio@debian.org>
 Build-Depends: debhelper (>= 4.0.0), libncurses5-dev, autotools-dev
 Standards-Version: 3.7.3
 Homepage: http://htop.sourceforge.net
diff -u htop-0.7/debian/changelog htop-0.7/debian/changelog
--- htop-0.7/debian/changelog
+++ htop-0.7/debian/changelog
@@ -1,3 +1,12 @@
+htop (0.7-1ubuntu1) intrepid; urgency=low
+
+  * Modify htop.desktop to make it validate with
+    desktop-file-validate (LP: #244399)
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Nathan Handler <nathan.handler@gmail.com>  Mon, 30 Jun 2008 19:56:18 -0500
+
 htop (0.7-1) unstable; urgency=low
 
   * New upstrem version. (Closes: #452634)
only in patch2:
unchanged:
--- htop-0.7.orig/htop.desktop
+++ htop-0.7/htop.desktop
@@ -1,12 +1,10 @@
 [Desktop Entry]
-Encoding=UTF-8
-Version=0.7
+Version=1.0
 Name=Htop
 Type=Application
 Comment=Show System Processes
 Terminal=true
 Exec=htop
-Path=
 Icon=htop
-Categories=ConsoleOnly;System;Application;
+Categories=ConsoleOnly;System;
 GenericName=Process Viewer