Author: branden
Date: 2004-09-27 15:48:55 -0500 (Mon, 27 Sep 2004)
New Revision: 1872
Modified:
trunk/debian/CHANGESETS
trunk/debian/patches/000_stolen_from_HEAD_nv_driver.diff
Log:
Add annotations to nv driver backport from X.Org CVS.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-09-27 19:51:33 UTC (rev 1871)
+++ trunk/debian/CHANGESETS 2004-09-27 20:48:55 UTC (rev 1872)
@@ -72,7 +72,7 @@
1851
Backport nv driver from X.org (merged from people/fabbione/nv-driver-backport)
- 1867, 1871
+ 1867, 1871, 1872
Update Czech debconf template translations (thanks, Miroslav Kure).
1868
Modified: trunk/debian/patches/000_stolen_from_HEAD_nv_driver.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD_nv_driver.diff 2004-09-27
19:51:33 UTC (rev 1871)
+++ trunk/debian/patches/000_stolen_from_HEAD_nv_driver.diff 2004-09-27
20:48:55 UTC (rev 1872)
@@ -1,3 +1,15 @@
+$Id$
+
+Backport nv driver from X.Org CVS as of 2004-09-15.
+
+* Removed 2 references to XORG_VERSION_CURRENT since it is not defined.
+
+Also see patch #000_stolen_from_freedesktop.org.diff and
+#030_Xserver_and_driver_region_primitive_fixups for further changes that
+allow this patch to build.
+
+This patch backported by Fabio Massimo Di Nitto.
+
diff -Naurd xc.orig/programs/Xserver/hw/xfree86/drivers/nv/Imakefile
xc/programs/Xserver/hw/xfree86/drivers/nv/Imakefile
--- xc.orig/programs/Xserver/hw/xfree86/drivers/nv/Imakefile 2003-02-17
17:06:43.000000000 +0000
+++ xc/programs/Xserver/hw/xfree86/drivers/nv/Imakefile 2004-09-15
08:16:34.000000000 +0000
