Bug#639651: xserver-xorg-video-r128: FTBFS: Package 'xorg-server' requires 'dri2proto >= 2.6' but version of DRI2Proto is 2.3

[Jonathan Nieder <jrnieder@gmail.com>]

Package: xserver-xorg-dev
Version: 2:1.10.99.901+git20110731-1
Tags: patch

Hi,

Trying to build xserver-xorg-video-r128 today:

	checking for XORG... no
	configure: error: Package requirements (xorg-server >= 1.2 xproto font

	Package 'xorg-server' requires 'dri2proto >= 2.6' but version of DRI2P

	Consider adjusting the PKG_CONFIG_PATH environment variable if you
	installed software in a non-standard prefix.

	Alternatively, you may set the environment variables XORG_CFLAGS
	and XORG_LIBS to avoid the need to call pkg-config.
	See the pkg-config man page for more details.
	dh_auto_configure: ../configure --build=x86_64-linux-gnu --prefix=/usr
	make: *** [build] Error 2

Well, I asked for it.  It seems that the dri2 requirement bumped with
932513e2 (DRI2/GLX: use new swap event types, 2011-05-05).  How about
this patch?

-- >8 --
Subject: Bump xserver-xorg-core Depends on x11proto-dri2-dev

This avoids build failures in drivers that use PKG_CHECK_MODULES(XORG,
[xorg-server]):

	Package 'xorg-server' requires 'dri2proto >= 2.6' but version of DRI2Proto is 2.3
---
 debian/changelog |    7 +++++++
 debian/control   |    2 +-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ac07882c..42351787 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.11.0-1.1) local; urgency=low
+
+  * xserver-xorg-core: Bump dependency on x11proto-dri2-dev, needed
+    since xorg-server.pc pulls a newer dri2proto version.
+
+ -- Jonathan Nieder <jrnieder@gmail.com>  Sun, 28 Aug 2011 20:39:07 -0500
+
 xorg-server (2:1.11.0-1) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/control b/debian/control
index ea69deb1..f822fc9f 100644
--- a/debian/control
+++ b/debian/control
@@ -163,7 +163,7 @@ Depends:
  x11proto-video-dev,
  x11proto-randr-dev (>= 1.2.99.3),
  x11proto-render-dev (>= 2:0.11),
- x11proto-dri2-dev (>= 2.3),
+ x11proto-dri2-dev (>= 2.6),
  x11proto-fonts-dev,
  x11proto-xinerama-dev,
  x11proto-kb-dev,
-- 
1.7.6