diff -Nru clipit-1.4.1/debian/changelog clipit-1.4.1/debian/changelog
--- clipit-1.4.1/debian/changelog	2011-05-30 21:34:33.000000000 +0200
+++ clipit-1.4.1/debian/changelog	2011-06-02 19:17:04.000000000 +0200
@@ -1,3 +1,10 @@
+clipit (1.4.1-1ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable. (LP: #791950) Remaining changes:
+    - debian/control: add build-dep on libappindicator-dev (>= 0.2.4)
+
+ -- Paolo Sammicheli <xdatap1@ubuntu.com>  Tue, 31 May 2011 08:12:36 +0100
+
 clipit (1.4.1-1) unstable; urgency=low
 
   * New upstream release.
@@ -7,6 +14,16 @@
 
  -- Cristian Henzel <oss@rspwn.com>  Fri, 27 May 2011 11:18:10 +0300
 
+clipit (1.4.0-1ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - debian/control: add build-dep on libappindicator-dev (>= 0.2.4)
+  * Move xdotool from build-depends to depends per Cristian Henzel
+  * debian/rules: Drop configure override to enable the appindicator since the 
+    build system now enables this if the appindicator library is found
+
+ -- Micah Gersten <micahg@ubuntu.com>  Tue, 24 May 2011 10:37:59 -0500
+
 clipit (1.4.0-1) unstable; urgency=low
 
   * New upstream release.
@@ -20,6 +37,13 @@
 
  -- Cristian Henzel <oss@rspwn.com>  Tue, 03 May 2011 09:20:35 +0300
 
+clipit (1.3.12-1ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable. Remaining changes:
+   - Enable indicator support.
+
+ -- Andrew Starr-Bochicchio <a.starr.b@gmail.com>  Mon, 11 Apr 2011 15:02:00 -0400
+
 clipit (1.3.12-1) unstable; urgency=low
 
   * New upstream release.
@@ -27,6 +51,15 @@
 
  -- Cristian Henzel <oss@rspwn.com>  Mon, 28 Feb 2011 16:28:49 +0200
 
+clipit (1.3.11-1ubuntu1) natty; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+   - debian/control: Build Depend on libappindicator-dev
+     inorder to enable indicator support.
+  * Drop debian/patches/dsofix.patch, fixed upstream.
+
+ -- Andrew Starr-Bochicchio <a.starr.b@gmail.com>  Wed, 12 Jan 2011 14:42:34 -0500
+
 clipit (1.3.11-1) unstable; urgency=low
 
   * New upstream release.
@@ -41,6 +74,16 @@
 
  -- Cristian Henzel <oss@rspwn.com>  Mon, 20 Dec 2010 13:32:36 +0200
 
+clipit (1.3.6-1ubuntu1) natty; urgency=low
+
+  * Sync from Debian NEW.
+  * dosfix.patch: Link against X11 to fix FTBFS due to
+    binutils-gold not doing indirect linking.
+  * debian/control: Build Depend on libappindicator-dev (>= 0.2.4)
+    inorder to enable indicator support.
+
+ -- Andrew Starr-Bochicchio <a.starr.b@gmail.com>  Sun, 12 Dec 2010 12:21:51 -0500
+
 clipit (1.3.6-1) unstable; urgency=low
 
   * New upstream release.
@@ -52,3 +95,4 @@
   * Initial release (Closes: #603131)
 
  -- Cristian Henzel <oss@web-tm.com>  Tue, 30 Nov 2010 08:27:14 +0100
+
diff -Nru clipit-1.4.1/debian/control clipit-1.4.1/debian/control
--- clipit-1.4.1/debian/control	2011-05-30 21:34:33.000000000 +0200
+++ clipit-1.4.1/debian/control	2011-06-02 15:41:47.000000000 +0200
@@ -1,11 +1,13 @@
 Source: clipit
 Section: misc
 Priority: optional
-Maintainer: Cristian Henzel <oss@rspwn.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Cristian Henzel <oss@rspwn.com>
 Build-Depends: debhelper (>= 7.0.50~),
 		libgtk2.0-dev,
 		intltool,
-		autotools-dev
+		autotools-dev,
+		libappindicator-dev (>= 0.2.4)
 Standards-Version: 3.9.2
 DM-Upload-Allowed: yes
 Homepage: http://clipit.rspwn.com/