diff -u gajim-0.13.4/debian/changelog gajim-0.13.4/debian/changelog
--- gajim-0.13.4/debian/changelog
+++ gajim-0.13.4/debian/changelog
@@ -1,3 +1,20 @@
+gajim (0.13.4-2ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable (LP: #662154). Remaining changes:
+    - Updated debian/watch
+    - Kept Ubuntu patches
+      + config-write-sync.patch
+      + ubuntu-keyring.patch
+
+ -- Angel Abad <angelabad@ubuntu.com>  Tue, 14 Sep 2010 11:16:21 +0100
+
+gajim (0.13.4-2) unstable; urgency=low
+
+  * don't fail to build with python != 2.5. Closes: #595870
+  * fix minimum python-openssl version to 0.9. Closes: #594772
+
+ -- Yann Leboulanger <asterix@lagaule.org>  Tue, 07 Sep 2010 09:28:03 +0200
+
 gajim (0.13.4-1ubuntu1) maverick; urgency=low
 
   * Merge from debian testing (LP: #506049), remaining changes:
@@ -886,6 +903,8 @@
+
 gajim (0.7.1-1) unstable; urgency=low
 
   * Initial Release. Closes: #311215
   * GnuPGInterface module is in debian, no need to keep it in sources.
 
  -- Yann Le Boulanger <asterix@lagaule.org>  Wed, 15 Jun 2005 23:22:19 +0200
+
diff -u gajim-0.13.4/debian/rules gajim-0.13.4/debian/rules
--- gajim-0.13.4/debian/rules
+++ gajim-0.13.4/debian/rules
@@ -7,10 +7,9 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-PYTHONVER = 2.6
 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/usr
-DEB_MAKE_BUILD_TARGET    := all PYTHON=python$(PYTHONVER)
-DEB_MAKE_INSTALL_TARGET = install PYTHON=python$(PYTHONVER) DESTDIR=$(DEB_DESTDIR)
+DEB_MAKE_BUILD_TARGET    := all
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DEB_DESTDIR)
 
 binary-install/gajim::
 	rm $(DEB_DESTDIR)/usr/share/gajim/src/common/GnuPGInterface.py*
diff -u gajim-0.13.4/debian/control gajim-0.13.4/debian/control
--- gajim-0.13.4/debian/control
+++ gajim-0.13.4/debian/control
@@ -1,4 +1,3 @@
-
 Source: gajim
 Section: net
 Priority: optional
@@ -16,7 +15,7 @@
 Architecture: any
 XB-Python-Version: ${python:Versions}
 Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, python-support (>= 0.7.1), python-glade2 (>= 2.12.0), python-gtk2 (>= 2.12.0), dnsutils
-Recommends: dbus, python-dbus, notification-daemon, python-gnupginterface, python-openssl, python-crypto
+Recommends: dbus, python-dbus, notification-daemon, python-gnupginterface, python-openssl (>= 0.9), python-crypto
 Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring, gnome-keyring, python-sexy, python-kerberos (>= 1.1), texlive-latex-base, dvipng
 Description: Jabber client written in PyGTK
  Gajim is a Jabber client. It has a tabbed user interface with normal chats,