diff -wu playitslowly-1.3.0/debian/changelog playitslowly-1.3.0/debian/changelog
--- playitslowly-1.3.0/debian/changelog
+++ playitslowly-1.3.0/debian/changelog
@@ -1,3 +1,11 @@
+playitslowly (1.3.0-2ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable (LP: #678094). Remaining changes:
+    - Build depend on python instead of python2.5 (This fixes FTBFS as
+      python2.5 is not available in ubuntu)
+
+ -- Angel Abad <angelabad@ubuntu.com>  Sun, 21 Nov 2010 12:11:13 +0100
+
 playitslowly (1.3.0-2) unstable; urgency=low
 
   * Fixes minor description string error. Thanks to Rupert Swarbrick.
@@ -5,6 +13,13 @@
 
  -- Tiago Bortoletto Vaz <tiago@debian.org>  Sat, 20 Nov 2010 22:52:39 -0200
 
+playitslowly (1.3.0-1ubuntu1) natty; urgency=low
+
+  * Build depend on python instead of python2.5 (This fixes FTBFS as
+    python2.5 is not available in ubuntu)
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Sat, 06 Nov 2010 12:26:58 +0530
+
 playitslowly (1.3.0-1) unstable; urgency=low
 
   * Initial release. (Closes: #510890)
diff -wu playitslowly-1.3.0/debian/control playitslowly-1.3.0/debian/control
--- playitslowly-1.3.0/debian/control
+++ playitslowly-1.3.0/debian/control
@@ -1,8 +1,9 @@
 Source: playitslowly
 Section: gnome
 Priority: optional
-Maintainer: Tiago Bortoletto Vaz <tiago@debian.org>
-Build-Depends: debhelper (>=7.0.50~), python-support (>= 0.6), cdbs (>= 0.4.49), python2.5
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Tiago Bortoletto Vaz <tiago@debian.org>
+Build-Depends: debhelper (>=7.0.50~), python-support (>= 0.6), cdbs (>= 0.4.49), python
 Standards-Version: 3.9.1
 Vcs-Browser: http://git.debian.org/?p=collab-maint/playitslowly.git
 Vcs-Git: git://git.debian.org/git/collab-maint/playitslowly.git