diff -u libxcb-1.8.1/debian/rules libxcb-1.8.1/debian/rules
--- libxcb-1.8.1/debian/rules
+++ libxcb-1.8.1/debian/rules
@@ -15,7 +15,7 @@
 	dh_auto_configure --builddirectory=$(DEB_BUILDDIR)
 
 %:
-	dh $@ --builddirectory=$(DEB_BUILDDIR)
+	dh $@ --with quilt --builddirectory=$(DEB_BUILDDIR)
 
 override_dh_strip:
 	set -e; \
@@ -39,5 +39,6 @@
-	dh $@ --builddirectory=$(DEB_BUILDDIR)
+	dh $@ --with quilt --builddirectory=$(DEB_BUILDDIR)
 	-rm -f debian/copyright
 	rm -f aclocal.m4 configure install-sh missing
 	rm -f config.guess config.sub depcomp ltmain.sh src/config.h.in
 	find -name Makefile.in -delete
+	rm -rf .pc
diff -u libxcb-1.8.1/debian/changelog libxcb-1.8.1/debian/changelog
--- libxcb-1.8.1/debian/changelog
+++ libxcb-1.8.1/debian/changelog
@@ -1,3 +1,10 @@
+libxcb (1.8.1-1ubuntu0.1) precise-proposed; urgency=low
+
+  * Add 100-fix-multi-thread-deadlock.patch: Fixes a deadlock affecting
+    some wine applications. (LP: #1059276)
+
+ -- Robert Hooker <sarvatt@ubuntu.com>  Mon, 01 Oct 2012 14:08:35 -0400
+
 libxcb (1.8.1-1) unstable; urgency=low
 
   * New upstream release.
diff -u libxcb-1.8.1/debian/control libxcb-1.8.1/debian/control
--- libxcb-1.8.1/debian/control
+++ libxcb-1.8.1/debian/control
@@ -1,7 +1,8 @@
 Source: libxcb
 Priority: optional
 Section: libdevel
-Maintainer: XCB Developers <xcb@lists.freedesktop.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: XCB Developers <xcb@lists.freedesktop.org>
 Uploaders: Josh Triplett <josh@freedesktop.org>, Julien Danjou <acid@debian.org>, Cyril Brulebois <kibi@debian.org>
 Build-Depends:
  libxau-dev (>= 1:1.0.5-2),
@@ -17,7 +18,8 @@
  libtool,
  automake,
  python,
- dctrl-tools
+ dctrl-tools,
+ quilt
 Build-Depends-Indep:
 # libxcb-doc
  doxygen,
only in patch2:
unchanged:
--- libxcb-1.8.1.orig/debian/patches/series
+++ libxcb-1.8.1/debian/patches/series
@@ -0,0 +1 @@
+100-fix-multi-thread-deadlock.patch
only in patch2:
unchanged:
--- libxcb-1.8.1.orig/debian/patches/100-fix-multi-thread-deadlock.patch
+++ libxcb-1.8.1/debian/patches/100-fix-multi-thread-deadlock.patch
@@ -0,0 +1,46 @@
+From 23911a707b8845bff52cd7853fc5d59fb0823cef Mon Sep 17 00:00:00 2001
+From: Uli Schlachter <psychon@znc.in>
+Date: Mon, 24 Sep 2012 20:07:51 +0000
+Subject: Fix a multi-thread deadlock
+
+This fixes a deadlock which was seen in-the-wild with wine.
+
+It could happen that two threads tried to read from the socket at the same time
+and one of the thread got stuck inside of poll()/select().
+
+The fix works by making sure that the writing thread doesn't steal the reading
+thread's reply.
+
+Debugged-by: Erich Hoover <ehoover@mines.edu>
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=54671
+Signed-off-by: Uli Schlachter <psychon@znc.in>
+---
+diff --git a/src/xcb_conn.c b/src/xcb_conn.c
+index e01d566..6a7a806 100644
+--- a/src/xcb_conn.c
++++ b/src/xcb_conn.c
+@@ -432,10 +432,20 @@ int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vec
+ 
+     if(ret)
+     {
++        /* The code allows two threads to call select()/poll() at the same time.
++         * First thread just wants to read, a second thread wants to write, too.
++         * We have to make sure that we don't steal the reading thread's reply
++         * and let it get stuck in select()/poll().
++         * So a thread may read if either:
++         * - There is no other thread that wants to read (the above situation
++         *   did not occur).
++         * - It is the reading thread (above situation occurred).
++         */
++        int may_read = c->in.reading == 1 || !count;
+ #if USE_POLL
+-        if((fd.revents & POLLIN) == POLLIN)
++        if(may_read && (fd.revents & POLLIN) == POLLIN)
+ #else
+-        if(FD_ISSET(c->fd, &rfds))
++        if(may_read && FD_ISSET(c->fd, &rfds))
+ #endif
+             ret = ret && _xcb_in_read(c);
+ 
+--
+cgit v0.9.0.2-2-gbebe