diff -u libxcb-1.1/debian/changelog libxcb-1.1/debian/changelog
--- libxcb-1.1/debian/changelog
+++ libxcb-1.1/debian/changelog
@@ -1,3 +1,9 @@
+libxcb (1.1-1.1ubuntu1) intrepid-proposed; urgency=low
+
+  * Disable Nagle on TCP socket (LP: #277069)
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Wed, 27 May 2009 01:18:21 +0200
+
 libxcb (1.1-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u libxcb-1.1/debian/control libxcb-1.1/debian/control
--- libxcb-1.1/debian/control
+++ libxcb-1.1/debian/control
@@ -1,9 +1,10 @@
 Source: libxcb
 Priority: optional
 Section: libdevel
-Maintainer: XCB Developers <xcb@lists.freedesktop.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: XCB Developers <xcb@lists.freedesktop.org>
 Uploaders: Jamey Sharp <sharpone@debian.org>, Josh Triplett <josh@freedesktop.org>
-Build-Depends: libxau-dev, libxdmcp-dev, xcb-proto (>= 1.1), xcb-proto (<< 2.0), libpthread-stubs0-dev (>= 0.1-1), cdbs (>= 0.4.40), debhelper (>= 5.0.0), pkg-config, xsltproc (>= 1.1.19-1), check (>= 0.9.4-2), binutils (>= 2.12.90.0.9)
+Build-Depends: libxau-dev, libxdmcp-dev, xcb-proto (>= 1.1), xcb-proto (<< 2.0), libpthread-stubs0-dev (>= 0.1-1), cdbs (>= 0.4.40), debhelper (>= 5.0.0), pkg-config, xsltproc (>= 1.1.19-1), check (>= 0.9.4-2), binutils (>= 2.12.90.0.9), quilt
 Standards-Version: 3.7.2
 Homepage: http://xcb.freedesktop.org
 Vcs-Git: git://anongit.freedesktop.org/git/xcb/libxcb
diff -u libxcb-1.1/debian/rules libxcb-1.1/debian/rules
--- libxcb-1.1/debian/rules
+++ libxcb-1.1/debian/rules
@@ -4,6 +4,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_MAKE_CHECK_TARGET=check
 DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) $(MAKE) -C $(DEB_BUILDDIR) CFLAGS="$(CFLAGS)"
only in patch2:
unchanged:
--- libxcb-1.1.orig/debian/patches/101_fix_lp277069.diff
+++ libxcb-1.1/debian/patches/101_fix_lp277069.diff
@@ -0,0 +1,26 @@
+Index: libxcb-1.1/src/xcb_util.c
+--- libxcb-1.1.orig/src/xcb_util.c 2009-05-26 12:36:47.000000000 +0200
++++ libxcb-1.1/src/xcb_util.c  2009-05-26 12:38:59.000000000 +0200
+@@ -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>
+@@ -233,8 +234,12 @@
+     for(addr = results; addr; addr = addr->ai_next)
+     {
+         fd = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
+-        if(fd >= 0 && connect(fd, addr->ai_addr, addr->ai_addrlen) >= 0)
++        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;
++  }
+         fd = -1;
+     }
+     freeaddrinfo(results);
+
only in patch2:
unchanged:
--- libxcb-1.1.orig/debian/patches/series
+++ libxcb-1.1/debian/patches/series
@@ -0,0 +1 @@
+101_fix_lp277069.diff