[xorg-commit-diffs] xc CHANGELOG-RELEASE-1-TM, NONE, 1.1.6.1 CHANGELOG-RELEASE-1, 1.1.2.50, 1.1.2.51 Imakefile, 1.1.4.2.6.1, 1.1.4.2.6.2 LABEL, 1.1.4.1, 1.1.4.1.6.1 Makefile, 1.1.4.3.6.2, 1.1.4.3.6.3 RELNOTES, 1.1.4.2.2.1, 1.1.4.2.2.2 bug-report, 1.1.4.1, 1.1.4.1.6.1

Egbert Eich xorg-commit at pdx.freedesktop.org
Fri Apr 2 13:47:43 PST 2004


Committed by: eich

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

Modified Files:
      Tag: XORG-RELEASE-1
	CHANGELOG-RELEASE-1 Imakefile LABEL Makefile RELNOTES 
	bug-report 
Added Files:
      Tag: XORG-RELEASE-1
	CHANGELOG-RELEASE-1-TM 
Log Message:
 70. Merging in the TM branch (Egbert Eich).



--- NEW FILE: CHANGELOG-RELEASE-1-TM ---
==================== This branch is closed now ==============================
48. Fixed glitches that occured during build of bindist tarballs (Egbert Eich).
47. Update formatted docs (I hope I got everything) (Keith Packard)
46. Update xterm termcap/terminfo files, changing -xfree86 to -xorg 
    and making aliases for the old names (Keith Packard).
45. Changed vendor string on xfs (Egbert Eich).
44. Removed some more TM related things from getconfig (Egbert Eich).
43. Updates to SGML and SGML-generated documentation
    (Jim Gettys, with minor hacks by Keith Packard)
42. TM fixes for hw/xwin -- Harold will merge to CYGWIN. (Keith Packard)
41. TM fixes for remaining man pages. Also fixes broken
    CVS ident lines in many video driver man pages. (Keith Packard)
40. TM fixes for input driver man pages (Keith Packard)
39. TM fixes for xf86cfg (which has become xorgcfg) (Keith Packard)
38. TM fixes for .man files in lib directory (Keith Packard)
37. Change XDarwin man page to refer to X.Org Foundation and point to Xorg
    man page (Torrey T. Lyons).
36. Add xorg.conf.man, Xorg.man, remove XF86Config.man and XFree86.man
    (yes, this trashes revision history, but I think it's better
    than breaking CVS).  (Keith Packard)
35. TM fixes for VESA general timing formula mode line program 
    (hw/xfree86/etc/gtf).  (Keith Packard)
34. Add Leon's xorg.xpm and xorg-bw.xpm files to xdm/config. (Kaleb KEITHLEY
    for Leon Shiman)
33. Add some temporary xorg.xpm and xorg-bw.xpm files to xdm/config
    (Keith Packard)
32. Fix TM issues in all video driver manual pages.
    (Keith Packard)
31. Add new MANDEFS to cover XServerName, et al.  Move 
    XCONFIGFILE XCONFIGDIR et al from xorg.tmpl to X11.tmpl
    so they can be used in building non-server manual pages
    (Keith Packard)
30. Allow XF86Config as a fallback config file (Egbert Eich).
29. Fixed more TM issues especially xterm, getconfig and some default files
    (Egbert Eich).
28. Fix TM issues in doc/man/general (Keith Packard)
27. xkbcomp/rules/Imakefile was using InstallCreateLink backwards
    when attempting to install a symlink from xorg to xfree86 for
    compatibility (Keith Packard)
26. Fix Xlib manual pages to refer to XFree86 as a separate entity
    (Keith Packard)
25. TM issues in config/util (rman, makedef, mkhtmlindex) (Keith Packard)
24. Updated XDarwin's Japanese localization for X.Org release
    (Toshimitsu Tanaka).
23. Fixed TM issues in XDarwin UI (Torrey T. Lyons).
22. Fixed typo that prevented the changelog date to be set correctly in
    xf86Build.h (Egbert Eich).
21. Fixing some occurances of hard coded version numbers in applications
    like twm, xrx, proxymgr, xmh (Bugzilla #369, Egbert Eich).
21. Fixing X.Org version numbers (Egbert Eich).
20. Moving Xft update to RELEASE-1 (Egbert Eich).
19. Made config file and server name in xf86cfg build time configurable
    (Egbert Eich).
18. Fixed TM issues in xf86config, app-defaults/Xvidtune, create link
    rules/xfree86 > rules/xorg (Egbert Eich).
17. fix XDarwin to build on Mac OS X 10.2 and earlier. Bug #357 (Kaleb
    KEITHLEY)
16. fix lib/freetype2/Imakefile for Mac OS X. Bug #352 (Kaleb KEITHLEY)
15. Restore "credit" edits in the hw/darwin ddx that were deleted in
    -CURRENT.  RTF may or may not be "human readable," but it's no less 
    human readable, IMNOHO, than, e.g., SGML. It just takes a little bit 
    of effort. (Kaleb KEITHLEY)
14. merge working left and right meta, alt, ctrl, and shift keys from
    -CURRENT
13. fixed gtf + man pages (Xserver name and config file name configurable 
    in Imake config files) (Egbert Eich).
12. Fixed xinit/startx man pages (server name and config file configurable)
    (Egbert Eich).
11. Fixed fontstosfnt (project and support address configurable) (Egbert Eich).
10. Fixed pswrap (relaced XFree86 with X11) (Egbert Eich).
9. fixed rman (added Xorg as system name) (Egbert Eich).
8. Fixed mkhtml (Egbert Eich).
7. Fixed default keyboard rules file in servers and setxkb (configurable) 
   (Egbert Eich).
6. Fixed XawVendor (configurable) (Egbert Eich).
5. Fix xdpyinfo to deal with Xorg version strings (Egbert Eich).
4. Changed config file to xorg.cfg (Egbert Eich).
3. Fixed ABI versions, support address pointers, message in configuration
   file generated with -configure (Egbert Eich).
2. Some initial TM changes: 
   name of the binary: Xorg
   name of the lob file: Xorg.?.log
   name of the config file XorgConfig
   created: xorg.cf, xorg.tmpl
   Internal changes XFree86Version, XFree86VersionString, XF86Server
   to XorgVersion, XorgVersionString, XorgServer.
   Attempted not to delete XFree86 stuff but add Xorg stuff and make
   it the default (Egbert Eich).
1. Add changes from the CURRENT branch (Egbert Eich).

$XdotOrg: xc/CHANGELOG-RELEASE-1-TM,v 1.1.2.36 2004/03/29 19:50:09 keithp Exp $

Index: CHANGELOG-RELEASE-1
===================================================================
RCS file: /cvs/xorg/xc/Attic/CHANGELOG-RELEASE-1,v
retrieving revision 1.1.2.50
retrieving revision 1.1.2.51
diff -u -d -r1.1.2.50 -r1.1.2.51
--- a/CHANGELOG-RELEASE-1	2 Apr 2004 17:25:21 -0000	1.1.2.50
+++ b/CHANGELOG-RELEASE-1	2 Apr 2004 21:47:09 -0000	1.1.2.51
@@ -1,3 +1,4 @@
+ 70. Merging in the TM branch (Egbert Eich).
  69. Mark PLT table executable on OSes that don't allow to execute data
      areas by default (Bugzilla 395, John Dennis).
  68. Fix the GLLibraryVersion string allocation to accomodate for the

Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/Imakefile,v
retrieving revision 1.1.4.2.6.1
retrieving revision 1.1.4.2.6.2
diff -u -d -r1.1.4.2.6.1 -r1.1.4.2.6.2
--- a/Imakefile	4 Mar 2004 17:45:24 -0000	1.1.4.2.6.1
+++ b/Imakefile	2 Apr 2004 21:47:09 -0000	1.1.4.2.6.2
@@ -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.6.1
diff -u -d -r1.1.4.1 -r1.1.4.1.6.1
--- a/LABEL	26 Nov 2003 22:48:15 -0000	1.1.4.1
+++ b/LABEL	2 Apr 2004 21:47:09 -0000	1.1.4.1.6.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.3
diff -u -d -r1.1.4.3.6.2 -r1.1.4.3.6.3
--- a/Makefile	17 Mar 2004 22:25:18 -0000	1.1.4.3.6.2
+++ b/Makefile	2 Apr 2004 21:47:09 -0000	1.1.4.3.6.3
@@ -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.2
diff -u -d -r1.1.4.2.2.1 -r1.1.4.2.2.2
--- a/RELNOTES	4 Mar 2004 17:45:24 -0000	1.1.4.2.2.1
+++ b/RELNOTES	2 Apr 2004 21:47:09 -0000	1.1.4.2.2.2
@@ -1,81 +1,330 @@
-                     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
[...1148 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: bug-report
===================================================================
RCS file: /cvs/xorg/xc/bug-report,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.1.6.1
diff -u -d -r1.1.4.1 -r1.1.4.1.6.1
--- a/bug-report	17 Nov 2003 19:03:18 -0000	1.1.4.1
+++ b/bug-report	2 Apr 2004 21:47:09 -0000	1.1.4.1.6.1
@@ -13,7 +13,7 @@
 
      VERSION:
 
-R6.6
+R6.7
 
      CLIENT MACHINE and OPERATING SYSTEM:
 




More information about the xorg-commit-diffs mailing list