diff -u quodlibet-plugins-20070529/debian/control quodlibet-plugins-20070529/debian/control
--- quodlibet-plugins-20070529/debian/control
+++ quodlibet-plugins-20070529/debian/control
@@ -2,7 +2,7 @@
 Section: sound
 Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
 XSBC-Original-Maintainer: Christine Spang <christine@debian.org>
-Build-Depends: debhelper (>= 4.0), python
+Build-Depends: debhelper (>= 4.0), python, dpatch
 Priority: extra
 Standards-Version: 3.7.2.2
 XS-Python-Version: current
diff -u quodlibet-plugins-20070529/debian/rules quodlibet-plugins-20070529/debian/rules
--- quodlibet-plugins-20070529/debian/rules
+++ quodlibet-plugins-20070529/debian/rules
@@ -2,6 +2,8 @@
 # debian/rules for quodlibet-plugins
 # It's obscenely simple. I feel bad.
 
+include /usr/share/dpatch/dpatch.make
+
 D := debian/quodlibet-plugins
 U := usr/share/quodlibet/plugins
 P := $(D)/$(U)
@@ -10,6 +12,10 @@
 build binary-arch install:
 # Ye olde no-op.
 
+build: build-stamp
+
+build-stamp: patch-stamp
+
 binary: binary-indep
 
 binary-indep:
@@ -29,3 +35,3 @@
 
-clean:
+clean: unpatch
 	dh_clean
diff -u quodlibet-plugins-20070529/debian/changelog quodlibet-plugins-20070529/debian/changelog
--- quodlibet-plugins-20070529/debian/changelog
+++ quodlibet-plugins-20070529/debian/changelog
@@ -1,3 +1,13 @@
+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)
+    * Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- 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:
only in patch2:
unchanged:
--- quodlibet-plugins-20070529.orig/debian/patches/00list
+++ quodlibet-plugins-20070529/debian/patches/00list
@@ -0,0 +1 @@
+01_gajim-attribute-error.dpatch
only in patch2:
unchanged:
--- quodlibet-plugins-20070529.orig/debian/patches/01_gajim-attribute-error.dpatch
+++ quodlibet-plugins-20070529/debian/patches/01_gajim-attribute-error.dpatch
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_gajim-attribute-error.dpatch by Andrea Veri <bluekuja@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+--- /events/gajim_status.py.orig	2007-06-04 01:48:30.000000000 +0200
++++ /events/gajim_status.py	2007-06-05 01:48:30.000000000 +0200
+@@ -82,14 +82,17 @@ class GajimStatusMessage(EventPlugin):
+             self.current = Pattern(self.pattern) % song
+         else:
+             self.current = ''
+-        self.change_status(self.accounts, self.current)
++        if self.interface:
++            self.change_status(self.accounts, self.current)
+ 
+     def plugin_on_paused(self):
+-        if self.paused and self.current != '':
+-            self.change_status(self.accounts, self.current + " [paused]")
++        if self.interface:
++            if self.paused and self.current != '':
++                self.change_status(self.accounts, self.current + " [paused]")
+ 
+     def plugin_on_unpaused(self):
+-        self.change_status(self.accounts, self.current)
++        if self.interface:
++            self.change_status(self.accounts, self.current)
+ 
+     def accounts_changed(self, entry):
+         self.accounts = entry.get_text().split()