diff -u conky-1.4.9/debian/compat conky-1.4.9/debian/compat
--- conky-1.4.9/debian/compat
+++ conky-1.4.9/debian/compat
@@ -1 +1 @@
-4
+5
diff -u conky-1.4.9/debian/changelog conky-1.4.9/debian/changelog
--- conky-1.4.9/debian/changelog
+++ conky-1.4.9/debian/changelog
@@ -1,3 +1,11 @@
+conky (1.4.9-4ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable. (LP: #199641) Remaining Ubuntu changes:
+    - Bump compat and debhelper version
+    - Change Maintainer field and add XSBC-Original-Maintainer field
+
+ -- Stefan Ebner <hellboy195@gmail.com>  Sat, 9 Mar 2008 20:32:08 +0100
+
 conky (1.4.9-4) unstable; urgency=low
 
   * debian/patches/sysfs_battery:
@@ -27,6 +35,21 @@
 
  -- Kapil Hari Paranjape <kapil@debian.org>  Sat, 23 Feb 2008 05:57:23 +0530
 
+conky (1.4.9-3ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable. (LP: #193240) Remaining Ubuntu changes:
+    - Bump compat and debhelper version
+    - Change Maintainer field and add XSBC-Original-Maintainer field
+    - Enable built-in support for rss variables:
+      + Add --enable-rss flag in debian/rules
+      + Add libxml2-dev, libcurl4-gnutls-dev as Build-Depends in debian/control
+  * Re-enable some of the features of pre-conky 1.4.7-1:
+    --enable-double-buffer
+    --enable-own-window
+    --enable-portmon
+
+ -- Stefan Ebner <hellboy195@gmail.com>  Tue, 19 Feb 2008 12:54:44 +0100
+
 conky (1.4.9-3) unstable; urgency=low
 
   * debian/patches/sysfs_battery: Added support for
@@ -37,6 +60,27 @@
 
  -- Kapil Hari Paranjape <kapil@debian.org>  Mon, 18 Feb 2008 10:20:24 +0530
 
+conky (1.4.9-2ubuntu2) hardy; urgency=low
+
+  * No-change rebuild against libldap-2.4-2.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 08 Feb 2008 10:40:18 -0800
+
+conky (1.4.9-2ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Bump compat and debhelper version
+    - Change Maintainer field and add XSBC-Original-Maintainer field
+    - Enable built-in support for rss variables:
+      + Add --enable-rss flag in debian/rules
+      + Add libxml2-dev, libcurl4-gnutls-dev as Build-Depends in debian/control
+  * Re-enable some of the features of pre-conky 1.4.7-1:
+    --enable-double-buffer
+    --enable-own-window
+    --enable-portmon
+
+ -- Cesare Tirabassi <norsetto@ubuntu.com>  Wed, 26 Dec 2007 13:39:24 +0100
+
 conky (1.4.9-2) unstable; urgency=low
 
   * Added support for non-Linux architectures. Closes: #456931.
@@ -65,6 +109,21 @@
 
  -- Kapil Hari Paranjape <kapil@debian.org>  Wed, 26 Dec 2007 08:41:25 +0530
 
+conky (1.4.9-1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Bump compat and debhelper version
+    - Change Maintainer field and add XSBC-Original-Maintainer field
+    - Enable built-in support for rss variables:
+      + Add --enable-rss flag in debian/rules
+      + Add libxml2-dev, libcurl4-gnutls-dev as Build-Depends in debian/control
+  * Re-enable some of the features of pre-conky 1.4.7-1:
+    --enable-double-buffer
+    --enable-own-window
+    --enable-portmon
+
+ -- Cesare Tirabassi <norsetto@ubuntu.com>  Wed,  5 Dec 2007 10:31:11 +0100
+
 conky (1.4.9-1) unstable; urgency=low
 
   * New upstream release. Closes: #453498, #453834.
@@ -134,6 +193,33 @@
 
  -- Kapil Hari Paranjape <kapil@debian.org>  Fri, 21 Sep 2007 09:24:48 +0530
 
+conky (1.4.7-0ubuntu2) gutsy; urgency=low
+
+  * Enable built-in support for rss and wireless variables (LP: #137476):
+    - Add --enable-wlan and --enable-rss flags in debian/rules
+    - Add libxml2-dev, libcurl4-gnutls-dev and libiw-dev as Build-Depends 
+      in debian/control
+
+ -- Cesare Tirabassi <cesare.tirabassi@gmail.com>  Wed, 05 Sep 2007 10:57:00 +0200
+
+conky (1.4.7-0ubuntu1) gutsy; urgency=low
+
+  * New upstream release (LP: #131325)
+  * Bump compat and standards version
+  * Change Maintainer field and add XSBC-Original-Maintainer field
+  * Update debian/copyright
+  * Add debian/watch
+  * Change -$(MAKE) distclean and -$(MAKE) clean rules (lintian warning)
+
+ -- Cesare Tirabassi <cesare.tirabassi@gmail.com>  Fri, 31 Aug 2007 08:55:22 +0200
+
+conky (1.4.5-0ubuntu1) feisty; urgency=low
+
+  * New upstream release
+  * Build-Depends on libglib2.0-dev
+
+ -- Adrien Cunin <adri2000@gmail.com>  Wed, 31 Jan 2007 21:23:07 +0100
+
 conky (1.4.4-1) unstable; urgency=low
 
   * New upstream release.
diff -u conky-1.4.9/debian/control conky-1.4.9/debian/control
--- conky-1.4.9/debian/control
+++ conky-1.4.9/debian/control
@@ -1,7 +1,8 @@
 Source: conky
 Section: utils
 Priority: optional
-Maintainer: Kapil Hari Paranjape <kapil@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Kapil Hari Paranjape <kapil@debian.org>
 Build-Depends: debhelper (>= 4.0.0), quilt, libx11-dev, libxft-dev,
  libxdamage-dev, libxext-dev, pkg-config (>= 0.19), libglib2.0-dev,
  libxml2-dev, libcurl4-gnutls-dev, libtool, automake1.10,