xserver: Branch 'server-1.9-branch' - 3 commits

[Jeremy Huddleston]

 configure.ac                  |    4 ++--
 dix/Makefile.am               |    1 +
 hw/xquartz/bundle/Makefile.am |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 723c82347c141d298ff82a9605d7455e84c050f8
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Sat Nov 13 15:33:32 2010 -0800

    Version bumped to 1.9.2.901 (1.9.3 RC1)
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/configure.ac b/configure.ac
index 1f014ed..379f804 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.9.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2010-10-30"
+AC_INIT([xorg-server], 1.9.2.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2010-11-13"
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
commit 42a3747f0f694ff918ab719594eefd0a6bbfab0c
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Sat Nov 13 16:04:10 2010 -0800

    XQuartz: Fix make distcheck
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index c4d77c0..8237e0d 100644
--- a/hw/xquartz/bundle/Makefile.am
+++ b/hw/xquartz/bundle/Makefile.am
@@ -12,7 +12,7 @@ install-data-hook:
 	$(srcdir)/mk_bundke.sh $(srcdir) $(builddir) $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app install
 
 uninstall-hook:
-	$(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app	
+	$(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/{Resources,Info.plist,PkgInfo}
 
 noinst_PRE = Info.plist.cpp
 noinst_DATA = $(noinst_PRE:plist.cpp=plist)
commit d75a33d47a89bf7668e05fadbc8a154ac492b113
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Sat Nov 13 15:46:16 2010 -0800

    dix: Fix make distcheck
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/dix/Makefile.am b/dix/Makefile.am
index 5e2dad7..59e512b 100644
--- a/dix/Makefile.am
+++ b/dix/Makefile.am
@@ -1,5 +1,6 @@
 noinst_LTLIBRARIES = libdix.la libmain.la
 
+AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_CFLAGS = $(DIX_CFLAGS)
 
 libmain_la_SOURCES =    \