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

[Keith Packard]

 configure.ac                                                |   24 +++++++-----
 hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am |    1 
 2 files changed, 15 insertions(+), 10 deletions(-)

New commits:
diff-tree 73904d953f2f9cbe941a215ba240b46bc7a61357 (from cb86fced0e379badd96af5ad303710af30fafd2e)
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Sun Mar 4 21:07:35 2007 -0800

    Xprint includes a filename which is 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 1e8c8a7..e7ddb6c 100644
--- a/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
@@ -18,7 +18,6 @@ dist_xpc_DATA =				\
 	LubalinGraph-DemiOblique.pmf	\
 	LubalinGraph-Demi.pmf		\
 	NewCenturySchlbk-Bold.pmf	\
-	NewCenturySchlbk-BoldItalic.pmf \
 	NewCenturySchlbk-Italic.pmf	\
 	NewCenturySchlbk-Roman.pmf	\
 	Souvenir-DemiItalic.pmf		\
diff-tree cb86fced0e379badd96af5ad303710af30fafd2e (from e707604ab3fd45c1f9d07b666181fc181e68a827)
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Sun Mar 4 19:48:40 2007 -0800

    Set version to 1.3-rc1 (1.2.99.901).

diff --git a/configure.ac b/configure.ac
index a54e06d..c290926 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,11 +25,25 @@ 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.2.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.2.99.901, [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
 
+dnl
+dnl Make sure these line up with the version number above. Automatically
+dnl extracting them would be cool.
+dnl
+
+DEFAULT_VENDOR_NAME="The X.Org Foundation"
+DEFAULT_VENDOR_NAME_SHORT="X.Org"
+DEFAULT_VERSION_MAJOR=1
+DEFAULT_VERSION_MINOR=2
+DEFAULT_VERSION_PATCH=99
+DEFAULT_VERSION_SNAP=901
+DEFAULT_RELEASE_DATE="4 March 2007"
+DEFAULT_VENDOR_WEB="http://wiki.x.org"
+
 dnl this gets generated by autoheader, and thus contains all the defines.  we
 dnl don't ever actually use it, internally.
 AC_CONFIG_HEADERS(include/do-not-use-config.h)
@@ -292,14 +306,6 @@ OSNAME=`uname -srm`
 AC_DEFINE_UNQUOTED(OSNAME, "$OSNAME", 
 	[Define to OS Name string to display for build OS in Xorg log])
 
-DEFAULT_VENDOR_NAME="The X.Org Foundation"
-DEFAULT_VENDOR_NAME_SHORT="X.Org"
-DEFAULT_VERSION_MAJOR=7
-DEFAULT_VERSION_MINOR=2
-DEFAULT_VERSION_PATCH=0
-DEFAULT_VERSION_SNAP=0
-DEFAULT_RELEASE_DATE="22 January 2007"
-DEFAULT_VENDOR_WEB="http://wiki.x.org"
 
 m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])