diff -u perl-5.10.0/debian/changelog perl-5.10.0/debian/changelog
--- perl-5.10.0/debian/changelog
+++ perl-5.10.0/debian/changelog
@@ -1,3 +1,11 @@
+perl (5.10.0-24ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #398701
+    - add Breaks against doc-base (<< 0.8.16) to fix upgrade issues from
+      hardy.
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Mon, 13 Jul 2009 14:43:57 +0530
+
 perl (5.10.0-24) unstable; urgency=low
 
   * Change the perl-debug package section and priority to debug/extra.
@@ -12,6 +20,14 @@
 
  -- Niko Tyni <ntyni@debian.org>  Wed, 08 Jul 2009 23:21:31 +0300
 
+perl (5.10.0-23ubuntu1) karmic; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - add Breaks against doc-base (<< 0.8.16) to fix upgrade issues from
+      hardy.
+
+ -- Muharem Hrnjadovic <muharem@ubuntu.com>  Tue, 16 Jun 2009 10:53:34 +0200
+
 perl (5.10.0-23) unstable; urgency=high
 
   * Don't try to check nonexistent .ph files: the kFreeBSD port
@@ -21,6 +37,16 @@
 
  -- Niko Tyni <ntyni@debian.org>  Fri, 12 Jun 2009 21:26:18 +0300
 
+perl (5.10.0-22ubuntu1) karmic; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - add Breaks against doc-base (<< 0.8.16) to fix upgrade issues from
+      hardy.
+  * Dropped changes:
+    - Ignore test results on hppa (thread tests fail).
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 28 May 2009 10:07:10 +0000
+
 perl (5.10.0-22) unstable; urgency=low
 
   * Make Archive::Extract work with recent versions of GNU tar.
@@ -99,6 +125,13 @@
 
  -- Niko Tyni <ntyni@debian.org>  Mon, 13 Apr 2009 00:01:02 +0300
 
+perl (5.10.0-19ubuntu1) jaunty; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Ignore test results on hppa (thread tests fail).
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 05 Jan 2009 20:33:12 +0100
+
 perl (5.10.0-19) unstable; urgency=low
 
   * Downgrade the perl-doc recommendation to a suggestion.
@@ -113,6 +146,13 @@
 
  -- Niko Tyni <ntyni@debian.org>  Thu, 01 Jan 2009 14:15:07 +0200
 
+perl (5.10.0-18ubuntu1) jaunty; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Ignore test results on hppa (thread tests fail).
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 17 Dec 2008 06:52:38 +0000
+
 perl (5.10.0-18) unstable; urgency=high
 
   * [SECURITY] CVE-2005-0448 revisited: File::Path::rmtree no longer
@@ -120,6 +160,27 @@
 
  -- Niko Tyni <ntyni@debian.org>  Fri, 21 Nov 2008 00:49:57 +0200
 
+perl (5.10.0-17ubuntu3) jaunty; urgency=low
+
+  * Ignore test results on hppa for perl-static as well (thread tests fail).
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 12 Dec 2008 21:41:40 +0100
+
+perl (5.10.0-17ubuntu2) jaunty; urgency=low
+
+  * Ignore test results on hppa (thread tests fail).
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 12 Dec 2008 18:30:33 +0000
+
+perl (5.10.0-17ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Drop perl-doc to Suggests.
+    - Add Breaks against doc-base (<< 0.8.16) to fix upgrade
+      issue from hardy->intrepid (LP: #243830)
+
+ -- Scott James Remnant <scott@ubuntu.com>  Wed, 05 Nov 2008 07:22:10 +0000
+
 perl (5.10.0-17) unstable; urgency=low
 
   * Fix 'Unknown error' messages with attribute.pm. (Closes: #488088)
@@ -221,6 +282,21 @@
 
  -- Niko Tyni <ntyni@debian.org>  Tue, 05 Aug 2008 14:17:05 +0300
 
+perl (5.10.0-11.1ubuntu2) intrepid; urgency=low
+
+  * debian/control:
+    - add Breaks against doc-base (<< 0.8.16) to fix upgrade
+      issue from hardy->intrepid (LP: #243830)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 23 Jul 2008 22:06:34 +0200
+
+perl (5.10.0-11.1ubuntu1) intrepid; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Drop perl-doc to Suggests.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 21 Jul 2008 10:41:54 +0100
+
 perl (5.10.0-11.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -228,6 +304,13 @@
 
  -- Bastian Blank <waldi@debian.org>  Tue, 15 Jul 2008 14:48:44 +0000
 
+perl (5.10.0-11ubuntu1) intrepid; urgency=low
+
+  * Drop perl-doc to Suggests; apt automatically installs Recommends now,
+    and perl-doc is too big for Ubuntu CD images.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 02 Jul 2008 15:08:45 +0100
+
 perl (5.10.0-11) unstable; urgency=high
 
   * [SECURITY] File::Path::rmtree() no longer makes symlink targets
+
diff -u perl-5.10.0/debian/control perl-5.10.0/debian/control
--- perl-5.10.0/debian/control
+++ perl-5.10.0/debian/control
@@ -1,7 +1,8 @@
 Source: perl
 Section: perl
 Priority: standard
-Maintainer: Brendan O'Dea <bod@debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Brendan O'Dea <bod@debian.org>
 Uploaders: Niko Tyni <ntyni@debian.org>
 Standards-Version: 3.8.1
 Build-Depends: file, cpio (>= 2.6-5), libdb4.6-dev, libgdbm-dev, netbase [!hurd-i386],
@@ -21,6 +22,7 @@
 Replaces: perl (<= 5.10.0-9), perl-modules (<< 5.10.0-12), libperl5.8 (<< 5.8.0-20),
  libscalar-list-utils-perl,
  libxsloader-perl 
+Breaks: doc-base (<< 0.8.16)
 Provides: perl5-base, ${perlapi:Provides},
  libscalar-list-utils-perl,
  libxsloader-perl