diff -pruN 1:2.0.4-1.1/debian/changelog 1:2.0.4-1.1ubuntu1/debian/changelog
--- 1:2.0.4-1.1/debian/changelog	2010-12-09 07:55:25.000000000 +0000
+++ 1:2.0.4-1.1ubuntu1/debian/changelog	2010-12-09 07:51:01.000000000 +0000
@@ -1,3 +1,15 @@
+mindi (1:2.0.4-1.1ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable. Remaining changes:
+    - Remove linux-images from recommends.
+    - Add linux-image-386 | linux-image-generic | linux-image-itanium |
+          linux-image-mckinley | linux-image-rt | linux-image-server |
+          linux-image-ume | linux-image-virtual | linux-image-xen
+      in suggests.
+    - Remove elilo [ia64] from depends.
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Thu, 09 Dec 2010 10:42:47 +0530
+
 mindi (1:2.0.4-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -6,6 +18,18 @@ mindi (1:2.0.4-1.1) unstable; urgency=lo
 
  -- Didier Raboud <didier@raboud.com>  Sun, 28 Nov 2010 14:31:17 +0100
 
+mindi (1:2.0.4-1ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #300557):
+    - Remove linux-images from recommends.
+    - Add linux-image-386 | linux-image-generic | linux-image-itanium |
+          linux-image-mckinley | linux-image-rt | linux-image-server |
+          linux-image-ume | linux-image-virtual | linux-image-xen
+      in suggests.
+    - Remove elilo [ia64] from depends.
+
+ -- Nick Ellery <nick.ellery@ubuntu.com>  Sun, 21 Dec 2008 22:15:06 -0800
+
 mindi (1:2.0.4-1) unstable; urgency=high
 
   * New upstream release.
@@ -40,6 +64,20 @@ mindi (1:2.0.4-1) unstable; urgency=high
 
  -- Andree Leidenfrost <andree@debian.org>  Mon, 13 Oct 2008 21:22:45 +1100
 
+mindi (2.24-3ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - debian/control - Adjust relationships to fit Ubuntu packages scheme:
+      + remove Debian linux-image(s) from Recommends
+      + add linux-image-386 | linux-image-generic | linux-image-itanium |
+            linux-image-mckinley | linux-image-rt | linux-image-server |
+            linux-image-ume | linux-image-virtual | linux-image-xen
+        in Suggests
+      + remove elilo [ia64] from Depends
+      + Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Stefan Ebner <hellboy195@gmail.com>  Mon,  7 Apr 2008 00:37:14 +0200
+
 mindi (2.24-3) unstable; urgency=low
 
   * Removed dependency on package ms-sys and documented in 
@@ -47,6 +85,21 @@ mindi (2.24-3) unstable; urgency=low
 
  -- Andree Leidenfrost <andree@debian.org>  Sun, 06 Apr 2008 18:59:18 +1000
 
+mindi (2.24-2ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable (LP: #161194), remaining changes:
+    - debian/control - Adjust relationships to fit Ubuntu packages scheme:
+      + remove Debian linux-image(s) from Recommends
+      + add linux-image-386 | linux-image-generic | linux-image-itanium |
+            linux-image-mckinley | linux-image-rt | linux-image-server |
+            linux-image-ume | linux-image-virtual | linux-image-xen
+        in Suggests
+      + remove elilo [ia64] from Depends
+      + change ms-sys [amd64 i386] to ms-sys in Depends 
+      + Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Stephan Hermann <sh@sourcecode.de>  Sat, 10 Nov 2007 16:30:19 +0100
+
 mindi (2.24-2) unstable; urgency=low
 
   * Removed unused rootfs/var/log/mondo-archive.log via rules file.
@@ -80,6 +133,15 @@ mindi (2.24-1) unstable; urgency=low
 
  -- Andree Leidenfrost <andree@debian.org>  Sun, 09 Sep 2007 19:44:11 +1000
 
+mindi (2.22-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. 
+  * Modify Maintainer value to match Debian-Maintainer-Field Spec
+  * debian/control: changed Recommends to recomment linux-image and not the
+    other kernel flavours
+
+ -- Stephan Hermann <sh@sourcecode.de>  Sun,  6 May 2007 16:23:03 +0200
+
 mindi (2.22-1) unstable; urgency=low
 
   * New upstream release:
@@ -175,6 +237,13 @@ mindi (2.21~r1021-1) non-official; urgen
 
  -- Andree Leidenfrost <andree@debian.org>  Sun,  7 Jan 2007 18:49:46 +1100
 
+mindi (2.20-2ubuntu1) feisty; urgency=low
+
+  * Merge from Debian unstable. Ubuntu change:
+     - Adjusted Depends and Recommends
+
+ -- Adrien Cunin <adri2000@gmail.com>  Sun, 14 Jan 2007 21:48:02 +0100
+
 mindi (2.20-2) unstable; urgency=high
 
   * Explicitly create a temporary directory for use by mindi to avoid 
@@ -187,6 +256,13 @@ mindi (2.20-2) unstable; urgency=high
 
  -- Andree Leidenfrost <andree@debian.org>  Sun, 24 Dec 2006 08:03:53 +1100
 
+mindi (2.20-1ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable.  Kept changes:
+    + Adjusted Build-Depends.
+
+ -- Zak B. Elep <zakame@ubuntu.com>  Wed, 15 Nov 2006 17:41:15 +0800
+
 mindi (2.20-1) unstable; urgency=medium
 
   * New upstream release:
@@ -211,12 +287,25 @@ mindi (1.09-3) unstable; urgency=low
 
  -- Andree Leidenfrost <andree@debian.org>  Sun,  8 Oct 2006 12:42:09 +1000
 
+mindi (1.09-2ubuntu1) edgy; urgency=low
+
+  * Merge from debian unstable.
+  * Keep ubuntu changes
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Thu, 21 Sep 2006 16:55:08 +1000
+
 mindi (1.09-2) unstable; urgency=low
 
   * Fixed a syntax error mindi's LVM code. (Already fixed upstream.)
 
  -- Andree Leidenfrost <andree@debian.org>  Sun, 17 Sep 2006 15:35:41 +1000
 
+mindi (1.09-1ubuntu1) edgy; urgency=low
+
+  * Merge from debian unstable.
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Tue, 22 Aug 2006 03:48:20 -0500
+
 mindi (1.09-1) unstable; urgency=low
 
   * New upstream release:
@@ -237,6 +326,12 @@ mindi (1.09-1) unstable; urgency=low
 
  -- Andree Leidenfrost <andree@debian.org>  Sun, 17 Sep 2006 15:35:37 +1000
 
+mindi (1.08-2-2ubuntu1) edgy; urgency=low
+
+  * Merge from debian unstable.
+
+ -- Reinhard Tartler <siretart@tauware.de>  Sun, 30 Jul 2006 22:39:32 +0200
+
 mindi (1.08-2-2) unstable; urgency=low
 
   * Removed superfluous echo command in analyze-my-lvm to avoid screen
@@ -396,6 +491,16 @@ mindi (1.06-2) unstable; urgency=low
 
  -- Andree Leidenfrost <aleidenf@bigpond.net.au>  Sun, 05 Feb 2006 19:32:11 +1100
 
+mindi (1.06-1ubuntu1) dapper; urgency=low
+
+  [ Ongoing Merge Process ]
+  * Resynchronise with Debian.
+
+  [ Reinhard Tartler ]
+  * adjust Depends
+
+ -- Reinhard Tartler <siretart@ubuntu.com>  Fri, 13 Jan 2006 12:33:10 +0100
+
 mindi (1.06-1) unstable; urgency=low
 
   * New upstream release:
@@ -431,6 +536,12 @@ mindi (1.06-1) unstable; urgency=low
 
  -- Andree Leidenfrost <aleidenf@bigpond.net.au>  Sun,  8 Jan 2006 22:41:58 +1100
 
+mindi (1.04-7ubuntu1) dapper; urgency=low
+
+  * added amd64 to architectures list (Closes: #252759)
+
+ -- Reinhard Tartler <siretart@ubuntu.com>  Sat, 26 Nov 2005 14:45:33 +0100
+
 mindi (1.04-7) unstable; urgency=medium
 
   * Set urgency to 'medium' because restore is consistently broken without
@@ -669,19 +780,18 @@ mindi (0.86-1) unstable; urgency=low
 
  -- Hector Garcia <hector@debian.org>  Sun,  7 Sep 2003 18:08:01 +0200
 
-
 mindi (0.84-1) unstable; urgency=low
   * New upstream version.
 
  -- Hector Garcia <hector@debian.org>  Tue,  28 Apr 2003 22:31:08 +0100
- 
+
 mindi (0.81-1) unstable; urgency=low
   * New upstream version.
   * Now only expects mkfs.vfat if you backup such partition. (Closes: #158819)
   * Fixed problem due to lilo not including boot.b anymore. (Closes: #164787)
 
  -- Hector Garcia <hector@debian.org>  Sat,  28 Dec 2002 22:31:08 +0100
-   
+
 mindi (0.65-0) unstable; urgency=low
   * New upstream version.
   * All patches send to upstream to make it more Debian aware
@@ -691,7 +801,7 @@ mindi (0.65-0) unstable; urgency=low
   * Upgraded Standards-Version to latest on policy.  
 
  -- Hector Garcia <hector@debian.org>  Sat,  03 Aug 2002 01:31:08 +0100
- 
+
 mindi (0.63.7-1) unstable; urgency=low
   
   * New upstream version.
@@ -704,7 +814,7 @@ mindi (0.63.7-1) unstable; urgency=low
     look into fixing this to make it available to more archs. (Closes: #142476)
 
  -- Hector Garcia <hector@debian.org>  Fri,  19 Jun 2002 10:31:08 +0100
- 
+
 mindi (0.59.r1-1) unstable; urgency=low
 
   * New upstream version.
@@ -713,7 +823,7 @@ mindi (0.59.r1-1) unstable; urgency=low
   * Added a depend on lilo. (Closes: #138567).
 
  -- Hector Garcia <hector@debian.org>  Mon,  25 Mar 2002 11:31:08 +0100
-  
+
 mindi (0.58.r5-1) unstable; urgency=low
 
   * New upstream revision.
@@ -731,13 +841,13 @@ mindi (0.58-2) unstable; urgency=low
     for upstream to be able to use it.
 
  -- Hector Garcia <hector@debian.org>  Fri,  18 Feb 2002 19:31:08 +0100
-   
+
 mindi (0.58-1) unstable; urgency=low
 
   * New upstream version.
 
  -- Hector Garcia <hector@debian.org>  Fri,  16 Feb 2002 19:31:08 +0100
-       
+
 mindi (0.53-1) unstable; urgency=low
 
   * New upstream version.
@@ -745,7 +855,7 @@ mindi (0.53-1) unstable; urgency=low
   * Fixed README. (Closes: #130236)
 
  -- Hector Garcia <hector@debian.org>  Fri,  25 Jan 2002 19:31:08 +0100
- 
+
 mindi (0.50-1) unstable; urgency=low
 
   * Initial Release. (Closes: #122730)
@@ -753,3 +863,4 @@ mindi (0.50-1) unstable; urgency=low
   * Written small man page.
 
  -- Hector Garcia <hector@debian.org>  Sun,  9 Dec 2001 19:31:08 +0100
+
diff -pruN 1:2.0.4-1.1/debian/control 1:2.0.4-1.1ubuntu1/debian/control
--- 1:2.0.4-1.1/debian/control	2010-12-09 07:55:25.000000000 +0000
+++ 1:2.0.4-1.1ubuntu1/debian/control	2010-12-09 07:51:01.000000000 +0000
@@ -1,16 +1,17 @@
 Source: mindi
 Section: utils
 Priority: optional
-Maintainer: Andree Leidenfrost <andree@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Andree Leidenfrost <andree@debian.org>
 Build-Depends: debhelper (>= 5.0), libperl-dev [ia64]
 Standards-Version: 3.8.0
 Uploaders: Hector Garcia <hector@debian.org>
 
 Package: mindi
 Architecture: amd64 i386 ia64
-Depends: mindi-busybox (>= 1.2.1-2), binutils, bzip2, dosfstools, genisoimage, module-init-tools, syslinux [amd64 i386], elilo [ia64], gawk, parted, file, nano
-Recommends: cpio, mdadm, ntfsprogs, linux-image-2.6-486 | kernel-image-2.6-386 | kernel-image-2.4-386 | linux-image-2.6-amd64 [amd64] | linux-image-2.6-itanium | kernel-image-2.6-itanium | kernel-image-2.4-itanium
-Suggests: afio, eject, lzop, less, petris, acl, attr, lilo
+Depends: mindi-busybox (>= 1.2.1-2), binutils, bzip2, dosfstools, genisoimage, module-init-tools, syslinux [amd64 i386], gawk, parted, file, nano
+Recommends: cpio, mdadm, ntfsprogs
+Suggests: afio, eject, lzop, less, petris, acl, attr, lilo, linux-image-386 | linux-image-generic | linux-image-itanium | linux-image-mckinley | linux-image-rt | linux-image-server | linux-image-ume | linux-image-virtual | linux-image-xen
 Description: creates boot/root disks based on your system
  Mindi is a script to create boot/root disks based on your system. It uses your
  kernel, modules, tools and libraries. It is used for the Mondo disaster
