diff -Nru pymsn-0.3.1/debian/changelog pymsn-0.3.1/debian/changelog
--- pymsn-0.3.1/debian/changelog	2008-05-20 22:44:14.000000000 +0200
+++ pymsn-0.3.1/debian/changelog	2008-05-20 22:44:14.000000000 +0200
@@ -1,3 +1,14 @@
+pymsn (0.3.1-2ubuntu1) intrepid; urgency=low
+
+  * Merge from Debian unstable (LP: #232332). Remaining Ubuntu changes:
+      - debian/control:
+          + Depend on python (>= 2.5) | python-ctypes.
+          + Maintainer field modified as per spec.
+      - debian/patches/01_upstream_removed-SLPTransferRequestBody-check.patch:
+        taken from upstream, removed the unused SLPTransferRequestBody check
+
+ -- Andrea Gasparini <gaspa@yattaweb.it>  Mon, 19 May 2008 03:09:29 +0200
+
 pymsn (0.3.1-2) unstable; urgency=low
 
   * Removed call to delete empty usr/lib directory in rules and updated the
@@ -36,6 +47,49 @@
 
  -- Laurent Bigonville <bigon@bigon.be>  Tue, 25 Sep 2007 19:33:40 +0200
 
+pymsn (0.3.1-0ubuntu3) hardy; urgency=low
+
+  * Depend on python (>= 2.5) | python-ctypes.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 07 Apr 2008 15:16:42 +0000
+
+pymsn (0.3.1-0ubuntu2) hardy; urgency=low
+
+  * debian/patches/01_upstream_removed-SLPTransferRequestBody-check.patch:
+    taken from upstream, removed the unused SLPTransferRequestBody check
+    (LP: #195462)
+
+ -- Kjell Braden <fnord@pentabarf.de>  Sat, 15 Mar 2008 11:38:56 +0100
+
+pymsn (0.3.1-0ubuntu1) hardy; urgency=low
+
+  [ Sjoerd Simons ]
+  * debian/rules: remove dh_python, it's no longer needed
+
+  [ Laurent Bigonville ]
+  * New upstream release (0.3.1)
+  * debian/control:
+    - Add myself as an Uploaders
+    - Add python:Provides for binary package
+    - Add python-ctypes and python-crypto to build-deps/deps
+  * debian/rules: remove binary-install rule
+  * Add watch file
+  * remove pycompat file, not needed anymore
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+  [ Jonny Lamb ]
+  * Added python-adns to build-deps/deps.
+  * Added python-pyopenssl to build-deps/deps.
+  * Updated copyright.
+  * Upped Standards-Version to 3.7.3.
+  * Added "XS-Dm-Upload-Allowed: yes" under the request of Sjoerd Simons.
+  * Added myself to Uploaders.
+  * Added Homepage to control.
+  * Added Vcs-Bzr to control.
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Thu, 17 Jan 2008 18:23:14 +0100
+
 pymsn (0.2.2-1) experimental; urgency=low
 
   * New upstream version
diff -Nru pymsn-0.3.1/debian/control pymsn-0.3.1/debian/control
--- pymsn-0.3.1/debian/control	2008-05-20 22:44:14.000000000 +0200
+++ pymsn-0.3.1/debian/control	2008-05-20 22:44:14.000000000 +0200
@@ -2,7 +2,8 @@
 Section: python
 Priority: optional
 XS-Python-Version: >= 2.4
-Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintainers@lists.alioth.debian.org>
 Uploaders: Simon McVittie <smcv@ianadd.pseudorandom.co.uk>, Dafydd Harries <daf@debian.org>, Daniel Holbach <daniel.holbach@ubuntu.com>, Riccardo Setti <giskard@debian.org>, Sjoerd Simons <sjoerd@debian.org>, Jonny Lamb <jonnylamb@jonnylamb.com>, Laurent Bigonville <bigon@bigon.be>
 Build-Depends: cdbs, debhelper (>= 5), python-all-dev (>= 2.3.5-11), python-central (>= 0.6), python-adns, python-pyopenssl, python-gobject, python-crypto, python-elementtree
 Standards-Version: 3.7.3
@@ -12,7 +13,7 @@
 
 Package: python-msn
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-gobject (>= 2.10.1), python-ctypes, python-adns, python-pyopenssl, python-crypto, python-elementtree
+Depends: ${misc:Depends}, ${python:Depends}, python-gobject (>= 2.10.1), python (>=2.5) | python-ctypes, python-adns, python-pyopenssl, python-crypto, python-elementtree
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: Python client library for the MSN protocol
diff -Nru pymsn-0.3.1/debian/patches/01_upstream_removed-SLPTransferRequestBody-check.patch pymsn-0.3.1/debian/patches/01_upstream_removed-SLPTransferRequestBody-check.patch
--- pymsn-0.3.1/debian/patches/01_upstream_removed-SLPTransferRequestBody-check.patch	1970-01-01 01:00:00.000000000 +0100
+++ pymsn-0.3.1/debian/patches/01_upstream_removed-SLPTransferRequestBody-check.patch	2008-05-20 22:44:14.000000000 +0200
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' pymsn-0.3.1/pymsn/msnp2p/session_manager.py pymsn-0.3.1.new/pymsn/msnp2p/session_manager.py
+--- pymsn-0.3.1/pymsn/msnp2p/session_manager.py	2007-12-24 20:04:22.000000000 +0100
++++ pymsn-0.3.1.new/pymsn/msnp2p/session_manager.py	2008-03-15 11:41:08.000000000 +0100
+@@ -152,8 +152,6 @@
+                     except SLPError:
+                         #TODO: answer with a 603 Decline ?
+                         return 
+-                elif isinstance(message.body, SLPTransferRequestBody):
+-                    pass  
+             else:
+                 logger.warning('Received initial blob with SessionID=0 and non INVITE SLP data')
+                 #TODO: answer with a 500 Internal Error