diff -u libxcb-1.2/debian/control libxcb-1.2/debian/control
--- libxcb-1.2/debian/control
+++ libxcb-1.2/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu X-SWAT <ubuntu-x@lists.ubuntu.com>
 XSBC-Original-Maintainer: XCB Developers <xcb@lists.freedesktop.org>
 Uploaders: Jamey Sharp <sharpone@debian.org>, Josh Triplett <josh@freedesktop.org>, Julien Danjou <acid@debian.org>
-Build-Depends: libxau-dev, libxdmcp-dev, xcb-proto (> 1.3), xcb-proto (<< 2.0), libpthread-stubs0-dev (>= 0.1), cdbs (>= 0.4.40), debhelper (>= 5.0.0), pkg-config, xsltproc (>= 1.1.19), check (>= 0.9.4-2), python-xcbgen, libtool, automake, python
+Build-Depends: libxau-dev, libxdmcp-dev, xcb-proto (> 1.3), xcb-proto (<< 2.0), libpthread-stubs0-dev (>= 0.1), cdbs (>= 0.4.40), debhelper (>= 5.0.0), pkg-config, xsltproc (>= 1.1.19), check (>= 0.9.4-2), python-xcbgen, libtool, automake, python, quilt
 Standards-Version: 3.8.0
 Homepage: http://xcb.freedesktop.org
 Vcs-Git: git://anongit.freedesktop.org/git/xcb/libxcb
diff -u libxcb-1.2/debian/rules libxcb-1.2/debian/rules
--- libxcb-1.2/debian/rules
+++ libxcb-1.2/debian/rules
@@ -6,6 +6,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 $(DEB_BUILDDIR)/config.status: configure
 
diff -u libxcb-1.2/debian/changelog libxcb-1.2/debian/changelog
--- libxcb-1.2/debian/changelog
+++ libxcb-1.2/debian/changelog
@@ -1,3 +1,9 @@
+libxcb (1.2-1ubuntu2) karmic; urgency=low
+
+  * Disable Nagle on TCP socket (LP: #277069)
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Wed, 27 May 2009 01:31:03 +0200
+
 libxcb (1.2-1ubuntu1) karmic; urgency=low
 
   * Merge from Debian unstable, remaining changes:
only in patch2:
unchanged:
--- libxcb-1.2.orig/debian/patches/101_fix_lp277069.diff
+++ libxcb-1.2/debian/patches/101_fix_lp277069.diff
@@ -0,0 +1,22 @@
+diff --git a/src/xcb_util.c b/src/xcb_util.c
+index 4ae9097..8873f26 100644
+--- a/src/xcb_util.c
++++ b/src/xcb_util.c
+@@ -30,6 +30,7 @@
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <netinet/in.h>
++#include <netinet/tcp.h>
+ #ifdef DNETCONN
+ #include <netdnet/dnetdb.h>
+ #include <netdnet/dn.h>
+@@ -250,6 +251,9 @@ static int _xcb_open_tcp(char *host, char *protocol, const unsigned short port)
+     {
+         fd = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
+         if(fd >= 0) {
++            int on = 1;
++            setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on));
++
+             if (connect(fd, addr->ai_addr, addr->ai_addrlen) >= 0)
+                 break;
+             close(fd);
only in patch2:
unchanged:
--- libxcb-1.2.orig/debian/patches/series
+++ libxcb-1.2/debian/patches/series
@@ -0,0 +1 @@
+101_fix_lp277069.diff