diff -u quodlibet-plugins-20070625/debian/control quodlibet-plugins-20070625/debian/control
--- quodlibet-plugins-20070625/debian/control
+++ quodlibet-plugins-20070625/debian/control
@@ -1,6 +1,7 @@
 Source: quodlibet-plugins
 Section: sound
-Maintainer: Christine Spang <christine@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Christine Spang <christine@debian.org>
 Build-Depends: debhelper (>= 4.0), python
 Priority: extra
 Standards-Version: 3.7.2.2
diff -u quodlibet-plugins-20070625/debian/changelog quodlibet-plugins-20070625/debian/changelog
--- quodlibet-plugins-20070625/debian/changelog
+++ quodlibet-plugins-20070625/debian/changelog
@@ -1,3 +1,14 @@
+quodlibet-plugins (20070625-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Don't specify universal newline mode ('U') when opening files for writing.
+    - Modify Maintainer value to match Debian-Maintainer-Field Spec
+  * Dropping 01_gajim-attribute-error.dpatch previously added, removing
+    everything dpatch related. This fix has been integrated in the new upstream
+    svn snapshot packaged in debian. See debian bug #429063.
+
+ -- Andrea Veri <bluekuja@ubuntu.com>  Fri, 29 Jun 2007 21:33:33 +0200
+
 quodlibet-plugins (20070625-1) unstable; urgency=low
 
   * New upstream svn snapshot.
@@ -5,6 +16,25 @@
 
  -- Christine Spang <christine@debian.org>  Mon, 25 Jun 2007 17:22:24 -0400
 
+quodlibet-plugins (20070529-1ubuntu2) gutsy; urgency=low
+
+    * Added dpatch to B-D in debian/control
+    * Added dpatch patch system in debian/rules
+    * Added 01_gajim-attribute-error.dpatch (Thanks to Kjell Braden) that
+      fixes some errors while pausing/unpausing and when changing tracks in
+      gajim. (LP: #120065)
+
+ -- Andrea Veri <bluekuja@ubuntu.com>  Fri, 15 Jun 2007 23:45:49 +0200
+
+quodlibet-plugins (20070529-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Don't specify universal newline mode ('U') when opening files for writing.
+    - Modify Maintainer value to match Debian-Maintainer-Field Spec
+  * Updated XSBC-O-M according to the new maintainer's address
+
+ -- Arthur Loiret <freacky22527@free.fr>  Sun,  3 Jun 2007 22:24:50 +0200
+
 quodlibet-plugins (20070529-1) unstable; urgency=low
 
   * New upstream svn snapshot.
@@ -13,6 +43,14 @@
 
  -- Christine Spang <christine@debian.org>  Tue, 29 May 2007 10:21:28 -0400
 
+quodlibet-plugins (20070430-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Don't specify universal newline mode ('U') when opening files for writing.
+      (Closes LP: #87188)
+
+ -- Andrea Veri <bluekuja@ubuntu.com>  Mon, 21 May 2007 04:25:06 +0200
+
 quodlibet-plugins (20070430-1) unstable; urgency=low
 
   * New upstream svn snapshot.
@@ -28,6 +66,14 @@
 
  -- Christine Spang <spang@mit.edu>  Tue,  3 Oct 2006 03:00:58 -0400
 
+quodlibet-plugins (20060823-1ubuntu1) feisty; urgency=low
+
+  * Don't specify universal newline mode ('U') when opening files for writing.
+    (Closes LP: #87188)
+  * debian/control: Change Maintainer/XSBC-Original-Maintainer field.
+
+ -- Michael Bienia <geser@ubuntu.com>  Thu, 15 Mar 2007 17:27:02 +0100
+
 quodlibet-plugins (20060823-1) unstable; urgency=low
 
   * New upstream svn snapshot for quodlibet 0.23. (Closes: #384392)
only in patch2:
unchanged:
--- quodlibet-plugins-20070625.orig/songsmenu/cddb.py
+++ quodlibet-plugins-20070625/songsmenu/cddb.py
@@ -71,7 +71,7 @@
     try: os.makedirs(path.join(path.expanduser("~"), '.cddb'))
     except EnvironmentError: pass
     try:
-        save = file(dump, 'wU')
+        save = file(dump, 'w')
         keys = info.keys()
         keys.sort()
         for key in keys:
only in patch2:
unchanged:
--- quodlibet-plugins-20070625.orig/songsmenu/html.py
+++ quodlibet-plugins-20070625/songsmenu/html.py
@@ -80,6 +80,6 @@
             s += '</tr>'
             songs_s += s
 
-        f = open(fn, 'wU')
+        f = open(fn, 'w')
         f.write((HTML % {'headers': cols_s, 'songs': songs_s}).encode('utf-8'))
         f.close()
only in patch2:
unchanged:
--- quodlibet-plugins-20070625.orig/songsmenu/importexport.py
+++ quodlibet-plugins-20070625/songsmenu/importexport.py
@@ -51,7 +51,7 @@
 
         global lastfolder
         lastfolder = dirname(fn)
-        out = open(fn, 'wU')
+        out = open(fn, 'w')
 
         for song in songs:
             print>>out, str(song('~basename'))