xserver: Branch 'xorg-server-1.5-apple' - 2 commits

[Jeremy Huddleston]

 configure.ac   |    8 ++++----
 mi/miinitext.c |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit e1f97a7e3178bde711086bea770a79ae1670b07c
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Mon Aug 31 15:58:58 2009 -0700

    1.5.3-apple15

diff --git a/configure.ac b/configure.ac
index b8a3248..c925e8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.5.3-apple14, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="5 August 2009"
-REMEMBER_REMEMBER="The Fifth of August"
+AC_INIT([xorg-server], 1.5.3-apple15, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="31 August 2009"
+REMEMBER_REMEMBER="The Thirty-first of August"
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
commit 608581c3e94541816b1ca1ba944eca7fc43b320d
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Mon Aug 31 15:58:18 2009 -0700

    mi: fix build error caused by missing xtest.h
    
    xtest.h was renamed to xtestconst.h in xextproto.
    Requires xextproto 7.0.99.3
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    (cherry picked from commit 20daa145c437c3ba67970146f6182849f87a1b43)

diff --git a/configure.ac b/configure.ac
index 751991b..b8a3248 100644
--- a/configure.ac
+++ b/configure.ac
@@ -700,7 +700,7 @@ else
 	RENDERPROTO="renderproto"
 fi
 
-REQUIRED_MODULES="[randrproto >= 1.2] $RENDERPROTO [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto [xextproto >= 7.0.99.1] [xproto >= 7.0.9] [xtrans >= 1.2.2] [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto [inputproto >= 1.4.4] [kbproto >= 1.0.3]"
+REQUIRED_MODULES="[randrproto >= 1.2] $RENDERPROTO [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto [xextproto >= 7.0.99.3] [xproto >= 7.0.9] [xtrans >= 1.2.2] [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto [inputproto >= 1.4.4] [kbproto >= 1.0.3]"
 REQUIRED_LIBS="xfont xau fontenc [pixman-1 >= 0.9.5]"
 
 dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 1046ed7..42ff5d6 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -176,7 +176,7 @@ typedef void (*InitExtension)(INITARGS);
 #include <X11/extensions/shm.h>
 #endif
 #ifdef XTEST
-#include <X11/extensions/xtest.h>
+#include <X11/extensions/xtestconst.h>
 #endif
 #ifdef XKB
 #include <X11/extensions/XKB.h>