xserver: Branch 'server-1_1-branch' - 2 commits

[Eric Anholt]

 configure.ac          |    8 ++++----
 hw/darwin/Makefile.am |    5 -----
 2 files changed, 4 insertions(+), 9 deletions(-)

New commits:
diff-tree 69e99f58818201c32f000f3d65f8df071dc47e98 (from 4d49d6a677665ec2ddd8503a36803ee0a11a05a3)
Author: Eric Anholt <anholt at FreeBSD.org>
Date:   Fri Jul 7 17:54:08 2006 -0700

    Bump package version to 1.1.1 for release, and vendor release to 7.1.1.0.
    
    It was decided to retain the vendorrelease being related to the katamari version
    for now, to be resolved in a later major release.

diff --git a/configure.ac b/configure.ac
index 1f1bc45..328de9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ AC_PREREQ(2.57)
 dnl This is the not the Xorg version number, it's the server version number.
 dnl Yes, that's weird.  Also, when you change this, be sure to change the
 dnl DEFAULT_VERSION_* variables below.
-AC_INIT([xorg-server], 1.0.99.903, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.1.1, [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
@@ -288,9 +288,9 @@ AC_DEFINE_UNQUOTED(OSNAME, "$OSNAME", 
 DEFAULT_VENDOR_NAME="The X.Org Foundation"
 DEFAULT_VENDOR_NAME_SHORT="X.Org"
 DEFAULT_VERSION_MAJOR=7
-DEFAULT_VERSION_MINOR=0
-DEFAULT_VERSION_PATCH=99
-DEFAULT_VERSION_SNAP=903
+DEFAULT_VERSION_MINOR=1
+DEFAULT_VERSION_PATCH=1
+DEFAULT_VERSION_SNAP=0
 DEFAULT_RELEASE_DATE="12 May 2006"
 DEFAULT_VENDOR_WEB="http://wiki.x.org"
 
diff-tree 4d49d6a677665ec2ddd8503a36803ee0a11a05a3 (from 90f96f5bcb444380f2fccda21dbf0a623e84ee3f)
Author: Eric Anholt <anholt at FreeBSD.org>
Date:   Fri Jul 7 17:51:09 2006 -0700

    Don't try to dist the .cvsignore files.

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 \