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

[Jeremy Huddleston]

 configure.ac                     |    2 +-
 hw/xquartz/X11Application.m      |    2 +-
 hw/xquartz/bundle/Info.plist.cpp |    4 ++--
 hw/xquartz/quartzKeyboard.c      |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 4db744e1a78a4b20e3b3636fb4475a64bb4dccf8
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sun Nov 16 15:35:17 2008 -0800

    XQuartz: Use AvailabilityMacros.h instead of availability.h for Tiger
    (cherry picked from commit 91f3c3435716195e6d606c8e2f6b0de52eb5972d)

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 8472730..50212dc 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -47,7 +47,7 @@
 
 #include <mach/mach.h>
 #include <unistd.h>
-#include <available.h>
+#include <AvailabilityMacros.h>
 
 #include <Xplugin.h>
 
diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index eea839c..1f552e0 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -44,7 +44,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <available.h>
+#include <AvailabilityMacros.h>
 
 #include "quartzCommon.h"
 #include "darwin.h"
commit 3a3ccf5354e4275abe9d01f41a92602df5d690dc
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Tue Jan 6 15:32:44 2009 -0800

    XQuartz: Bundle version 2.4.0

diff --git a/hw/xquartz/bundle/Info.plist.cpp b/hw/xquartz/bundle/Info.plist.cpp
index 47018fd..1f9b3ae 100644
--- a/hw/xquartz/bundle/Info.plist.cpp
+++ b/hw/xquartz/bundle/Info.plist.cpp
@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 		<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-		<string>2.3.2</string>
+		<string>2.4.0</string>
 	<key>CFBundleVersion</key>
-		<string>2.3.2</string>
+		<string>2.4.0</string>
 	<key>CFBundleSignature</key>
 		<string>x11a</string>
 	<key>CSResourcesFileMapped</key>
commit 07d9f7b20cc950c9671c0ffb945b69c3524a4721
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Tue Jan 6 15:32:12 2009 -0800

    1.5.3-apple1

diff --git a/configure.ac b/configure.ac
index 45ba50b..27c8aa2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.5.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.5.3-apple1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 RELEASE_DATE="5 November 2008"
 REMEMBER_REMEMBER="The Fifth of November"
 AC_CONFIG_SRCDIR([Makefile.am])