diff -u itop-0.1/debian/control itop-0.1/debian/control
--- itop-0.1/debian/control
+++ itop-0.1/debian/control
@@ -1,7 +1,8 @@
 Source: itop
 Section: admin
 Priority: extra
-Maintainer: Jose Parrella <bureado@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Jose Parrella <joseparrella@cantv.net>
 Build-Depends: debhelper (>= 5)
 Standards-Version: 3.7.3
 Homepage: http://www.hunz.org/
diff -u itop-0.1/debian/changelog itop-0.1/debian/changelog
--- itop-0.1/debian/changelog
+++ itop-0.1/debian/changelog
@@ -1,3 +1,14 @@
+itop (0.1-2ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #239221):
+    - Remove debian/docs; TODO and README have no interesting content.
+    - src/config.h: increase MAX_INTS from 256 to 1024, to really
+      fix the segfault (LP: #188897)
+    - Modify Maintainer value to match the DebianMaintainerField
+      specification.
+
+ -- Nathan Handler <nathan.handler@gmail.com>  Wed, 11 Jun 2008 11:04:55 -0500
+
 itop (0.1-2) unstable; urgency=low
 
   * Fixing debian/watch for itop upstream (Closes: #450026)
@@ -5,6 +16,26 @@
 
  -- Jose Parrella <bureado@debian.org>  Wed, 19 Mar 2008 21:53:05 -0430
 
+itop (0.1-1ubuntu1) hardy; urgency=low
+
+  [ Siegfried-Angel Gevatter Pujals (RainCT) ]
+  * Fix debian/watch (Closes: #450026)
+  * Remove debian/docs; TODO and README have no interesting content.
+
+  [ Albert Damen ]
+  * src/config.h: increase MAX_INTS from 256 to 1024, to really
+    fix the segfault (LP: #188897)
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Albert Damen <albrt@gmx.net>  Mon, 04 Feb 2008 20:25:52 +0100
+
+itop (0.1-1build1) hardy; urgency=low
+
+  * Rebuild against hardy to not segfault
+
+ -- Emmet Hikory <persia@ubuntu.com>  Sun, 03 Feb 2008 21:58:56 +0900
+
 itop (0.1-1) unstable; urgency=low
 
   * Initial release (Closes: #408871)
diff -u itop-0.1/debian/watch itop-0.1/debian/watch
--- itop-0.1/debian/watch
+++ itop-0.1/debian/watch
@@ -3 +2,0 @@
-
reverted:
--- itop-0.1/debian/docs
+++ itop-0.1.orig/debian/docs
@@ -1,2 +0,0 @@
-README
-TODO
only in patch2:
unchanged:
--- itop-0.1.orig/src/config.h
+++ itop-0.1/src/config.h
@@ -1,2 +1,2 @@
 #define MAX_NAME_LEN 18
-#define MAX_INTS 256
+#define MAX_INTS 1024