diff -u esperanza-0.4.0/debian/changelog esperanza-0.4.0/debian/changelog
--- esperanza-0.4.0/debian/changelog
+++ esperanza-0.4.0/debian/changelog
@@ -1,3 +1,20 @@
+esperanza (0.4.0-3ubuntu1) intrepid; urgency=low
+
+  * Merge from Debian unstable (LP: #246299), remaining changes:
+    + Provide an icon and a .desktop file
+    + debian/control: update Maintainer field as per spec
+
+ -- Benjamin Drung <benjamin.drung@gmail.com>  Mon, 07 Jul 2008 17:48:25 +0200
+
+esperanza (0.4.0-3) unstable; urgency=low
+
+  * Be compatible with xmms2 DrLecter.
+    + Apply patch by Thomas Frauendorfer.
+  * Build-Depend on libx11-dev.
+  * Bump Standards-Version to 3.8.0 (no changes).
+
+ -- Florian Ragwitz <rafl@debian.org>  Sat, 05 Jul 2008 15:53:29 +0200
+
 esperanza (0.4.0-2ubuntu2) intrepid; urgency=low
 
   * Rebuild for libxmmsclient++1 -> libxmmsclient++2 transition
@@ -6,9 +23,9 @@
 
 esperanza (0.4.0-2ubuntu1) intrepid; urgency=low
 
- * Merge from debian unstable, Ubuntu remaining changes: (LP: #227859)
-  + Provide an icon and a .desktop file
-  + debian/control: update Maintainer field as per spec
+  * Merge from debian unstable, Ubuntu remaining changes: (LP: #227859)
+    + Provide an icon and a .desktop file
+    + debian/control: update Maintainer field as per spec
 
  -- Emanuele Gentili <emgent@emanuele-gentili.com>  Wed, 07 May 2008 18:58:03 +0200
 
diff -u esperanza-0.4.0/debian/control esperanza-0.4.0/debian/control
--- esperanza-0.4.0/debian/control
+++ esperanza-0.4.0/debian/control
@@ -1,11 +1,11 @@
 Source: esperanza
 Section: sound
 Priority: extra
-XSBC-Original-Maintainer: Florian Ragwitz <rafl@debian.org>
-Uploaders: Thomas Jollans <thomas@jollans.com>
 Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
-Build-Depends: debhelper (>= 5), libqt4-dev, libxmmsclient++-dev (>= 0.2DrK)
-Standards-Version: 3.7.3
+XSBC-Original-Maintainer: Florian Ragwitz <rafl@debian.org>
+Uploaders: Thomas Jollans <thomas@jollans.com>, Anders Waldenborg <anders@0x63.nu>
+Build-Depends: debhelper (>= 5), libqt4-dev, libxmmsclient++-dev (>= 0.2DrK), libx11-dev
+Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-xmms2/esperanza
 Vcs-Browser: http://git.debian.org/?p=pkg-xmms2/esperanza.git
 Homepage: http://wiki.xmms2.xmms.se/index.php/Client:Esperanza
only in patch2:
unchanged:
--- esperanza-0.4.0.orig/src/lib/playlistmodel.cpp
+++ esperanza-0.4.0/src/lib/playlistmodel.cpp
@@ -27,6 +27,9 @@
 
 #include "playlistmodel.h"
 
+// Used to check for Protocolversion at compiletime
+#include <xmmsc/xmmsc_idnumbers.h>
+
 PlaylistModel::PlaylistModel (QObject *parent, XClient *client, const QString &name) : QAbstractItemModel (parent)
 {
 //	m_columns.append ("#");
@@ -108,6 +111,19 @@
 	return true;
 }
 
+#if (XMMS_IPC_PROTOCOL_VERSION > 10)
+bool
+PlaylistModel::handle_update_pos (const Xmms::Dict &posdict)
+{
+	QString changed_pl = XClient::stdToQ (posdict.get<std::string> ("name"));
+	if (changed_pl == m_name) {
+		uint32_t pos = posdict.get<uint32_t> ("position");
+		m_current_pos = pos;
+		emit dataChanged(index (pos, 0), index (pos, m_columns.size ()));
+	}
+	return true;
+}
+#else
 bool
 PlaylistModel::handle_update_pos (const uint32_t &pos)
 {
@@ -115,6 +131,7 @@
 	emit dataChanged(index (pos, 0), index (pos, m_columns.size ()));
 	return true;
 }
+#endif
 
 QList<QString>
 PlaylistModel::columns () const
only in patch2:
unchanged:
--- esperanza-0.4.0.orig/src/lib/playlistmodel.h
+++ esperanza-0.4.0/src/lib/playlistmodel.h
@@ -128,7 +128,11 @@
 	private:
 		bool handle_list (const Xmms::List< unsigned int > &list);
 		bool handle_change (const Xmms::Dict &chg);
+#if (XMMS_IPC_PROTOCOL_VERSION > 10)
+		bool handle_update_pos (const Xmms::Dict &pos);
+#else
 		bool handle_update_pos (const unsigned int &pos);
+#endif
 		bool handle_pls_loaded (const std::string &);
         bool handle_current_pls (const std::string &);