diff -Nru qoauth-1.0.1/debian/changelog qoauth-1.0.1/debian/changelog
--- qoauth-1.0.1/debian/changelog	2013-09-27 02:28:20.000000000 +0100
+++ qoauth-1.0.1/debian/changelog	2013-11-28 13:16:44.000000000 +0000
@@ -1,3 +1,11 @@
+qoauth (1.0.1-2ubuntu1) trusty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Add kubuntu_02_fix_digets_encoding.diff to prevent twice encoding values
+      when using no encryption
+
+ -- Roy Jamison <xteejyx@googlemail.com>  Thu, 28 Nov 2013 13:15:48 +0000
+
 qoauth (1.0.1-2) unstable; urgency=low
 
   * Switch to debhelp 9 for builds
@@ -5,6 +13,14 @@
 
  -- Noah Meyerhans <noahm@debian.org>  Thu, 26 Sep 2013 18:27:59 -0700
 
+qoauth (1.0.1-1ubuntu1) natty; urgency=low
+
+  * Merge with Debian, remaining changes:
+   - Add kubuntu_02_fix_digets_encoding.diff to prevent twice encoding values
+     when using no encryption
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 08 Nov 2010 13:22:12 +0000
+
 qoauth (1.0.1-1) unstable; urgency=low
 
   * New upstream release
@@ -15,6 +31,35 @@
 
  -- Noah Meyerhans <noahm@debian.org>  Sun, 01 Aug 2010 12:52:47 -0700
 
+qoauth (1.0-2ubuntu4) maverick; urgency=low
+
+  * Add missing dep libqca2-plugin-ossl to libqoauth1
+
+ -- Rohan Garg <rohangarg@kubuntu.org>  Sat, 11 Sep 2010 18:40:00 +0530
+
+qoauth (1.0-2ubuntu3) maverick; urgency=low
+
+  * Remove kubuntu_01_fix_retruncode_switch.diff to ensure error is set to
+    the most appropriate value (fixes authing in choqok).
+
+ -- Harald Sitter <apachelogger@ubuntu.com>  Fri, 30 Jul 2010 18:50:01 +0200
+
+qoauth (1.0-2ubuntu2) maverick; urgency=low
+
+  * Add kubuntu_01_fix_retruncode_switch.diff to properly break a return code
+    evaluation switch
+  * Add kubuntu_02_fix_digets_encoding.diff to prevent twice encoding values
+    when using no encryption
+
+ -- Harald Sitter <apachelogger@ubuntu.com>  Wed, 28 Jul 2010 12:10:08 +0200
+
+qoauth (1.0-2ubuntu1) maverick; urgency=low
+
+  * Disable ft_interface tests to fix FTBFS
+    - Added disable_ft_interface_tests.patch
+
+ -- Rohan Garg <rohangarg@ubuntu.com>  Mon, 19 Jul 2010 16:15:59 +0530
+
 qoauth (1.0-2) unstable; urgency=low
 
   * libqoauth-dev depends on libqca2-dev
@@ -26,3 +71,4 @@
   * Initial release (Closes: #537247)
 
  -- Noah Meyerhans <noahm@debian.org>  Mon, 21 Jun 2010 23:11:09 -0700
+
diff -Nru qoauth-1.0.1/debian/control qoauth-1.0.1/debian/control
--- qoauth-1.0.1/debian/control	2013-09-27 02:28:20.000000000 +0100
+++ qoauth-1.0.1/debian/control	2013-11-28 13:14:52.000000000 +0000
@@ -1,6 +1,7 @@
 Source: qoauth
 Priority: extra
-Maintainer: Noah Meyerhans <noahm@debian.org>
+Maintainer: Kubuntu Developers <kubuntu-devel@lists.ubuntu.com>
+XSBC-Original-Maintainer: Noah Meyerhans <noahm@debian.org>
 Build-Depends: debhelper (>= 9.20120909), libqca2-dev, qt4-qmake, libqca2-plugin-ossl
 Standards-Version: 3.9.4
 Section: libs
diff -Nru qoauth-1.0.1/debian/patches/kubuntu_02_fix_digets_encoding.diff qoauth-1.0.1/debian/patches/kubuntu_02_fix_digets_encoding.diff
--- qoauth-1.0.1/debian/patches/kubuntu_02_fix_digets_encoding.diff	1970-01-01 01:00:00.000000000 +0100
+++ qoauth-1.0.1/debian/patches/kubuntu_02_fix_digets_encoding.diff	2010-11-08 13:21:45.000000000 +0000
@@ -0,0 +1,13 @@
+Index: qoauth-1.0/src/interface.cpp
+===================================================================
+--- qoauth-1.0.orig/src/interface.cpp	2010-07-25 10:34:08.357558002 +0200
++++ qoauth-1.0/src/interface.cpp	2010-07-25 10:35:51.185558001 +0200
+@@ -1078,7 +1078,7 @@
+ 
+     // get percent encoded consumer secret and token secret, join and percent encode once more
+     QByteArray digest = consumerSecret.toPercentEncoding() + "&" + tokenSecret.toPercentEncoding();
+-    return digest.toPercentEncoding();
++    return digest;
+ }
+ 
+ #include "moc_interface.cpp"
diff -Nru qoauth-1.0.1/debian/patches/series qoauth-1.0.1/debian/patches/series
--- qoauth-1.0.1/debian/patches/series	2013-09-27 02:28:20.000000000 +0100
+++ qoauth-1.0.1/debian/patches/series	2013-09-27 04:41:47.000000000 +0100
@@ -1,2 +1,3 @@
 libs_in_lib
 nonfatal_tests
+kubuntu_02_fix_digets_encoding.diff