xserver: Branch 'master' - 6 commits

[Daniel Stone]

 Xext/Makefile.am                                            |    2 +-
 configure.ac                                                |    2 +-
 hw/darwin/Makefile.am                                       |    5 -----
 hw/xfree86/exa/Makefile.am                                  |    2 +-
 hw/xfree86/loader/Makefile.am                               |    1 +
 hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am |    1 -
 6 files changed, 4 insertions(+), 9 deletions(-)

New commits:
diff-tree 24051ef97406f28c102cf46a78223400b61fdae2 (from ecb7d43a76d507d04891ab7f189b23be5eccda51)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Sun Jul 30 12:15:33 2006 +0300

    remove filename that's too long for tar

diff --git a/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am b/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
index 7cdfd8e..e7ddb6c 100644
--- a/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
@@ -17,7 +17,6 @@ dist_xpc_DATA =				\
 	LubalinGraph-Book.pmf		\
 	LubalinGraph-DemiOblique.pmf	\
 	LubalinGraph-Demi.pmf		\
-	NewCenturySchlbk-BoldItalic.pmf	\
 	NewCenturySchlbk-Bold.pmf	\
 	NewCenturySchlbk-Italic.pmf	\
 	NewCenturySchlbk-Roman.pmf	\
diff-tree ecb7d43a76d507d04891ab7f189b23be5eccda51 (from bf2d7499c84c94f228d03b21448f5688b3cda1a8)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Sun Jul 30 11:52:41 2006 +0300

    add sym.h to sources

diff --git a/hw/xfree86/loader/Makefile.am b/hw/xfree86/loader/Makefile.am
index 357af77..0306723 100644
--- a/hw/xfree86/loader/Makefile.am
+++ b/hw/xfree86/loader/Makefile.am
@@ -30,4 +30,5 @@ libloader_a_SOURCES = \
 	fontsym.c \
 	misym.c \
 	xf86sym.c \
+	sym.h \
 	$(SPARC_SOURCES)
diff-tree bf2d7499c84c94f228d03b21448f5688b3cda1a8 (from e87e68634d8eb66ab783e2802e2d5d12ff1031be)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Sun Jul 30 11:17:02 2006 +0300

    add securitysrv.h

diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index fde0550..ad3f98e 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -66,7 +66,7 @@ BUILTIN_SRCS += $(XINERAMA_SRCS)
 endif
 
 # Security extension: multi-level security to protect clients from each other
-XCSECURITY_SRCS = security.c
+XCSECURITY_SRCS = security.c securitysrv.h
 if XCSECURITY   
 BUILTIN_SRCS += $(XCSECURITY_SRCS)
 
diff-tree e87e68634d8eb66ab783e2802e2d5d12ff1031be (from ed0c807de9f07468385fcbd2e8a9c0737759a461)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Sun Jul 30 11:11:59 2006 +0300

    remove .cvsignores from EXTRA_DIST

diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am
index 8a5e981..542bfdb 100644
--- a/hw/darwin/Makefile.am
+++ b/hw/darwin/Makefile.am
@@ -54,7 +54,6 @@ EXTRA_DIST = \
 	darwinKeyboard.c \
 	darwinKeyboard.h \
 	darwinXinput.c \
-	iokit/.cvsignore \
 	iokit/xfIOKit.c \
 	iokit/xfIOKitCursor.c \
 	iokit/xfIOKit.h \
@@ -66,11 +65,8 @@ EXTRA_DIST = \
 	quartz/cr/crFrame.m \
 	quartz/cr/cr.h \
 	quartz/cr/crScreen.m \
-	quartz/cr/.cvsignore \
 	quartz/cr/XView.h \
 	quartz/cr/XView.m \
-	quartz/.cvsignore \
-	quartz/fullscreen/.cvsignore \
 	quartz/fullscreen/fullscreen.c \
 	quartz/fullscreen/quartzCursor.c \
 	quartz/fullscreen/quartzCursor.h \
@@ -98,7 +94,6 @@ EXTRA_DIST = \
 	quartz/XDarwinStartup.c \
 	quartz/XDarwinStartup.man \
 	quartz/xpr/appledri.c \
-	quartz/xpr/.cvsignore \
 	quartz/xpr/dri.c \
 	quartz/xpr/dri.h \
 	quartz/xpr/dristruct.h \
diff-tree ed0c807de9f07468385fcbd2e8a9c0737759a461 (from a68dc013a33d867e65a7e76b3eec5947b862a5b4)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Sun Jul 30 11:08:54 2006 +0300

    bump to 1.1.99.3

diff --git a/configure.ac b/configure.ac
index c14187e..46b1280 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ dnl Process this file with autoconf to c
 AC_PREREQ(2.57)
 dnl This is the not the Xorg version number, it's the server version number.
 dnl Yes, that's weird.
-AC_INIT([xorg-server], 1.1.99.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.1.99.3, [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
diff-tree a68dc013a33d867e65a7e76b3eec5947b862a5b4 (from 654619d76c779606f2315782fc01d1410399fa3b)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Sun Jul 30 11:08:47 2006 +0300

    remove README (which doesn't exist) from EXTRA_DIST

diff --git a/hw/xfree86/exa/Makefile.am b/hw/xfree86/exa/Makefile.am
index 1a2831c..31682c4 100644
--- a/hw/xfree86/exa/Makefile.am
+++ b/hw/xfree86/exa/Makefile.am
@@ -25,4 +25,4 @@ exa.$(DRIVER_MAN_SUFFIX): exa.man
 	-rm -f exa.$(DRIVER_MAN_SUFFIX)
 	$(LN_S) exa.man exa.$(DRIVER_MAN_SUFFIX)
 
-EXTRA_DIST = exa.man.pre README
+EXTRA_DIST = exa.man.pre