xserver-xorg-video-nv: Changes to 'debian-unstable'

[Julien Cristau <jcristau@alioth.debian.org>]

 ChangeLog        |    9 +++++++++
 debian/changelog |    7 +++++++
 src/nv_dac.c     |    4 +++-
 3 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit cc000283055d76769f5f707ec7da6af8cce31a0b
Author: Julien Cristau <jcristau@debian.org>
Date:   Tue Jul 10 21:23:35 2007 +0200

    Update changelogs.

diff --git a/ChangeLog b/ChangeLog
index 2f20fc3..dc2b094 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+commit ec78618d685759a39d386e9929661037b167fe68
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Tue Jul 10 11:54:33 2007 -0700
+
+    Bug #4686: Fix a minor GeForceFX + flatpanel + video overlay corruption issue.
+    
+    This change was originally in XFree86 CVS, nv_dac.c version 1.36 but got
+    reverted accidentally.
+
 commit 493822998184a1d79d6774686983cbd41930f253
 Author: Aaron Plattner <aplattner@nvidia.com>
 Date:   Tue Jul 10 09:58:46 2007 -0700
diff --git a/debian/changelog b/debian/changelog
index dbe285d..428784a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-nv (1:2.1.2-2) unstable; urgency=low
+
+  * Pull upstream commit ec78618d, to "fix a minor GeForceFX + flatpanel +
+    video overlay corruption issue" (closes: #425279).
+
+ -- Julien Cristau <jcristau@debian.org>  Tue, 10 Jul 2007 21:22:10 +0200
+
 xserver-xorg-video-nv (1:2.1.2-1) unstable; urgency=low
 
   * New upstream release.

commit ec78618d685759a39d386e9929661037b167fe68
Author: Aaron Plattner <aplattner@nvidia.com>
Date:   Tue Jul 10 11:54:33 2007 -0700

    Bug #4686: Fix a minor GeForceFX + flatpanel + video overlay corruption issue.
    
    This change was originally in XFree86 CVS, nv_dac.c version 1.36 but got
    reverted accidentally.

diff --git a/src/nv_dac.c b/src/nv_dac.c
index e1f0740..7e8340d 100644
--- a/src/nv_dac.c
+++ b/src/nv_dac.c
@@ -118,7 +118,9 @@ NVDACInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
        vertBlankStart = vertStart;
        horizStart = horizTotal - 5;
        horizEnd = horizTotal - 2;   
-       horizBlankEnd = horizTotal + 4;    
+       horizBlankEnd = horizTotal + 4;
+       if(pNv->Architecture == NV_ARCH_30)
+           horizTotal += 2;
     }
 
     pVga->CRTC[0x0]  = Set8Bits(horizTotal);