[xorg-commit-diffs] xc Imakefile, 1.1.4.2.6.1, 1.1.4.2.6.1.6.1 LABEL, 1.1.4.1, 1.1.4.1.16.1 Makefile, 1.1.4.3.6.2, 1.1.4.3.6.2.2.1 RELNOTES, 1.1.4.2.2.1, 1.1.4.2.2.1.6.1 registry, 1.1.4.2.6.3, 1.1.4.2.6.3.2.1

Roland Mainz xorg-commit at pdx.freedesktop.org
Sat Apr 10 02:03:34 PDT 2004


Committed by: gisburn

Update of /cvs/xorg/xc
In directory pdx:/tmp/cvs-serv7662/xc

Modified Files:
      Tag: XPRINT
	Imakefile LABEL Makefile RELNOTES registry 
Log Message:
Resync to 2004-04-10 XORG-RELEASE-1 branch

Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/Imakefile,v
retrieving revision 1.1.4.2.6.1
retrieving revision 1.1.4.2.6.1.6.1
diff -u -d -r1.1.4.2.6.1 -r1.1.4.2.6.1.6.1
--- a/Imakefile	4 Mar 2004 17:45:24 -0000	1.1.4.2.6.1
+++ b/Imakefile	10 Apr 2004 09:03:31 -0000	1.1.4.2.6.1.6.1
@@ -66,15 +66,11 @@
 
 #ifndef OS2Architecture
 version.def::
-	$(RM) $(IRULESRC)/version.def
 	$(RM) $(IRULESRC)/date.def
-	$(LN) ../../$(XF86SRC)/xf86Version.h $(IRULESRC)/version.def
 	$(LN) ../../$(XF86SRC)/xf86Date.h $(IRULESRC)/date.def
 #else /*OS2Architecture*/
 version.def::
-	$(RM) $(IRULESRC)/version.def
 	$(RM) $(IRULESRC)/date.def
-	$(CP) $(XF86SRC)/xf86Version.h $(IRULESRC)/version.def
 	$(CP) $(XF86SRC)/xf86Date.h $(IRULESRC)/date.def
 #endif
 

Index: LABEL
===================================================================
RCS file: /cvs/xorg/xc/LABEL,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.1.16.1
diff -u -d -r1.1.4.1 -r1.1.4.1.16.1
--- a/LABEL	26 Nov 2003 22:48:15 -0000	1.1.4.1
+++ b/LABEL	10 Apr 2004 09:03:31 -0000	1.1.4.1.16.1
@@ -1,132 +1,250 @@
 		     X Window System, Version 11
-			     Release 6.6
+			     Release 6.7
 
 			Portions Copyright by:
 
-			    The Open Group
-
-				 and
-				   
-			      Mark Adler
-		      Adobe Systems Incorporated
-			   AGE Logic, Inc.
-			 Gerrit Jan Akkerman
-			    Corin Anderson
-			      Doug Anson
+			      2d3d Inc.
+			     Adam de Boor
+			  Adobe Systems Inc.
+			  After X-TT Project
+			    AGE Logic Inc.
+			    Alan Hourihane
+			   Andreas Monitzer
+			  Andrew C Aitchison
+			     Andy Ritger
+			      Ani Joshi
+			    Anton Zioviev
 			 Apollo Computer Inc.
+			 Apple Computer Inc.
 			 Ares Software Corp.
-				 ATI
-			      AT&T, Inc.
-			   Robert V. Baron
-			    David Bateman
+			ATI Technologies Inc.
+			      AT&T Inc.
 			   Bigelow & Holmes
-			   Bitstream, Inc.
-			      Jon Block
-			     Adam de Boor
-			    Manfred Brands
-			   Richard Burdick
+			    Bill Reynolds
+			    Bitstream Inc.
+		      Brian Fundakowski Feldman
+			     Brian Goines
+			      Brian Paul
+			     Bruno Haible
+			    Charles Murcko
+			    Chen Xiangyang
+			   Chris Constello
 			   Cognition Corp.
-			   Simon P. Cooper
-			    Régis Cridlig
-			    Robin Cutshaw
+		     Compaq Computer Corporation
+		   Concurrent Computer Corporation
+			    Conectiva S.A.
+			    Corin Anderson
+			    Craig Struble
+		     Daewoo Electronics Co. Ltd.
+			   Dale Schumacher
+			    Damien Miller
 			   Daniver Limited
-		     Daewoo Electronics Co.,Ltd.
+			    Daryll Strauss
 		       Data General Corporation
+			    David Bateman
 			     David Dawes
-			    Jorge Delgado
+			  David E. Wexelblat
+			    David Holland
+			    David J. McKay
+			   David McCullough
+			 David Mosberger-Tang
+			   David S. Miller
+			   David Wexelblat
+			     Davor Matic
 		    Digital Equipment Corporation
-	       Evans & Sutherland Computer Corporation
-			   Rickard E. Faith
+			     Dirk Hohndel
+			      Doug Anson
+			  Edouard TISSERANT
+			   Eduardo Horvath
+			     Egbert Eich
+			     Eric Anholt
+			     Eric Fortune
+			    Eric Sunshine
 			     Erik Fortune
-		    Free Software Foundation, Inc.
-			   Joseph Friedman
-			 Fuji Xerox Co., Ltd.
+			     Erik Nygren
+	       Evans & Sutherland Computer Corporation
+			   Finn Thoegersen
+			   Frederic Lepied
+		    Free Software Foundation Inc.
 			   Fujitsu Limited
-		 Fujitsu Open Systems Solutions, Inc.
-			   Jean-loup Gailly
-			      Tiago Gons
-			    Pascal Haible
+		 Fujitsu Open Systems Solutions Inc.
+			 Fuji Xerox Co. Ltd.
+			  Geert Uytterhoeven
+			 Gerrit Jan Akkerman
+			      Gerry Toll
+			     Glenn G. Lai
+			     Go Watanabe
+			    Gregory Mokhin
+			     Greg Parker
+			     GROUPE BULL
+			       Hans Oey
+			    Harald Koenig
 			   Harm Hanemaayer
-			     Randy Hendry
-			    Matthieu Herrb
+			  Harry Langenbacher
+			    Henry A. Worth
 		       Hewlett-Packard Company
-			    Hitachi, Ltd.
-                            Dirk Hohndel
-			    David Holland
-			    Philip Homburg
-			    Alan Hourihane
+			     Hitachi Ltd
+			     Holger Veit
+		    Hummingbird Communications Ltd
 			   IBM Corporation
-	      The Institute of Software, Academia Sinica
+			  Intel Corporation
 		   INTERACTIVE Systems Corporation
-			  Kaleb S. Keithley
+		International Business Machines Corp.
+			     Itai Nahshon
+			    Jakub Jelinek
+			    James Tsillas
+			     Jason Bacon
+			   Jean-loup Gailly
 			      Jeff Kirk
-                            Harald Koenig
+			     Jeffrey Hsu
+			     Jim Tsillas
+			   J. Kean Johnston
+			      Jon Block
+			      Jon Tombs
+			    Jorge Delgado
+			   Joseph Friedman
+			    Joseph V. Moss
+			  Juliusz Chroboczek
+			    Jyunji Takagi
+			  Kaleb S. Keithley
+			Kazushi (Jam) Marukawa
+		       Kazuyuki (ikko-) Okamoto
+			    Keith Packard
+			    Keith Whitwell
+			   Kevin E. Martin
+			      Larry Wall
+		     Lawrence Berkeley Laboratory
+			  Lennart Augustsson
+		      Lexmark International Inc.
+			    Linus Torvalds
+		     Machine Vision Holdings Inc.
+			    Manfred Brands
 			Marc Aurele La France
-			     Glenn G. Lai
-			     Scott Laird
-			    Thomas G. Lane
-			     Steven Lang
-			  Harry Langenbacher
-			   Patrick Lecoanet
-			     Sam Leffler
-			   Frederic Lepied
-		     Lexmark International, Inc.
-			  Sebastien Marineau
+			      Mark Adler
+			   Mark J. Kilgard
+			     Mark Leisher
+			    Mark Smulders
+		Massachusetts Institute Of Technology
+			   Matrox Graphics
+			   Matthew Grossman
+			    Matthieu Herrb
+			   Metro Link Inc.
+			  Michael H. Schimek
 			  Michael P. Marking
-			   Kevin E. Martin
-			     Davor Matic
-			   David McCullough
-			    David J. McKay
-		     MIPS Computer Systems, Inc.
-			    Joseph V. Moss
-			    Thomas Mueller
-			     Rich Murphey
-			NCR Corporation, Inc.
-		       Netscape Communications
-		   Network Computing Devices, Inc.
-			     Novell, Inc.
+			   Michael Schimek
+			    Michael Smith
+			       Ming Yu
+		      MIPS Computer Systems Inc.
+			National Semiconductor
+			 NCR Corporation Inc.
+		 Netscape Communications Corporation
+		    Network Computing Devices Inc.
+			     Noah Levitt
+			     Novell Inc.
+			     Nozomi YTOW
 		       NTT Software Corporation
 		      Number Nine Computer Corp.
+		   Number Nine Visual Technologies
 			     NVIDIA Corp.
-			     Erik Nygren
-			       Hans Oey
-		       Kazuyuki (ikko-) Okamoto
-		  Oki Technosystems Laboratory, Inc.
+			     Oivier Danet
+		  Oki Technosystems Laboratory Inc.
 			  OMRON Corporation
 		       Open Software Foundation
+			   Orest Zborowski
+			   Pablo Saratxaga
 			     Panacea Inc.
+			Panagiotis Tsirigotis
+			    Paolo Severini
+			    Pascal Haible
+			   Patrick Lecoanet
+			    Patrick Lerda
+			     Paul Elliott
+			    Peter Kunzmann
+			    Peter Trattler
+			    Philip Homburg
+			Precision Insight Inc.
 			    Prentice Hall
 		      Quarterdeck Office Systems
+			     Randy Hendry
+			    Ranier Keller
+			     Red Hat Inc.
 	       Regents of the University of California
-			    Bill Reynolds
-			     Thomas Roell
-		    The Santa Cruz Operation, Inc.
-			   Dale Schumacher
-			    Paolo Severini
-			  ShoGraphics, Inc.
-	       Silicon Graphics Computer Systems, Inc.
+			    Rene Cougnenc
+			    Régis Cridlig
+			  Richard A. Hecker
+			   Richard Burdick
+			     Rich Murphey
+			   Rickard E. Faith
+			     Robert Baron
+			    Robert Chesler
+			   Robert V. Baron
+			    Robin Cutshaw
+			   S3 Graphics Inc.
+			     Sam Leffler
+			   SciTech Software
+			     Scott Laird
+			  Sebastien Marineau
+			   Shigehiro Nomura
+			   ShoGraphics Inc.
+			   Shunsuke Akiyama
+		Silicon Graphics Computer Systems Inc.
+		 Silicon Integrated Systems Corp Inc.
+			 Silicon Motion Inc.
+			   Simon P. Cooper
+		 Snitily Graphics Consulting Services
 			   Sony Corporation
 				 SRI
-			    Craig Struble
-			Sun Microsystems, Inc.
-			    SunSoft, Inc.
-			   Tektronix, Inc.
-			   Finn Thoegersen
-                             Gerry Toll
-			      Jon Tombs
-			    Linus Torvalds
+			   Stanislav Brabec
+			    Stephan Dirsch
+			     Stephan Lang
+			     Steven Lang
+			Sun Microsystems Inc.
+			     SunSoft Inc.
+			      SuSE Inc.
+			     Sven Luther
+		      Takis Psarogiannakopoulos
+			   Takuya SHIOZAKI
+			    Tektronix Inc.
+		     The DOS-EMU-Development-Team
+	      The Institute of Software Academia Sinica
+			The NetBSD Foundation
+			    Theo de Raadt
+			    Theodore Ts'o
+			    The Open Group
+		     The Open Software Foundation
+	     The Regents of the University of California
+		    The Santa Cruz Operation Inc.
+		       The Weather Channel Inc.
+			   The X Consortium
+		       The XFree86 Project Inc.
+			   Thomas E. Dickey
+			    Thomas G. Lane
+			    Thomas Mueller
+			     Thomas Roell
+			    Thomas Thanner
+			 Thomas Winischhofer
+			    Thomas Wolfram
+			     Thorsten.Ohl
+			      Tiago Gons
+			    Todd C. Miller
+			   Tomohiro KUBOTA
+			   Torrey T. Lyons
 			    TOSHIBA Corp.
-			    Peter Trattler
-			    James Tsillas
+			Tungsten Graphics Inc.
+			   UCHIYAMA Yasushi
+			     Unicode Inc.
 			UniSoft Group Limited
-		    UNIX System Laboratories, Inc.
-			     Holger Veit
+			  University of Utah
+		    UNIX System Laboratories Inc.
+			      URW++ GmbH
+			   VA Linux Systems
+			VIA Technologies Inc.
+		      Video Electronics Standard
+			     VMware Inc.
 			  Vrije Universiteit
-			      Larry Wall
-			  David E. Wexelblat
-			    Thomas Wolfram
-			    Henry A. Worth
-			Wyse Technology, Inc.
-		      The XFree86 Project, Inc.
-                               Ming Yu
-			   Orest Zborowski
+			   Wittawat Yamwong
+			 Wyse Technology Inc.
+			     X Consortium
+			   Xi Graphics Inc.
+			  X-Oz Technologies
+		      X-TrueType Server Project

Index: Makefile
===================================================================
RCS file: /cvs/xorg/xc/Makefile,v
retrieving revision 1.1.4.3.6.2
retrieving revision 1.1.4.3.6.2.2.1
diff -u -d -r1.1.4.3.6.2 -r1.1.4.3.6.2.2.1
--- a/Makefile	17 Mar 2004 22:25:18 -0000	1.1.4.3.6.2
+++ b/Makefile	10 Apr 2004 09:03:31 -0000	1.1.4.3.6.2.2.1
@@ -7,7 +7,7 @@
 # Luna users will need to either run make as "make MAKE=make"
 # or add "MAKE = make" to this file.
 
-RELEASE = "Release 6.6"
+RELEASE = "Release 6.7"
 SHELL = /bin/sh
 RM = rm -f
 MV = mv

Index: RELNOTES
===================================================================
RCS file: /cvs/xorg/xc/RELNOTES,v
retrieving revision 1.1.4.2.2.1
retrieving revision 1.1.4.2.2.1.6.1
diff -u -d -r1.1.4.2.2.1 -r1.1.4.2.2.1.6.1
--- a/RELNOTES	4 Mar 2004 17:45:24 -0000	1.1.4.2.2.1
+++ b/RELNOTES	10 Apr 2004 09:03:31 -0000	1.1.4.2.2.1.6.1
@@ -1,81 +1,343 @@
-                     Release Notes for XFree86[tm] 4.4.0
+                         Release Notes for X11R6.7.0
 
-                          The XFree86 Project, Inc
+                            The X.Org Foundation
+                          The XFree86 Project, Inc.
 
-                              29 February 2004
+                                31 March 2004
 
                                   Abstract
[...1127 lines suppressed...]
-This product includes software developed by the NetBSD Foundation, Inc. and
-its contributors
+            This product includes software developed by the University of
+            California, Berkeley and its contributors.
 
-This product includes software developed by X-Oz Technologies (http://www.x-
-oz.com/).
+            This product includes software developed by Christopher G.
+            Demetriou.
 
-     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.116 dawes Exp $
+            This product includes software developed by the NetBSD Founda-
+            tion, Inc. and its contributors.
+
+            This product includes software developed by the X-Oz Technologies
+            and its contributors.
 
+     $ Id: RELNOTES.sgml,v 1.1.4.4.2.2.4.3 2004/03/30 03:55:47 jg Exp $
 
-$XFree86: $

Index: registry
===================================================================
RCS file: /cvs/xorg/xc/registry,v
retrieving revision 1.1.4.2.6.3
retrieving revision 1.1.4.2.6.3.2.1
diff -u -d -r1.1.4.2.6.3 -r1.1.4.2.6.3.2.1
--- a/registry	17 Mar 2004 17:39:35 -0000	1.1.4.2.6.3
+++ b/registry	10 Apr 2004 09:03:31 -0000	1.1.4.2.6.3.2.1
@@ -1694,8 +1694,8 @@
 	Markus G. Kuhn
 	University of Cambridge
 	Computer Laboratory
-	New Museums Site, Pembroke Street
-	Cambridge CB2 3QG
+	15 JJ Thomson Avenue
+	Cambridge CB3 0FD
 	United Kingdom
 
 [134]   In R6.6 X.Org is reserving the string UTF8_STRING for use as an ICCCM




More information about the xorg-commit-diffs mailing list