diff -u cwidget-0.5.12/debian/control cwidget-0.5.12/debian/control
--- cwidget-0.5.12/debian/control
+++ cwidget-0.5.12/debian/control
@@ -4,10 +4,11 @@
 Homepage: http://cwidget.alioth.debian.org
 Vcs-Git: git://git.debian.org/git/cwidget/debian
 Vcs-Browser: http://git.debian.org/?p=cwidget/debian/.git;a=summary
-Maintainer: Daniel Burrows <dburrows@debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Daniel Burrows <dburrows@debian.org>
 Build-Depends: debhelper (>= 5.0.0), libsigc++-2.0-dev,
  libncursesw5-dev, gettext, g++ (>= 4:3.2.2-0), libcppunit-dev
-Build-Depends-Indep: doxygen, ikiwiki (>= 1.34), libhtml-scrubber-perl
+Build-Depends-Indep: doxygen
 Standards-Version: 3.7.2.2
 
 Package: libcwidget3
diff -u cwidget-0.5.12/debian/changelog cwidget-0.5.12/debian/changelog
--- cwidget-0.5.12/debian/changelog
+++ cwidget-0.5.12/debian/changelog
@@ -1,3 +1,10 @@
+cwidget (0.5.12-4ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable (LP: #322918), Ubuntu remaining changes:
+    - Drop build depends on ikiwiki and libhtml-scrubber-perl.
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Thu, 29 Jan 2009 22:09:59 +0100
+
 cwidget (0.5.12-4) unstable; urgency=low
 
   * Backport a fix for a nasty deadlock that was causing aptitude to
@@ -5,6 +12,13 @@
 
  -- Daniel Burrows <dburrows@debian.org>  Tue, 27 Jan 2009 23:18:01 -0800
 
+cwidget (0.5.12-3ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Drop build dependencies on ikiwiki, libhtml-scrubber-perl.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 10 Nov 2008 13:39:40 +0100
+
 cwidget (0.5.12-3) unstable; urgency=low
 
   * Fix the string truncation fix so that it doesn't enter an infinite
@@ -21,12 +35,26 @@
 
  -- Daniel Burrows <dburrows@debian.org>  Sun, 31 Aug 2008 22:01:53 -0700
 
+cwidget (0.5.12-1ubuntu1) intrepid; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Drop build dependencies on ikiwiki, libhtml-scrubber-perl.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 07 Jul 2008 11:17:22 +0000
+
 cwidget (0.5.12-1) unstable; urgency=low
 
   * New upstream version.
 
  -- Daniel Burrows <dburrows@debian.org>  Sat, 28 Jun 2008 08:58:24 -0700
 
+cwidget (0.5.11-1ubuntu1) intrepid; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Drop build dependencies on ikiwiki, libhtml-scrubber-perl.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 13 Jun 2008 13:53:21 +0000
+
 cwidget (0.5.11-1) unstable; urgency=low
 
   * New upstream version; really fixes the backspacing problem.