diff -u minicom-2.4/debian/control minicom-2.4/debian/control
--- minicom-2.4/debian/control
+++ minicom-2.4/debian/control
@@ -1,7 +1,8 @@
 Source: minicom
 Section: comm
 Priority: optional
-Maintainer: Martin A. Godisch <godisch@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Martin A. Godisch <godisch@debian.org>
 Uploaders: Jordi Mallach <jordi@debian.org>
 Build-Depends: autotools-dev, gettext, libncurses5-dev
 Standards-Version: 3.8.3
@@ -9,7 +10,7 @@
 Package: minicom
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: lrzsz
+Suggests: lrzsz
 Description: friendly menu driven serial communication program
  Minicom is a clone of the MS-DOS "Telix" communication program. It emulates
  ANSI and VT102 terminals, has a dialing directory and auto zmodem download.
diff -u minicom-2.4/debian/changelog minicom-2.4/debian/changelog
--- minicom-2.4/debian/changelog
+++ minicom-2.4/debian/changelog
@@ -1,3 +1,10 @@
+minicom (2.4-1ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing.  Remaining changes: LP: #507906
+    - Drop lrzsz from Recommends to Suggests, it is in universe.
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Fri, 15 Jan 2010 18:25:05 +0530
+
 minicom (2.4-1) unstable; urgency=low
 
   * New upstream release.
@@ -11,6 +18,19 @@
 
  -- Martin A. Godisch <godisch@debian.org>  Sat, 21 Nov 2009 12:22:20 +0100
 
+minicom (2.3-1ubuntu2) karmic; urgency=low
+
+  * Rename getline function to getline_local, as it is redefining the 
+    standard getline, which is not valid in GCC 4.4  (LP: #436082) 
+
+ -- Steven J Harms <sharms@ubuntu.com>  Thu, 24 Sep 2009 14:11:03 -0400
+
+minicom (2.3-1ubuntu1) intrepid; urgency=low
+
+  * Drop lrzsz from Recommends to Suggests, it is in universe.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 23 Oct 2008 13:06:16 +0200
+
 minicom (2.3-1) unstable; urgency=low
 
   * New upstream release,
@@ -499,0 +520 @@
+