diff -u logrotate-3.7.8/debian/changelog logrotate-3.7.8/debian/changelog
--- logrotate-3.7.8/debian/changelog
+++ logrotate-3.7.8/debian/changelog
@@ -1,3 +1,11 @@
+logrotate (3.7.8-4ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #414347
+    - debian/control: Drop mailx to Suggests for Ubuntu; it's only used
+      on request, and we don'c configure an MTA by default.
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Sun, 16 Aug 2009 12:40:24 +0530
+
 logrotate (3.7.8-4) unstable; urgency=high
 
   * New patch:
@@ -55,18 +63,52 @@
 
  -- Paul Martin <pm@debian.org>  Tue, 04 Aug 2009 15:18:18 +0100
 
+logrotate (3.7.7-5ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #410660
+    - debian/control: Drop mailx to Suggests for Ubuntu; it's only used
+      on request, and we don'c configure an MTA by default.
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Sat, 08 Aug 2009 17:00:10 +0530
+
+logrotate (3.7.7-5) unstable; urgency=high
+
+  * Backport patch from 3.7.8-3 (in experimental):
+    + nofollow.patch: If a logfile is a symlink, it may be read when 
+      being compressed, being copied (copy, copytruncate) or mailed. 
+      Secure data (eg. password files) may be exposed. Thanks to
+      Florian Zumbiehl for getting me thinking about this one.
+
+ -- Paul Martin <pm@debian.org>  Thu, 06 Aug 2009 16:41:26 +0100
+
 logrotate (3.7.7-4) unstable; urgency=low
 
   * Update location of upstream in debian/copyright.
 
  -- Paul Martin <pm@debian.org>  Thu, 19 Feb 2009 11:54:07 +0000
 
+logrotate (3.7.7-3ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/control: Drop mailx to Suggests for Ubuntu; it's only used
+      on request, and we don'c configure an MTA by default.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Sun, 18 Jan 2009 05:51:34 +0000
+
 logrotate (3.7.7-3) unstable; urgency=low
 
   * Fix sharedcycles. (Closes: #512152)
 
  -- Paul Martin <pm@debian.org>  Sun, 18 Jan 2009 00:48:49 +0000
 
+logrotate (3.7.7-2ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #313461
+    - debian/control: Drop mailx to Suggests for Ubuntu; it's only used on
+      request, and we don't configure an MTA by default.
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Sat, 03 Jan 2009 19:08:07 +0530
+
 logrotate (3.7.7-2) unstable; urgency=low
 
   * Upload to unstable.
@@ -78,6 +120,14 @@
 
  -- Paul Martin <pm@debian.org>  Wed, 17 Dec 2008 13:12:27 +0000
 
+logrotate (3.7.7-1ubuntu1) jaunty; urgency=low
+
+  * Merge with Debian experimental (LP: #64964). Remaining Ubuntu changes:
+    - debian/control: Drop mailx to Suggests for Ubuntu; it's only used on
+      request, and we don't configure an MTA by default.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 07 Nov 2008 14:57:09 +0100
+
 logrotate (3.7.7-1) experimental; urgency=low
 
   * New upstream release (based on upstream 3.7.7-1)
@@ -589,0 +640 @@
+
diff -u logrotate-3.7.8/debian/control logrotate-3.7.8/debian/control
--- logrotate-3.7.8/debian/control
+++ logrotate-3.7.8/debian/control
@@ -1,14 +1,15 @@
 Source: logrotate
 Section: admin
 Priority: important
-Maintainer: Paul Martin <pm@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Paul Martin <pm@debian.org>
 Build-Depends: libpopt-dev, debhelper (>= 5), quilt, libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
 Standards-Version: 3.8.2
 
 Package: logrotate
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, cron | anacron | fcron, base-passwd (>= 2.0.3.4)
-Recommends: mailx
+Suggests: mailx
 Description: Log rotation utility
  The logrotate utility is designed to simplify the administration of
  log files on a system which generates a lot of log files.  Logrotate