diff -Nru -w kwalletcli-2.03/debian/changelog kwalletcli-2.03/debian/changelog
--- kwalletcli-2.03/debian/changelog	2010-11-16 10:39:49.000000000 +0100
+++ kwalletcli-2.03/debian/changelog	2010-11-17 00:35:41.000000000 +0100
@@ -1,3 +1,14 @@
+kwalletcli (2.03-1ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable (LP: #676299). Remaining changes:
+    - Remove optional dependency on pinentry-qt, as it is no longer built
+      from source and this optional dependency was preventing its removal
+  * Dropped change (superceded in Debian):
+    - Fix FTBFS due to indirect linking.
+      + Add 01_fix_build_indirect_linking.diff
+
+ -- Angel Abad <angelabad@ubuntu.com>  Tue, 16 Nov 2010 23:38:21 +0100
+
 kwalletcli (2.03-1) unstable; urgency=low
 
   * New upstream version; changes:
@@ -12,6 +23,20 @@
 
  -- Thorsten Glaser <tg@mirbsd.de>  Tue, 16 Nov 2010 09:38:52 +0000
 
+kwalletcli (2.02-2ubuntu2) natty; urgency=low
+
+  * Remove optional dependency on pinentry-qt, as it is no longer built
+    from source and this optional dependency was preventing its removal
+
+ -- Jonathan Thomas <echidnaman@kubuntu.org>  Wed, 20 Oct 2010 23:24:15 -0400
+
+kwalletcli (2.02-2ubuntu1) natty; urgency=low
+
+  * Fix FTBFS due to indirect linking.
+    - Add 01_fix_build_indirect_linking.diff
+
+ -- Felix Geyer <debfx-pkg@fobos.de>  Tue, 19 Oct 2010 21:58:30 +0200
+
 kwalletcli (2.02-2) unstable; urgency=low
 
   * The “urgency=ridiculous” release
diff -Nru -w kwalletcli-2.03/debian/control kwalletcli-2.03/debian/control
--- kwalletcli-2.03/debian/control	2010-11-16 10:50:47.000000000 +0100
+++ kwalletcli-2.03/debian/control	2010-11-16 19:08:27.000000000 +0100
@@ -4,7 +4,8 @@
 Section: kde
 Priority: optional
 Homepage: https://www.mirbsd.org/kwalletcli.htm
-Maintainer: Thorsten Glaser <tg@mirbsd.de>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Thorsten Glaser <tg@mirbsd.de>
 Build-Depends: debhelper (>= 5), kdelibs5-dev, libqt4-dev
 Standards-Version: 3.9.1
 # First word is the $CVSROOT (-d arg) string, second word the module.
@@ -18,7 +19,7 @@
 # pinentry-gtk exists in dapper and etch… it’s there to keep
 # things backport friendly
 Recommends: gnupg-agent,
- pinentry-curses | pinentry-gtk | pinentry-gtk2 | pinentry-qt | pinentry-qt4,
+ pinentry-curses | pinentry-gtk | pinentry-gtk2 | pinentry-qt4,
  openssh-client
 Enhances: gajim (>= 0.13~)
 Description: command line interface to the KDE Wallet