xserver: Branch 'server-1.5-branch' - 2 commits

[Adam Jackson]

 configure.ac        |    2 +-
 glx/Makefile.am     |    5 ++++-
 hw/xwin/Makefile.am |    7 -------
 3 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit 32cd2c510939498e94ae2aaec40fe48b2850a321
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Jun 30 11:18:27 2008 -0400

    xserver 1.5RC4.
    
    Remember kids, distcheck before you tag.

diff --git a/configure.ac b/configure.ac
index 64aab85..4ef00b4 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.4.99.903, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.4.99.904, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
commit 6ec12077ef0fd712ef97682deab751aac5c39d6d
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Jun 30 10:47:34 2008 -0400

    Distcheck fixes.

diff --git a/glx/Makefile.am b/glx/Makefile.am
index f62d2ed..39b96d7 100644
--- a/glx/Makefile.am
+++ b/glx/Makefile.am
@@ -40,12 +40,15 @@ glapi_sources =					\
 	glapitemp.h				\
 	glapi.c					\
 	glapi.h					\
+	glapioffsets.h				\
 	glthread.c				\
-	glthread.h
+	glthread.h				\
+	glprocs.h
 
 libglxdri_la_SOURCES = \
         glxdri.c \
         glxdri2.c \
+	glxdricommon.h \
         extension_string.c \
         extension_string.h
 
diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am
index a885289..5ffba12 100644
--- a/hw/xwin/Makefile.am
+++ b/hw/xwin/Makefile.am
@@ -167,14 +167,7 @@ AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \
 
 dist_man1_MANS = XWin.man XWinrc.man
 
-GLX_EXTRAS = \
-	windows/ChangeLog \
-	windows/glwindows.h \
-	windows/glwrap.c \
-	windows/indirect.c
-
 EXTRA_DIST = \
-	$(GLX_EXTRAS) \
 	_usr_X11R6_lib_X11_system.XWinrc \
 	X-boxed.ico \
 	X.ico \