Author: branden
Date: 2004-05-14 13:28:58 -0500 (Fri, 14 May 2004)
New Revision: 1405
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/patches/000_stolen_from_HEAD.diff
Log:
Grab a fix to the XFree86 X server chips driver from XFree86 CVS
2003-04-04.
+ Fixed DPMS problem on C&T 69000 due to incorrect LCD flag (Bugz: 101,
Egbert Eich).
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-05-13 21:42:44 UTC (rev 1404)
+++ trunk/debian/CHANGESETS 2004-05-14 18:28:58 UTC (rev 1405)
@@ -92,4 +92,9 @@
we may end up incorporating a lot of them.
1404
+Grab a fix to the XFree86 X server chips driver from XFree86 CVS 2003-04-04.
++ Fixed DPMS problem on C&T 69000 due to incorrect LCD flag (Bugz: 101,
+ Egbert Eich).
+ 1405
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-05-13 21:42:44 UTC (rev 1404)
+++ trunk/debian/changelog 2004-05-14 18:28:58 UTC (rev 1405)
@@ -133,12 +133,17 @@
+ One xieperf reference left over. Noticed by ISHIKAWA Mutsumi. Thanks.
[Matthieu Herrb] From XFree86 CVS 2003-04-14.
+ * Grab a fix to the XFree86 X server chips driver from XFree86 CVS
+ 2003-04-04.
+ + Fixed DPMS problem on C&T 69000 due to incorrect LCD flag (Bugz: 101,
+ Egbert Eich).
+
Changes by Fabio Massimo Di Nitto:
* Update xutils's package description to refer to bdftruncate and ucs2any
programs by their correct names.
- -- Branden Robinson <[EMAIL PROTECTED]> Thu, 13 May 2004 14:50:28 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]> Thu, 13 May 2004 16:45:32 -0500
xfree86 (4.3.0.dfsg.1-1) unstable; urgency=low
Modified: trunk/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD.diff 2004-05-13 21:42:44 UTC
(rev 1404)
+++ trunk/debian/patches/000_stolen_from_HEAD.diff 2004-05-14 18:28:58 UTC
(rev 1405)
@@ -151,6 +151,10 @@
One xieperf reference left over. Noticed by ISHIKAWA Mutsumi. Thanks.
[Matthieu Herrb]
+xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c @ 1.123
+ 59. Fixed DPMS problem on C&T 69000 due to incorrect LCD flag (Bugz: 101,
+ Egbert Eich).
+
diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
--- xc.orig/config/imake/imake.c 2002-12-17 09:48:27.000000000 +1100
+++ xc/config/imake/imake.c 2003-04-09 01:58:14.000000000 +1000
@@ -4510,3 +4514,26 @@
.PP
The
.I -x
+Index: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c
+===================================================================
+RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c,v
+retrieving revision 1.122
+retrieving revision 1.123
+diff -u -r1.122 -r1.123
+--- xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c 25 Nov 2002
14:04:58 -0000 1.122
++++ xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c 4 Apr 2003
17:06:06 -0000 1.123
+@@ -1,4 +1,4 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c,v 1.122
2002/11/25 14:04:58 eich Exp $ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c,v 1.123
2003/04/04 17:06:06 eich Exp $ */
+
+ /*
+ * Copyright 1993 by Jon Block <[EMAIL PROTECTED]>
+@@ -7444,7 +7444,7 @@
+ /* LCD */
+ tmp = cPtr->readFR(cPtr, 0x01);
+ if ((tmp & 0x03) == 0x02) {
+- cPtr->PanelType |= ChipsLCD;
++ cPtr->PanelType |= ChipsLCD | ChipsLCDProbed;
+ }
+ tmp = cPtr->readXR(cPtr,0xD0);
+ if (tmp & 0x01) {
