diff -u filelight-1.9~rc2/debian/changelog filelight-1.9~rc2/debian/changelog
--- filelight-1.9~rc2/debian/changelog
+++ filelight-1.9~rc2/debian/changelog
@@ -1,3 +1,11 @@
+filelight (1.9~rc2-1ubuntu1) karmic; urgency=low
+
+  [ Dmitrijs Ledkovs ]
+  * Merge from debian unstable, remaining changes: (LP: #383614)
+    - debian/rules switched to debian-qt-kde.mk from kde4.mk
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov@gmail.com>  Wed, 03 Jun 2009 11:47:56 +0000
+
 filelight (1.9~rc2-1) unstable; urgency=low
 
   * New upstream version for KDE4. This fixes:
@@ -12,6 +20,40 @@
 
  -- Michael Meskes <meskes@debian.org>  Fri, 08 May 2009 14:00:06 +0200
 
+filelight (1.9~rc2-0ubuntu1) jaunty; urgency=low
+
+  * New upstream bugfix release
+  * Lots of bugs fixed including caching, background color, konqueror
+    integration etc...
+  * Closes LP: #340226
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 09 Mar 2009 23:59:45 +0100
+
+filelight (1.9~rc1-0ubuntu1) jaunty; urgency=low
+
+  * New upstream release, KDE4 version
+  * Packaging ported to KDE4
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Sun, 01 Mar 2009 14:22:39 +0100
+
+filelight (1.0-2ubuntu2) intrepid; urgency=low
+
+  * Remove documentation, it conflicts with the -l10n package (LP: #245974)
+
+ -- Harald Sitter <apachelogger@ubuntu.com>  Sun, 24 Aug 2008 00:56:23 +0200
+
+filelight (1.0-2ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Changed Maintainer field per spec
+    - debian/rules: prevent the installation of locale files (they are provided
+      by the filelight-l10n package)
+    - debian/patches
+      + Don't merge patches which change any Makefile.in, they
+        would break.
+
+ -- Harald Sitter <apachelogger@ubuntu.com>  Wed, 07 May 2008 10:00:29 +0100
+
 filelight (1.0-2) unstable; urgency=low
 
   * 'man filelight' typos: "representating", "filesystem" and
@@ -69,6 +111,29 @@
 
  -- Raúl Sánchez Siles <rasasi78@gmail.com>  Fri, 16 Nov 2007 19:20:42 +0100
 
+filelight (1.0-0ubuntu2) gutsy; urgency=low
+
+  * Removed postrm and postinst since they are not needed
+  * Added patch for desktop file typo
+
+ -- Harald Sitter <sitter.harald@gmail.com>  Mon,  4 Jun 2007 21:58:53 +0200
+
+filelight (1.0-0ubuntu1) gutsy; urgency=low
+
+  * New Upstream Release
+  * Standards-Version: 3.7.2
+  * Added manpage
+  * Moved to cdbs
+    * Removed debian/conffiles due to cdbs
+
+ -- Harald Sitter <sitter.harald@gmail.com>  Sun, 22 Apr 2007 14:48:10 +0200
+
+filelight (0.99beta6-1ubuntu1) dapper; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Benjamin Montgomery <bmontgom@montynet.org>  Tue,  6 Dec 2005 22:12:09 -0600
+
 filelight (0.99beta6-1) unstable; urgency=low
 
   * New upstream (beta) release. Closes: #304497
@@ -99,6 +164,31 @@
 
  -- James Troup <james@nocrew.org>  Mon, 19 Sep 2005 01:43:42 +0100
 
+filelight (0.99beta6-0ubuntu3) breezy; urgency=low
+  
+  * rebuild for c++ transition
+  * fixed a missing -fPIC in src/part/radialMap 
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 14 Sep 2005 15:05:38 +0200
+
+filelight (0.99beta6-0ubuntu2) breezy; urgency=low
+
+  * Add autoconf as build-dep
+
+ -- Jonathan Riddell <jr@jriddell.org>  Tue,  7 Jun 2005 17:05:56 +0000
+
+filelight (0.99beta6-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jr@jriddell.org>  Tue,  7 Jun 2005 14:30:49 +0000
+
+filelight (0.6.4.1-1build1) breezy; urgency=low
+
+  * Rebuild for new C++ ABI
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon,  6 Jun 2005 16:34:50 +0000
+
 filelight (0.6.4.1-1) unstable; urgency=low
 
   * New upstream release.
@@ -125,0 +216 @@
+
diff -u filelight-1.9~rc2/debian/rules filelight-1.9~rc2/debian/rules
--- filelight-1.9~rc2/debian/rules
+++ filelight-1.9~rc2/debian/rules
@@ -12,0 +13,2 @@
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
+
diff -u filelight-1.9~rc2/debian/compat filelight-1.9~rc2/debian/compat
--- filelight-1.9~rc2/debian/compat
+++ filelight-1.9~rc2/debian/compat
@@ -1 +1 @@
-5
+7
diff -u filelight-1.9~rc2/debian/control filelight-1.9~rc2/debian/control
--- filelight-1.9~rc2/debian/control
+++ filelight-1.9~rc2/debian/control
@@ -1,10 +1,10 @@
 Source: filelight
 Section: kde
 Priority: optional
-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
-Uploaders: Raúl Sánchez Siles <rasasi78@gmail.com>, Michael Meskes <meskes@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Standards-Version: 3.8.1
-Build-Depends: debhelper (>= 5.0), cdbs, kdelibs5-dev, libqimageblitz-dev
+Build-Depends: debhelper (>= 7), cdbs, kdelibs5-dev, libqimageblitz-dev, pkg-kde-tools
 Vcs-Git: git://git.debian.org/pkg-kde/kde-extras/filelight.git
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-extras/filelight.git
 Homepage: http://www.methylblue.com/filelight/
reverted:
--- filelight-1.9~rc2/debian/menu
+++ filelight-1.9~rc2.orig/debian/menu
@@ -1,6 +0,0 @@
-?package(filelight):needs="X11" \
-        section="Applications/File Management" \
-        hints="KDE, Monitoring, Files" \
-        command="/usr/bin/filelight" \
-        title="Filelight" \
-        longtitle="Filelight: disk usage as concentric rings"