Attachment 1879 Details for Bug 2514 – [FIXED_X11R68x] Patch for 2005-02-09-XORG-6_8-branch

[patch] [FIXED_X11R68x] Patch for 2005-02-09-XORG-6_8-branch

patch.gudiff (text/plain), 3.10 KB, created by Roland Mainz on 2005-02-09 10:01:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2005-02-09 10:01:49 UTC

Size: 3.10 KB

patch

obsolete

>Index: xc/ChangeLog
>===================================================================
>RCS file: /cvs/xorg/xc/ChangeLog,v
>retrieving revision 1.365.2.154
>diff -u -2 -0 -r1.365.2.154 ChangeLog
>--- xc/ChangeLog	8 Feb 2005 23:54:04 -0000	1.365.2.154
>+++ xc/ChangeLog	9 Feb 2005 17:59:16 -0000
>@@ -1,20 +1,29 @@
>+2005-02-09 Roland Mainz <roland.mainz@nrubsig.org>
>+	* xc/Makefile
>+	* xc/config/cf/xorgversion.def
>+	Bugzilla #2514 (https://bugs.freedesktop.org/show_bug.cgi?id=2514)
>+	attachment #xxx (https://bugs.freedesktop.org/attachment.cgi?id=xxx):
>+	Bumping version to 6.8.2
>+	[Disclaimer: This is just a version bump, X11R6.8.2 is released when
>+	you see the official annoucement.]
>+
> 2005-02-08  Kevin E. Martin  <kem-at-freedesktop-dot-org>
> 
> 	* README:
> 	* RELNOTES:
> 	* programs/Xserver/hw/xfree86/doc/README:
> 	* programs/Xserver/hw/xfree86/doc/RELNOTES:
> 	* programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml:
> 	Update formatted docs.
> 
> 2005-02-08 Roland Mainz <roland.mainz@nrubsig.org>
> 	* xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml
> 	* xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml
> 	* xc/programs/Xserver/hw/xfree86/doc/sgml/defs.ent
> 	Bugzilla #2485 (https://bugs.freedesktop.org/show_bug.cgi?id=2485):
> 	Second set of release note updates for upcoming X11R6.8.2 release
>         per feedback from the release-wranglers mailinglist.
> 
> 2005-02-07  Kevin E. Martin  <kem-at-freedesktop-dot-org>
> 
> 	* BUILD:
>Index: xc/Makefile
>===================================================================
>RCS file: /cvs/xorg/xc/Makefile,v
>retrieving revision 1.4
>diff -u -2 -0 -r1.4 Makefile
>--- xc/Makefile	3 Sep 2004 16:18:17 -0000	1.4
>+++ xc/Makefile	9 Feb 2005 17:59:16 -0000
>@@ -1,30 +1,30 @@
> # $Xorg: Makefile,v 1.5 2000/08/17 19:41:44 cpqbld Exp $
> 
> 
> 
> # $XFree86: xc/Makefile,v 3.28tsi Exp $
> 
> # Luna users will need to either run make as "make MAKE=make"
> # or add "MAKE = make" to this file.
> 
>-RELEASE = "Release 6.8"
>+RELEASE = "Release 6.8.2"
> SHELL = /bin/sh
> RM = rm -f
> MV = mv
> WORLDOPTS =
> WIN32WORLDOPTS = -i
> TOP = .
> CURRENT_DIR = .
> CONFIGSRC = $(TOP)/config
> IMAKESRC = $(CONFIGSRC)/imake
> DEPENDSRC = $(CONFIGSRC)/makedepend
> DEPENDTOP = ../..
> IMAKETOP = ../..
> IRULESRC = $(CONFIGSRC)/cf
> IMAKE = $(IMAKESRC)/imake
> IMAKE_CMD = $(IMAKE) -I$(IRULESRC) $(IMAKE_DEFINES)
> MAKE_OPTS = -f xmakefile
> MAKE_CMD = $(MAKE) $(MAKE_OPTS)
> FLAGS = $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)" CC="$(CC)"
> VERSINC = -Iprograms/Xserver/hw/xfree86
> VERSSRC = $(CONFIGSRC)/util/printver.c
>Index: xc/config/cf/xorgversion.def
>===================================================================
>RCS file: /cvs/xorg/xc/config/cf/xorgversion.def,v
>retrieving revision 1.1.4.5
>diff -u -2 -0 -r1.1.4.5 xorgversion.def
>--- xc/config/cf/xorgversion.def	3 Feb 2005 00:32:28 -0000	1.1.4.5
>+++ xc/config/cf/xorgversion.def	9 Feb 2005 17:59:17 -0000
>@@ -1,6 +1,6 @@
> #define XORG_VERSION_MAJOR  6
> #define XORG_VERSION_MINOR  8
>-#define XORG_VERSION_PATCH  1
>-#define XORG_VERSION_SNAP   904
>+#define XORG_VERSION_PATCH  2
>+#define XORG_VERSION_SNAP   0
> 
>-#define XORG_DATE "2 February 2005"
>+#define XORG_DATE "9 February 2005"

Actions: View | Splinter Review

Attachments on bug 2514: 1879

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.