xserver: Branch 'master'

[Alan Coopersmith]

 hw/xfree86/common/Makefile.am |    1 -
 hw/xfree86/common/xf86Date.h  |   36 ------------------------------------
 hw/xfree86/common/xf86Init.c  |    3 +--
 3 files changed, 1 insertion(+), 39 deletions(-)

New commits:
commit 89bbd07e9ddd688df81405151f9c6284fa3367a8
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Tue Dec 23 21:40:21 2008 -0800

    Remove obsolete XF86_DATE & xf86Date.h

diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index b562e66..d49ef6f 100644
--- a/hw/xfree86/common/Makefile.am
+++ b/hw/xfree86/common/Makefile.am
@@ -78,7 +78,6 @@ EXTRA_DIST = \
 	xf86xvpriv.h \
 	xisb.h \
 	xorgVersion.h \
-	xf86Date.h \
 	$(MODEDEFSOURCES) \
 	modeline2c.awk \
         $(DISTKBDSOURCES)
diff --git a/hw/xfree86/common/xf86Date.h b/hw/xfree86/common/xf86Date.h
deleted file mode 100644
index 978c4fa..0000000
--- a/hw/xfree86/common/xf86Date.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2003 by The XFree86 Project, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the copyright holder(s)
- * and author(s) shall not be used in advertising or otherwise to promote
- * the sale, use or other dealings in this Software without prior written
- * authorization from the copyright holder(s) and author(s).
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#ifndef XF86_DATE
-
-#define XF86_DATE	"18 December 2003"
-
-#endif
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 993262e..918acb9 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -67,7 +67,6 @@
 #include "xf86Config.h"
 #include "xf86_OSlib.h"
 #include "xorgVersion.h"
-#include "xf86Date.h"
 #include "xf86Build.h"
 #include "mipointer.h"
 #include <X11/extensions/XI.h>
@@ -174,7 +173,7 @@ xf86PrintBanner(void)
   ErrorF(" (%s)", XORG_CUSTOM_VERSION);
 #endif
 #ifndef XORG_DATE
-#define XORG_DATE XF86_DATE
+# define XORG_DATE "Unknown"
 #endif
   ErrorF("\nRelease Date: %s\n", XORG_DATE);
   ErrorF("X Protocol Version %d, Revision %d\n",