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

2010-05-15 Thread Julien Cristau 
 debian/changelog   |8 
 debian/control |3 ++-
 debian/patches/01_fix_linking.diff |   17 +
 debian/patches/series  |1 +
 debian/rules   |4 ++--
 5 files changed, 30 insertions(+), 3 deletions(-)

New commits:
commit dd9f48bf3702b591106abce35e3506a7435005cb
Author: Julien Cristau 
Date:   Sat May 15 13:39:00 2010 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index bd1d9ad..9ccf401 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-nv (1:2.1.17-3) UNRELEASED; urgency=low
+xserver-xorg-video-nv (1:2.1.17-3) unstable; urgency=low
 
   * Add patch to link against libpciaccess and libdrm, to ensure correct
 dependencies.
   * Make the libdrm-dev build-dep !hurd-i386.
 
- -- Julien Cristau   Sat, 15 May 2010 13:30:05 +0200
+ -- Julien Cristau   Sat, 15 May 2010 13:38:58 +0200
 
 xserver-xorg-video-nv (1:2.1.17-2) unstable; urgency=low
 

commit 97ac9e125a9d1d3c5d5fd642d0c2daec06447070
Author: Julien Cristau 
Date:   Sat May 15 13:38:45 2010 +0200

Also link against -lm for sin/cos

diff --git a/debian/patches/01_fix_linking.diff 
b/debian/patches/01_fix_linking.diff
index 69de179..bb98121 100644
--- a/debian/patches/01_fix_linking.diff
+++ b/debian/patches/01_fix_linking.diff
@@ -11,7 +11,7 @@ Index: xserver-xorg-video-nv/src/Makefile.am
  nv_drv_la_LTLIBRARIES = nv_drv.la
  nv_drv_la_LDFLAGS = -module -avoid-version
  nv_drv_ladir = @moduledir@/drivers
-+nv_drv_la_LIBADD = $(PCIACCESS_LIBS) $(LIBDRM_LIBS)
++nv_drv_la_LIBADD = $(PCIACCESS_LIBS) $(LIBDRM_LIBS) -lm
  
  nv_drv_la_SOURCES = $(nv_sources) $(riva_sources) $(g80_sources)
  

commit c9f31db2556a98612cf10196b2c4f594e98b94bd
Author: Julien Cristau 
Date:   Sat May 15 13:31:09 2010 +0200

Make the libdrm-dev build-dep !hurd-i386.

No drm there.

diff --git a/debian/changelog b/debian/changelog
index 4b3f560..bd1d9ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-nv (1:2.1.17-3) UNRELEASED; urgency=low
 
   * Add patch to link against libpciaccess and libdrm, to ensure correct
 dependencies.
+  * Make the libdrm-dev build-dep !hurd-i386.
 
  -- Julien Cristau   Sat, 15 May 2010 13:30:05 +0200
 
diff --git a/debian/control b/debian/control
index 09460ce..3bebcaf 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev,
- libdrm-dev (>= 2.4.3),
+ libdrm-dev (>= 2.4.3) [!hurd-i386],
  x11proto-xf86dri-dev,
  quilt,
 Standards-Version: 3.8.4

commit 42486a0e2897c06d3c4eb888176d860506425893
Author: Julien Cristau 
Date:   Sat May 15 13:30:33 2010 +0200

Add patch to link against libpciaccess and libdrm

Ensures correct dependencies.

diff --git a/debian/changelog b/debian/changelog
index e6e01b7..4b3f560 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-nv (1:2.1.17-3) UNRELEASED; urgency=low
+
+  * Add patch to link against libpciaccess and libdrm, to ensure correct
+dependencies.
+
+ -- Julien Cristau   Sat, 15 May 2010 13:30:05 +0200
+
 xserver-xorg-video-nv (1:2.1.17-2) unstable; urgency=low
 
   * Merge upstream's master as of 17ab5dbea6. This includes the “Refuse to
diff --git a/debian/control b/debian/control
index 4ae7b36..09460ce 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Build-Depends:
  xutils-dev,
  libdrm-dev (>= 2.4.3),
  x11proto-xf86dri-dev,
+ quilt,
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nv
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-nv.git
diff --git a/debian/patches/01_fix_linking.diff 
b/debian/patches/01_fix_linking.diff
new file mode 100644
index 000..69de179
--- /dev/null
+++ b/debian/patches/01_fix_linking.diff
@@ -0,0 +1,17 @@
+From: Julien Cristau 
+Subject: Link against the libs we use
+
+Avoids undefined references, ensures correct package dependencies.
+
+Index: xserver-xorg-video-nv/src/Makefile.am
+===
+--- xserver-xorg-video-nv.orig/src/Makefile.am
 xserver-xorg-video-nv/src/Makefile.am
+@@ -27,6 +27,7 @@
+ nv_drv_la_LTLIBRARIES = nv_drv.la
+ nv_drv_la_LDFLAGS = -module -avoid-version
+ nv_drv_ladir = @moduledir@/drivers
++nv_drv_la_LIBADD = $(PCIACCESS_LIBS) $(LIBDRM_LIBS)
+ 
+ nv_drv_la_SOURCES = $(nv_sources) $(riva_sources) $(g80_sources)
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..459f02f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_fix_linking.diff
diff --git a/debian/rules b/debian/rules
index a06fbe2..bcb8a3f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ endif
 # kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
 confflags += --disable-static
 
-configure: 
+configure: $(STAMP_DIR)/pat

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

2010-05-07 Thread Mikhail Gusarov 
 debian/control |2 --
 1 file changed, 2 deletions(-)

New commits:
commit d7f18f36d136ef12f2c346ec59d0e7538afb42e9
Author: Mikhail Gusarov 
Date:   Fri May 7 18:58:58 2010 +0700

Remove duplicate xorg.fd.o URL and confusing mailing list URL from 
debian/control

diff --git a/debian/control b/debian/control
index fe7d211..4ae7b36 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,5 @@ Description: X.Org X server -- NV display driver
  .
  More information about X.Org can be found at:
  http://www.X.org>
- http://xorg.freedesktop.org>
- http://lists.freedesktop.org/mailman/listinfo/xorg>
  .
  This package is built from the X.org xf86-video-nv driver module.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1oampk-0001gh...@alioth.debian.org

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

2010-04-18 Thread Cyril Brulebois 
 debian/changelog |6 --
 debian/control   |4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit bea1bfc5c5c63dd39b64e9785a57b967f765fd33
Author: Cyril Brulebois 
Date:   Sun Apr 18 12:14:04 2010 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index cbdf139..e6e01b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-nv (1:2.1.17-2) UNRELEASED; urgency=low
+xserver-xorg-video-nv (1:2.1.17-2) unstable; urgency=low
 
   * Merge upstream's master as of 17ab5dbea6. This includes the “Refuse to
 bind to a device which has kernel modesetting active.” commit, which
@@ -10,7 +10,7 @@ xserver-xorg-video-nv (1:2.1.17-2) UNRELEASED; urgency=low
   * Use new xsfbs and ${xviddriver:Depends} variable (bumping the
 xserver-xorg-dev version in Build-Depends accordingly).
 
- -- Cyril Brulebois   Sun, 18 Apr 2010 11:31:15 +0200
+ -- Cyril Brulebois   Sun, 18 Apr 2010 12:13:58 +0200
 
 xserver-xorg-video-nv (1:2.1.17-1) unstable; urgency=low
 

commit 47718903b374e937f6da9497269069d3dc3097a7
Author: Cyril Brulebois 
Date:   Sun Apr 18 12:10:37 2010 +0200

Add libdrm-dev and x11proto-xf86dri-dev to Build-Depends to enable the 
appropriate codepath.

diff --git a/debian/changelog b/debian/changelog
index f09f53e..cbdf139 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xserver-xorg-video-nv (1:2.1.17-2) UNRELEASED; urgency=low
 bind to a device which has kernel modesetting active.” commit, which
 makes sure nv doesn't break console output when nouveau's KMS is
 active.
+  * Add libdrm-dev and x11proto-xf86dri-dev to Build-Depends to enable the
+appropriate codepath.
   * Add myself to Uploaders.
   * Use new xsfbs and ${xviddriver:Depends} variable (bumping the
 xserver-xorg-dev version in Build-Depends accordingly).
diff --git a/debian/control b/debian/control
index d7400ee..fe7d211 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,9 @@ Build-Depends:
  dpkg-dev (>= 1.14.17),
  automake,
  libtool,
- xutils-dev
+ xutils-dev,
+ libdrm-dev (>= 2.4.3),
+ x11proto-xf86dri-dev,
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nv
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-nv.git


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1o3ryq-0005hp...@alioth.debian.org

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

2010-04-18 Thread Cyril Brulebois 
 ChangeLog |   43 +++
 configure.ac  |   11 +++
 debian/README.source  |2 +-
 debian/changelog  |   12 
 debian/control|6 +++---
 debian/xsfbs/xsfbs.mk |   31 ---
 man/nv.man|2 +-
 src/Makefile.am   |2 +-
 src/g80_output.c  |   23 +--
 src/nv_driver.c   |   43 ++-
 src/nv_hw.c   |7 +--
 11 files changed, 152 insertions(+), 30 deletions(-)

New commits:
commit 66a40053b81e3536000705beb90f5daf43c7731c
Author: Cyril Brulebois 
Date:   Sun Apr 18 11:51:37 2010 +0200

Use new xsfbs and ${xviddriver:Depends} variable (bumping the 
xserver-xorg-dev version in Build-Depends accordingly).

diff --git a/debian/changelog b/debian/changelog
index 3551ac2..f09f53e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ xserver-xorg-video-nv (1:2.1.17-2) UNRELEASED; urgency=low
 makes sure nv doesn't break console output when nouveau's KMS is
 active.
   * Add myself to Uploaders.
+  * Use new xsfbs and ${xviddriver:Depends} variable (bumping the
+xserver-xorg-dev version in Build-Depends accordingly).
 
  -- Cyril Brulebois   Sun, 18 Apr 2010 11:31:15 +0200
 
diff --git a/debian/control b/debian/control
index 526cbbf..d7400ee 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow , Brice Goglin 
= 5.0.0),
  pkg-config,
- xserver-xorg-dev (>= 2:1.7),
+ xserver-xorg-dev (>= 2:1.7.6.901),
  x11proto-video-dev,
  x11proto-core-dev,
  x11proto-fonts-dev,
@@ -23,7 +23,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-nv.git
 
 Package: xserver-xorg-video-nv
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
 Provides: ${xviddriver:Provides}, xf86-video-driver-riva128
 Conflicts: xserver-xorg-video-riva128, xserver-xorg-driver-nv
 Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-video-riva128, 
xserver-xorg-driver-nv

commit b83faf6ed029925fd32633a539509a3741793eb2
Author: Cyril Brulebois 
Date:   Sun Apr 18 11:36:19 2010 +0200

Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index 596a75c..3551ac2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-video-nv (1:2.1.17-2) UNRELEASED; urgency=low
 bind to a device which has kernel modesetting active.” commit, which
 makes sure nv doesn't break console output when nouveau's KMS is
 active.
+  * Add myself to Uploaders.
 
  -- Cyril Brulebois   Sun, 18 Apr 2010 11:31:15 +0200
 
diff --git a/debian/control b/debian/control
index 0dcbb26..526cbbf 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-nv
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
-Uploaders: David Nusinow , Brice Goglin 

+Uploaders: David Nusinow , Brice Goglin 
, Cyril Brulebois 
 Build-Depends:
  debhelper (>= 5.0.0),
  pkg-config,

commit c7e744ca5c5c507f37fcf1a928cb135952a2f40c
Author: Cyril Brulebois 
Date:   Sun Apr 18 11:35:51 2010 +0200

Document the upstream merge.

diff --git a/debian/changelog b/debian/changelog
index 93746cf..596a75c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xserver-xorg-video-nv (1:2.1.17-2) UNRELEASED; urgency=low
+
+  * Merge upstream's master as of 17ab5dbea6. This includes the “Refuse to
+bind to a device which has kernel modesetting active.” commit, which
+makes sure nv doesn't break console output when nouveau's KMS is
+active.
+
+ -- Cyril Brulebois   Sun, 18 Apr 2010 11:31:15 +0200
+
 xserver-xorg-video-nv (1:2.1.17-1) unstable; urgency=low
 
   [ Julien Cristau ]

commit 91323a350eb226cdaacf2d12c62e4b16283bf5e4
Author: Cyril Brulebois 
Date:   Sun Apr 18 11:31:00 2010 +0200

Refresh ChangeLog.

diff --git a/ChangeLog b/ChangeLog
index 4dfa13f..811aa01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,46 @@
+commit 17ab5dbea69e690cbf78c25040db518471e0887f
+Author: Marcin Slusarz 
+Date:   Fri Apr 16 10:19:19 2010 -0700
+
+Refuse to bind to a device which has kernel modesetting active.
+
+Touching directly the hardware while kernel modesetting is active
+breaks console output.
+
+Patch almost entrirely based on VESA patch by
+Christopher James Halse Rogers 
+
+Signed-off-by: Marcin Slusarz 
+Tested-by: Aaron Plattner 
+Reviewed-by: Aaron Plattner 
+
+commit 250a3a7cee1a4bbfc432ab6da5b986e889207526
+Author: Aaron Plattner 
+Date:   Wed Mar 10 18:31:08 2010 -0800
+
+Update MCP6x supported products.
+
+Use the official names for 10DE:053B and 10DE:053E.  Add some additional
+product IDs and update the documentation.
+
+Signed-off-by: Aaron Plattner 
+
+commit 347625b8e187c4ab696cd1dad95e49c31ced12f6
+Author:

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

2010-03-08 Thread Brice Goglin 
 .gitignore|   75 ++---
 ChangeLog |  185 ++
 Makefile.am   |   12 ++-
 configure.ac  |   17 ++--
 debian/changelog  |   11 ++-
 debian/control|2 
 man/.gitignore|2 
 man/Makefile.am   |   41 +--
 man/nv.man|6 -
 src/g80_display.c |  103 +-
 src/g80_display.h |1 
 src/g80_driver.c  |   73 ++---
 src/g80_output.c  |   17 
 src/nv_driver.c   |   55 +++-
 14 files changed, 487 insertions(+), 113 deletions(-)

New commits:
commit 62be6cd57e754b4f7e5e1219e5e0c5329506
Author: Brice Goglin 
Date:   Tue Mar 9 07:19:22 2010 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 798cae0..93746cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-nv (1:2.1.17-1) UNRELEASED; urgency=low
+xserver-xorg-video-nv (1:2.1.17-1) unstable; urgency=low
 
   [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -11,7 +11,7 @@ xserver-xorg-video-nv (1:2.1.17-1) UNRELEASED; urgency=low
 + Add support for ION boards, closes: #540500.
   * Bump Standards-Version to 3.8.4, no changes needed.
 
- -- Brice Goglin   Tue, 09 Mar 2010 07:17:38 +0100
+ -- Brice Goglin   Tue, 09 Mar 2010 07:19:12 +0100
 
 xserver-xorg-video-nv (1:2.1.15-1) experimental; urgency=low
 

commit e0071458ddecee1853a1d44a0688ab8f925d50e3
Author: Brice Goglin 
Date:   Tue Mar 9 07:19:02 2010 +0100

Bump Standards-Version to 3.8.4

diff --git a/debian/changelog b/debian/changelog
index 6a3d9af..798cae0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,9 @@ xserver-xorg-video-nv (1:2.1.17-1) UNRELEASED; urgency=low
   * New upstream release.
 + Fix support for Xserver 1.7, closes: #568170.
 + Add support for ION boards, closes: #540500.
+  * Bump Standards-Version to 3.8.4, no changes needed.
 
- -- Julien Cristau   Sat, 23 Jan 2010 02:12:23 +0100
+ -- Brice Goglin   Tue, 09 Mar 2010 07:17:38 +0100
 
 xserver-xorg-video-nv (1:2.1.15-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 4b47a0c..0dcbb26 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nv
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-nv.git
 

commit 9dc66e251fb094f745f2c2ecc46d0dc278e4fabc
Author: Brice Goglin 
Date:   Tue Mar 9 07:17:00 2010 +0100

New upstream release

diff --git a/ChangeLog b/ChangeLog
index f055e22..4dfa13f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,188 @@
+commit 71321d0ddecf1ab5327c754353d31db5d1f3c6bf
+Author: Aaron Plattner 
+Date:   Mon Mar 8 13:34:20 2010 -0800
+
+nv 2.1.17
+
+Signed-off-by: Aaron Plattner 
+
+commit 467f0f3890622e57607b103b07e4f265cf999b1e
+Author: Aaron Plattner 
+Date:   Mon Mar 8 13:16:26 2010 -0800
+
+More products
+
+Signed-off-by: Aaron Plattner 
+Reviewed-by: Andy Ritger 
+
+commit e34a53167d6a142949b3e0258dc336dc297368aa
+Author: Aaron Plattner 
+Date:   Fri Mar 5 14:27:31 2010 -0800
+
+G80: Cast register reads before shifting them to avoid truncation to 32 
bits.
+
+Signed-off-by: Aaron Plattner 
+
+commit 9378ecd34ad71083602232b56e8810d6cd39b518
+Author: Aaron Plattner 
+Date:   Wed Mar 3 20:29:55 2010 -0800
+
+Bug #19545: Add support for MCP7x-based integrated GPUs.
+
+Based in part on an idea from Ben Skeggs.
+
+Signed-off-by: Aaron Plattner 
+Signed-off-by: Andy Ritger 
+Reviewed-by: Christian Zander 
+
+commit 49349f6e47b7315088a80789f134895677f57287
+Author: Aaron Plattner 
+Date:   Tue Mar 2 12:53:54 2010 -0800
+
+G80: Log unrecognized outputs
+
+Signed-off-by: Aaron Plattner 
+Reviewed-by: Andy Ritger 
+
+commit 7b01fc8f4ba1182370980f54a34bdb959e291e02
+Author: Aaron Plattner 
+Date:   Mon Mar 1 14:26:51 2010 -0800
+
+Bug #26612: Separate LUTs per output.
+
+Wire up the RandR 1.2 gamma_set hook.  Call it from G80SetPalette like the 
Intel
+driver does.
+
+Signed-off-by: Aaron Plattner 
+Signed-off-by: Andy Ritger 
+Reviewed-by: Christian Zander 
+
+commit e6f4c9c6379b20b9fee50489d6afd05867c35967
+Author: Alan Coopersmith 
+Date:   Fri Jan 15 13:46:50 2010 -0800
+
+Update Sun license notices to current X.Org standard form
+
+Signed-off-by: Alan Coopersmith 
+
+commit 893cee2aeda8074de3d5c99df90e23d6ec2217d2
+Author: Gaetan Nadon 
+Date:   Tue Dec 15 22:01:02 2009 -0500
+
+configure.ac: remove unused sdkdir=$(pkg-config...) statement
+
+The sdkdir variable isn't use, so remove the statement.
+
+Acked-by: Dan Nicholson 
+
+Signed-off-by: Gaetan Nadon 
+
+commit 2b69212ff84e8b815d6915dc81644280cc9

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

2010-01-22 Thread Julien Cristau 
 debian/changelog |   17 -
 debian/control   |2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 01e3e07ef32a2b87a435702e2f8ddd090d651254
Author: Julien Cristau 
Date:   Sat Jan 23 01:46:32 2010 +0100

Remove myself from Uploaders

diff --git a/debian/changelog b/debian/changelog
index 26d0352..4270b2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xserver-xorg-video-nv (1:2.1.15-1) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
 good reason.  Thanks, Colin Watson!
+  * Remove myself from Uploaders
 
  -- Timo Aaltonen   Sat, 05 Dec 2009 01:49:09 +0200
 
diff --git a/debian/control b/debian/control
index 05b342d..4b47a0c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-nv
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
-Uploaders: David Nusinow , Julien Cristau 
, Brice Goglin 
+Uploaders: David Nusinow , Brice Goglin 

 Build-Depends:
  debhelper (>= 5.0.0),
  pkg-config,

commit 424219ba75b29ded6f11e18dd7f8e057e7638465
Author: Cyril Brulebois 
Date:   Sun Dec 6 02:35:37 2009 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 4ecdf57..2bbacb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-xserver-xorg-video-nv (1:2.1.15-1) UNRELEASED; urgency=low
+xserver-xorg-video-nv (1:2.1.15-1) experimental; urgency=low
 
+  [ Timo Aaltonen ]
   * New upstream release.
   * Bump Standards-Version to 3.8.3.
   * Build against Xserver 1.7.
 
- -- Timo Aaltonen   Sat, 05 Dec 2009 01:49:09 +0200
+  [ Cyril Brulebois ]
+  * Upload to experimental.
+
+ -- Cyril Brulebois   Sun, 06 Dec 2009 02:35:34 +0100
 
 xserver-xorg-video-nv (1:2.1.14-2) unstable; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

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

2010-01-16 Thread Julien Cristau 
 debian/changelog |5 +
 debian/rules |   14 +++---
 2 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit ac53060fc95507e9fd5eb05f56abb6c63645dcd5
Author: Julien Cristau 
Date:   Sat Jan 16 16:48:44 2010 +

Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good 
reason.  Thanks, Colin Watson!

diff --git a/debian/changelog b/debian/changelog
index 4ecdf57..26d0352 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 xserver-xorg-video-nv (1:2.1.15-1) UNRELEASED; urgency=low
 
+  [ Timo Aaltonen ]
   * New upstream release.
   * Bump Standards-Version to 3.8.3.
   * Build against Xserver 1.7.
 
+  [ Julien Cristau ]
+  * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+good reason.  Thanks, Colin Watson!
+
  -- Timo Aaltonen   Sat, 05 Dec 2009 01:49:09 +0200
 
 xserver-xorg-video-nv (1:2.1.14-2) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 34af655..a06fbe2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,18 +36,18 @@ configure:
dh_testdir
autoreconf -vfi
 
-obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
+build/config.status: configure
dh_testdir
-   mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
-   cd obj-$(DEB_BUILD_GNU_TYPE) && \
+   mkdir -p build
+   cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
 --infodir=\$${prefix}/share/info $(confflags) \
 CFLAGS="$(CFLAGS)"
 
 build: build-stamp
-build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
+build-stamp: build/config.status
dh_testdir
-   cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+   cd build && $(MAKE)
>$@
 
 clean: 
@@ -59,7 +59,7 @@ clean:
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
-   rm -rf obj-*
+   rm -rf build
rm -f $$(find -name Makefile.in)
rm -f compile config.guess config.sub configure depcomp install-sh
rm -f ltmain.sh missing INSTALL aclocal.m4 config.h.in mkinstalldirs
@@ -72,7 +72,7 @@ install: build
dh_clean -k
dh_installdirs
 
-   cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp 
install
+   cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
 # Build architecture-dependent files here.
 binary-arch: build install serverabi


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

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

2009-12-04 Thread Timo Aaltonen 
 debian/changelog |3 ++-
 debian/control   |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 8ea4d858808f02735c2908224963f289396e4f91
Author: Timo Aaltonen 
Date:   Sat Dec 5 02:09:28 2009 +0200

Build against Xserver 1.7.

diff --git a/debian/changelog b/debian/changelog
index a1897b9..4ecdf57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-video-nv (1:2.1.15-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Bump Standards-Version to 3.8.3.
+  * Build against Xserver 1.7.
 
- -- Timo Aaltonen   Mon, 30 Nov 2009 16:59:35 +0200
+ -- Timo Aaltonen   Sat, 05 Dec 2009 01:49:09 +0200
 
 xserver-xorg-video-nv (1:2.1.14-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index dfc1bf7..05b342d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow , Julien Cristau 
= 5.0.0),
  pkg-config,
- xserver-xorg-dev (>= 2:1.5.99.901),
+ xserver-xorg-dev (>= 2:1.7),
  x11proto-video-dev,
  x11proto-core-dev,
  x11proto-fonts-dev,


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

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

2009-11-30 Thread Timo Aaltonen 
 debian/changelog |1 +
 debian/control   |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 88bb7169e15ab944365e17bbdbc15373b6e0bdcb
Author: Timo Aaltonen 
Date:   Mon Nov 30 17:00:53 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index ff8dc3e..a1897b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-nv (1:2.1.15-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump Standards-Version to 3.8.3.
 
  -- Timo Aaltonen   Mon, 30 Nov 2009 16:59:35 +0200
 
diff --git a/debian/control b/debian/control
index 5699c8d..dfc1bf7 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nv
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-nv.git
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

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

2009-11-30 Thread Timo Aaltonen 
 ChangeLog |   49 ++
 Makefile.am   |2 
 configure.ac  |   12 ++
 debian/changelog  |6 +
 debian/xsfbs/xsfbs.mk |   21 
 debian/xsfbs/xsfbs.sh |  233 --
 src/g80_dac.c |5 +
 src/g80_driver.c  |   14 ++-
 src/g80_sor.c |5 +
 src/nv_driver.c   |4 
 src/nv_include.h  |6 -
 src/nv_video.c|1 
 src/riva_driver.c |5 -
 src/riva_include.h|5 -
 src/riva_type.h   |2 
 15 files changed, 110 insertions(+), 260 deletions(-)

New commits:
commit 86e6adfa8e301165be15b02ea08da457c0d57033
Author: Timo Aaltonen 
Date:   Mon Nov 30 16:59:53 2009 +0200

Update the changelogs.

diff --git a/ChangeLog b/ChangeLog
index be2cfc4..f055e22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,52 @@
+commit 0250f0d7ebe30368c5a63809ed1f58673493627c
+Author: Peter Hutterer 
+Date:   Fri Sep 11 12:24:18 2009 +1000
+
+nv 2.1.15
+
+Signed-off-by: Peter Hutterer 
+
+commit 5486e55c9feb5734b967c2618e0c96cd4a2322ce
+Author: Dave Airlie 
+Date:   Tue Jul 28 18:37:42 2009 +1000
+
+abi: fixup so the define is picked up
+
+commit 85b5ff3fdf3141ef01604bd7eb8e71e30d24717f
+Author: Dave Airlie 
+Date:   Tue Jul 28 15:22:40 2009 +1000
+
+nv: change to using ABI version check
+
+commit 445498d2cc977b8c4f22fca881c75637dc7b058a
+Author: Dave Airlie 
+Date:   Tue Jul 28 13:32:32 2009 +1000
+
+nv: update for resources/RAC API removal
+
+commit 957b8c1a240884b26ee5b91856c251622cc0b2a7
+Author: Peter Hutterer 
+Date:   Thu Jul 16 11:49:24 2009 +1000
+
+Update to xextproto 7.1 support.
+
+DPMS header was split into dpms.h (client) and dpmsconst.h (server). 
Drivers
+need to include dpmsconst.h if xextproto 7.1 is available.
+
+Signed-off-by: Peter Hutterer 
+
+commit e8d4dd85de02c689d3e0cc86a99aae6e61a7d17e
+Author: Gaetan Nadon 
+Date:   Thu Jul 9 14:07:09 2009 -0400
+
+xf86-video-nv: use XORG_CHANGELOG macro to create ChangeLog. #22611
+
+Adding the macro in configure.ac and use it in Makefile.am
+Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611
+
+Signed-off-by: Gaetan Nadon 
+Signed-off-by: Peter Hutterer 
+
 commit c56b92149c6291e7ef96b30a4fc7bee30073b90c
 Author: Aaron Plattner 
 Date:   Thu Jul 2 12:03:13 2009 -0700
diff --git a/debian/changelog b/debian/changelog
index b5ef46a..ff8dc3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nv (1:2.1.15-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Timo Aaltonen   Mon, 30 Nov 2009 16:59:35 +0200
+
 xserver-xorg-video-nv (1:2.1.14-2) unstable; urgency=low
 
   * Add README.source, bump Standards-Version to 3.8.2.

commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
Date:   Fri Sep 25 16:39:23 2009 +0200

xsfbs.mk: remove more obsolete code

We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
-   rm -rf imports
-   dh_clean debian/shlibs.local \
-debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
-   sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
-   debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+   dh_clean
 
 # Remove files from the upstream source tree that we don't need, or which have
 # licensing problems.  It must be run before creating the .orig.tar.gz.

commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau 
Date:   Fri Sep 25 15:43:28 2009 +0200

xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage

These variables aren't set anywhere.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
 xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
-   rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+   rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
 debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
  | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
-e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \
-   -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \
  <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \
rm $$MAINTSCRIPT.

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

2009-07-28 Thread Brice Goglin 
 debian/changelog |9 ++---
 debian/rules |2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit de8233b1c159481b33a1cc147fa81de433d9a6c2
Author: Brice Goglin 
Date:   Wed Jul 29 01:50:50 2009 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 08d904a..b5ef46a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-nv (1:2.1.14-2) UNRELEASED; urgency=low
+xserver-xorg-video-nv (1:2.1.14-2) unstable; urgency=low
 
-  * Bump Standards-Version to 3.8.2.
+  * Add README.source, bump Standards-Version to 3.8.2.
   * Drop obsolete patch dependency from the build make target,
 causing FTBFS since quilt has been removed from Build-depends,
 closes: #539051.
 
- -- Brice Goglin   Wed, 29 Jul 2009 01:50:14 +0200
+ -- Brice Goglin   Wed, 29 Jul 2009 01:55:30 +0200
 
 xserver-xorg-video-nv (1:2.1.14-1) unstable; urgency=low
 

commit a42e9d4b488bddf7eedf7719ebcaa0601529b2c9
Author: Brice Goglin 
Date:   Wed Jul 29 01:50:44 2009 +0200

Drop obsolete patch dependency from the build make target

diff --git a/debian/changelog b/debian/changelog
index c69c04a..08d904a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 xserver-xorg-video-nv (1:2.1.14-2) UNRELEASED; urgency=low
 
   * Bump Standards-Version to 3.8.2.
+  * Drop obsolete patch dependency from the build make target,
+causing FTBFS since quilt has been removed from Build-depends,
+closes: #539051.
 
- -- Brice Goglin   Sun, 19 Jul 2009 22:26:53 +0200
+ -- Brice Goglin   Wed, 29 Jul 2009 01:50:14 +0200
 
 xserver-xorg-video-nv (1:2.1.14-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index db163fa..34af655 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,7 +44,7 @@ obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
 --infodir=\$${prefix}/share/info $(confflags) \
 CFLAGS="$(CFLAGS)"
 
-build: patch build-stamp
+build: build-stamp
 build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
dh_testdir
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

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

2009-07-19 Thread Brice Goglin 
 debian/README.source  |   73 ++
 debian/changelog  |6 
 debian/control|2 -
 debian/xsfbs/xsfbs.sh |   12 
 4 files changed, 80 insertions(+), 13 deletions(-)

New commits:
commit 639e665639cbca9a7b9afcae14bc39544e8f8f45
Author: Brice Goglin 
Date:   Sun Jul 19 22:27:54 2009 +0200

Adding README.source means we can bump Standards-Version

diff --git a/debian/changelog b/debian/changelog
index 823a068..c69c04a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nv (1:2.1.14-2) UNRELEASED; urgency=low
+
+  * Bump Standards-Version to 3.8.2.
+
+ -- Brice Goglin   Sun, 19 Jul 2009 22:26:53 +0200
+
 xserver-xorg-video-nv (1:2.1.14-1) unstable; urgency=low
 
   [ David Nusinow ]
diff --git a/debian/control b/debian/control
index d41b547..5699c8d 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.2
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nv
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-nv.git
 

commit 8f72294ada477f003888b6776883c1dd98289f3f
Author: Julien Cristau 
Date:   Wed Jun 3 03:37:37 2009 +0200

Kill custom readlink function

This was needed for very, very old versions of debianutils.
Closes: #498890

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 197eb74..781826f 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -303,16 +303,6 @@ EOF
   fi
 }
 
-# we require a readlink command or shell function
-if ! which readlink > /dev/null 2>&1; then
-  message "The readlink command was not found.  Please install version" \
-  "1.13.1 or later of the debianutils package."
-  readlink () {
-# returns what symlink in $1 actually points to
-perl -e '$l = shift; exit 1 unless -l $l; $r = readlink $l; exit 1 unless 
$r; print "$r\n"' "$1"
-  }
-fi
-
 check_symlink () {
   # syntax: check_symlink symlink
   #

commit 7deebf983f53c505bc25171ab77fdc408f250a6e
Author: Julien Cristau 
Date:   Tue May 26 15:58:19 2009 +0200

xsfbs: don't run dpkg --print-installation-architecture

This is deprecated in new dpkg, and had no users anyway.

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 8840ff9..197eb74 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -57,8 +57,6 @@ EOF
   exit $SHELL_LIB_USAGE_ERROR
 fi
 
-ARCHITECTURE="$(dpkg --print-installation-architecture)"
-
 if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
   RECONFIGURE="true"
 else

commit 4178d948cd66a938222d0d7c6353ee8d60229e40
Author: David Nusinow 
Date:   Mon May 25 20:08:50 2009 -0400

Add README.source

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 000..34ab4bf
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,73 @@
+--
+Quick Guide To Patching This Package For The Impatient
+--
+
+1. Make sure you have quilt installed
+2. Unpack the package as usual with "dpkg-source -x"
+3. Run the "patch" target in debian/rules
+4. Create a new patch with "quilt new" (see quilt(1))
+5. Edit all the files you want to include in the patch with "quilt edit" 
+   (see quilt(1)).
+6. Write the patch with "quilt refresh" (see quilt(1))
+7. Run the "clean" target in debian/rules
+
+Alternatively, instead of using quilt directly, you can drop the patch in to 
+debian/patches and add the name of the patch to debian/patches/series.
+
+
+Guide To The X Strike Force Packages
+
+
+The X Strike Force team maintains X packages in git repositories on
+git.debian.org in the pkg-xorg subdirectory. Most upstream packages
+are actually maintained in git repositories as well, so they often
+just need to be pulled into git.debian.org in a "upstream-*" branch.
+Otherwise, the upstream sources are manually installed in the Debian
+git repository.
+
+The .orig.tar.gz upstream source file could be generated this
+"upstream-*" branch in the Debian git repository but it is actually
+copied from upstream tarballs directly.
+
+Due to X.org being highly modular, packaging all X.org applications
+as their own independent packages would have created too many Debian
+packages. For this reason, some X.org applications have been grouped
+into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils,
+x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils.
+Most packages, including the X.org server itself and all libraries
+and drivers are, however maintained independently.
+
+The Debian packaging is added by creating the "debian-*" git branch
+which contains the aforementioned "upstream-*" branch plus the debian/
+repository files.
+When a patch has to be applie

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

2009-07-19 Thread Brice Goglin 
 ChangeLog|   55 +
 configure.ac |2 
 debian/changelog |8 +
 debian/xserver-xorg-video-nv.install |1 
 src/g80_display.c|   95 ++--
 src/g80_driver.c |   59 --
 src/g80_output.c |   22 +++
 src/g80_type.h   |2 
 src/nv_driver.c  |  198 +--
 src/riva_driver.c|  108 ---
 10 files changed, 221 insertions(+), 329 deletions(-)

New commits:
commit d520933ea82b6e86157de26f58f2894c1c13bf6d
Author: Brice Goglin 
Date:   Sun Jul 19 21:58:51 2009 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 3645f15..823a068 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-nv (1:2.1.14-1) UNRELEASED; urgency=low
+xserver-xorg-video-nv (1:2.1.14-1) unstable; urgency=low
 
   [ David Nusinow ]
   * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
@@ -8,7 +8,7 @@ xserver-xorg-video-nv (1:2.1.14-1) UNRELEASED; urgency=low
   [ Brice Goglin ]
   * New upstream release.
 
- -- Brice Goglin   Sun, 19 Jul 2009 21:57:50 +0200
+ -- Brice Goglin   Sun, 19 Jul 2009 21:58:45 +0200
 
 xserver-xorg-video-nv (1:2.1.13-1) unstable; urgency=low
 

commit 403226fb5a48cfd7f350e739904c475fd124c538
Author: Brice Goglin 
Date:   Sun Jul 19 22:02:47 2009 +0200

Don't try to install usr/share/xserver-xorg/pci/* anymore

diff --git a/debian/xserver-xorg-video-nv.install 
b/debian/xserver-xorg-video-nv.install
index 8a9f4ba..614cfb4 100644
--- a/debian/xserver-xorg-video-nv.install
+++ b/debian/xserver-xorg-video-nv.install
@@ -1,3 +1,2 @@
 usr/lib/xorg/modules/drivers/*.so
 usr/share/man/man4/*
-usr/share/xserver-xorg/pci/*

commit fdbac4081f75f436ab3ba9576e225e149751e6d8
Author: Brice Goglin 
Date:   Sun Jul 19 21:58:41 2009 +0200

New upstream release

diff --git a/ChangeLog b/ChangeLog
index d91d56d..be2cfc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,58 @@
+commit c56b92149c6291e7ef96b30a4fc7bee30073b90c
+Author: Aaron Plattner 
+Date:   Thu Jul 2 12:03:13 2009 -0700
+
+Bump to 2.1.14
+
+commit 05d2b851b96c2f1b3223f8d5f40b8ee074e5f23f
+Author: Aaron Plattner 
+Date:   Fri Jun 26 17:53:53 2009 -0700
+
+More new chips
+
+commit 68c2914f1775541784e6cf88019960342d8433bc
+Author: Aaron Plattner 
+Date:   Fri Jun 12 17:34:43 2009 -0700
+
+Fix modesets on certain GPUs that were broken by the previous commit.
+
+commit 36eb96854b34bee6b65a2b2d4df25f53b47194e4
+Author: Aaron Plattner 
+Date:   Wed Jun 10 18:49:32 2009 -0700
+
+New chip support.
+
+Part of the G80DispPreInit change suggested by .
+
+commit 23ca1b0d4324ae65a0c2a39cc877d318063988b1
+Author: Adam Jackson 
+Date:   Thu May 28 15:11:20 2009 -0400
+
+Remove useless loader symbol lists.
+
+commit c8d6f7aa7c99a1b71289f8e8e07becc10f61f379
+Author: Aaron Plattner 
+Date:   Fri May 15 16:24:57 2009 -0700
+
+More chip names.
+
+Add support for the following previously unsupported chips:
+  * 0x0658 - Quadro FX 380
+  * 0x0659 - Quadro FX 580
+  * 0x065C - Quadro FX 770M
+
+commit 29acf7c970d12c1dfd7bf6c7a42fe2448aa7f3d7
+Author: Yinan Shen 
+Date:   Wed May 6 19:14:33 2009 -0700
+
+G80: Fix incorrect I2C port access for ports above 3.
+
+commit bf18cd4842c33df61b03c3d4e0f00e34485fb957
+Author: Aaron Plattner 
+Date:   Tue May 5 01:29:08 2009 -0700
+
+Fix a dumb typo in the chip name entry for the GeForce 9800 GTX+
+
 commit df87eaf191209b0f1619ea74dc9fb0314b6fd288
 Author: Adam Jackson 
 Date:   Tue Apr 7 13:40:36 2009 -0400
diff --git a/debian/changelog b/debian/changelog
index ab55273..3645f15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-xserver-xorg-video-nv (1:2.1.13-2) UNRELEASED; urgency=low
+xserver-xorg-video-nv (1:2.1.14-1) UNRELEASED; urgency=low
 
+  [ David Nusinow ]
   * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
 choose a driver during autoconfiguration.
 + Disable patch system and remove quilt from build-deps.
 
- -- David Nusinow   Mon, 04 May 2009 22:27:31 -0400
+  [ Brice Goglin ]
+  * New upstream release.
+
+ -- Brice Goglin   Sun, 19 Jul 2009 21:57:50 +0200
 
 xserver-xorg-video-nv (1:2.1.13-1) unstable; urgency=low
 

commit c56b92149c6291e7ef96b30a4fc7bee30073b90c
Author: Aaron Plattner 
Date:   Thu Jul 2 12:03:13 2009 -0700

Bump to 2.1.14

diff --git a/configure.ac b/configure.ac
index bd26111..e67a1ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-nv],
-2.1.13,
+2.1.14,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-nv)
 

commit 05d2b851b96c2f1b3223f8d5f40b8ee074e5f23f
Author: Aaron Plattner 
Date:   Fri Jun 26 17:53:53 2009 -0700

More new

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

2009-05-04 Thread David Nusinow 
 debian/changelog   |8 
 debian/control |1 -
 debian/patches/01_gen_pci_ids.diff |   14 --
 debian/patches/series  |1 -
 debian/rules   |4 ++--
 5 files changed, 10 insertions(+), 18 deletions(-)

New commits:
commit f064ca086d51ad8606ec8f9e2f0b4a01972438b5
Author: David Nusinow 
Date:   Mon May 4 22:28:49 2009 -0400

Remove 01_gen_pci_ids.diff.

The X server now uses an internal table to choose a driver during
autoconfiguration.

Disable patch system and remove quilt from build-deps.

diff --git a/debian/changelog b/debian/changelog
index de1dfcf..ab55273 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-nv (1:2.1.13-2) UNRELEASED; urgency=low
+
+  * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
+choose a driver during autoconfiguration.
++ Disable patch system and remove quilt from build-deps.
+
+ -- David Nusinow   Mon, 04 May 2009 22:27:31 -0400
+
 xserver-xorg-video-nv (1:2.1.13-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 79ba5a9..d41b547 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: David Nusinow , Julien Cristau 
= 5.0.0),
  pkg-config,
- quilt,
  xserver-xorg-dev (>= 2:1.5.99.901),
  x11proto-video-dev,
  x11proto-core-dev,
diff --git a/debian/patches/01_gen_pci_ids.diff 
b/debian/patches/01_gen_pci_ids.diff
deleted file mode 100644
index 9abc542..000
--- a/debian/patches/01_gen_pci_ids.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: xserver-xorg-video-nv/src/Makefile.am
-===
 xserver-xorg-video-nv.orig/src/Makefile.am 2008-03-26 20:47:57.0 
-0400
-+++ xserver-xorg-video-nv/src/Makefile.am  2008-03-26 20:53:20.0 
-0400
-@@ -103,3 +103,9 @@
- EXTRA_nv_drv_la_SOURCES = local_xf86Rename.h
- nodist_nv_drv_la_SOURCES = $(xmode_sources)
- endif
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = nv.ids
-+
-+nv.ids : nv_driver.c
-+  awk '/{ 0x.*/ || /case 0x.*/ {print $$2}' ${srcdir}/nv_driver.c | sed 
-e s/0x// -e s/,// -e s/:// -e s/^0/10DE0/ | sort -u > nv.ids
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b55d79f..000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_gen_pci_ids.diff
diff --git a/debian/rules b/debian/rules
index a6599da..db163fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ endif
 # kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
 confflags += --disable-static
 
-configure: $(STAMP_DIR)/patch
+configure: 
dh_testdir
autoreconf -vfi
 
@@ -50,7 +50,7 @@ build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
>$@
 
-clean: xsfclean
+clean: 
dh_testdir
dh_testroot
rm -f build-stamp


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

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

2009-04-09 Thread Julien Cristau 
 ChangeLog  |  243 
 Makefile.am|4 
 Makefile.in|  688 -
 README |   20 
 README.NV1 |   42 
 aclocal.m4 | 8256 -
 compat/Makefile.in |  362 
 config.guess   | 1526 ---
 config.h.in|   69 
 config.sub | 1658 ---
 configure  |23140 -
 configure.ac   |2 
 debian/changelog   |   29 
 debian/control |   16 
 debian/rules   |   27 
 debian/xsfbs/repack.sh |   32 
 debian/xsfbs/xsfbs.mk  |   29 
 debian/xsfbs/xsfbs.sh  |   66 
 depcomp|  589 -
 install-sh |  519 -
 ltmain.sh  | 6964 --
 man/Makefile.in|  429 
 man/nv.man |2 
 missing|  367 
 mkinstalldirs  |  161 
 src/Makefile.in|  727 -
 src/g80_display.c  |5 
 src/g80_driver.c   |   21 
 src/g80_exa.c  |4 
 src/g80_output.c   |   13 
 src/g80_xaa.c  |   12 
 src/nv_dac.c   |   95 
 src/nv_driver.c|   34 
 src/nv_hw.c|   12 
 src/nv_setup.c |   20 
 src/nv_type.h  |   14 
 src/riva_dac.c |   78 
 src/riva_setup.c   |7 
 src/riva_type.h|   14 
 39 files changed, 567 insertions(+), 45729 deletions(-)

New commits:
commit 87eda80b744669ec9bfce6d31b136b724d873079
Author: Julien Cristau 
Date:   Thu Apr 9 10:42:50 2009 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 0c48145..de1dfcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-video-nv (1:2.1.13-1) UNRELEASED; urgency=low
+xserver-xorg-video-nv (1:2.1.13-1) unstable; urgency=low
 
   * New upstream release.
+  * Upload to unstable.
 
- -- Julien Cristau   Thu, 09 Apr 2009 10:41:22 +0100
+ -- Julien Cristau   Thu, 09 Apr 2009 10:42:43 +0100
 
 xserver-xorg-video-nv (1:2.1.12-2) experimental; urgency=low
 

commit a77e76aa65b7d45bcdf2bbd5420a8f761bac5548
Author: Julien Cristau 
Date:   Thu Apr 9 10:42:18 2009 +0100

update changelogs

diff --git a/ChangeLog b/ChangeLog
index 93447eb..d91d56d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,103 @@
+commit df87eaf191209b0f1619ea74dc9fb0314b6fd288
+Author: Adam Jackson 
+Date:   Tue Apr 7 13:40:36 2009 -0400
+
+nv 2.1.13
+
+commit c0cc7d1247798867c695aeddcffe88edacbb6c7c
+Author: Adam Jackson 
+Date:   Tue Apr 7 13:34:26 2009 -0400
+
+Remove README.NV1
+
+There's no nv1 support here, so.
+
+commit b278aca7d7b92b7fd62045d1aab44d78f694d608
+Author: Bryce Harrington 
+Date:   Thu Mar 12 16:56:57 2009 -0700
+
+Add missing pci id for GeForce 7100 GS
+
+Signed-off-by: Bryce Harrington 
+Signed-off-by: Aaron Plattner 
+
+commit 74758ef3b184a37d211572d0deb826bd30d0de13
+Author: Chris Ball 
+Date:   Fri Feb 27 10:55:11 2009 -0500
+
+Revert "Build fix: set EXA_DRIVER_KNOWN_MAJOR=3"
+
+This reverts commit 492513bf047f7660ef9fd32fda7ebc28704079be.
+The EXA developers have backed out this ABI bump.
+
+Signed-off-by: Chris Ball 
+
+commit 492513bf047f7660ef9fd32fda7ebc28704079be
+Author: Chris Ball 
+Date:   Tue Feb 24 23:44:47 2009 -0500
+
+Build fix: set EXA_DRIVER_KNOWN_MAJOR=3
+
+EXA in server HEAD requires this now.  Since this driver doesn't
+use {Prepare,Finish}Access or UploadToScratch, the change is safe.
+
+Signed-off-by: Chris Ball 
+
+commit b9140a510efa49b36973d02f1e110d33d22e653d
+Author: Aaron Plattner 
+Date:   Tue Feb 3 13:28:07 2009 -0800
+
+Add NV_/RIVA_ prefixes to fix build warnings.
+
+xserver commit 5e0967f5 pollutes the namespace by adding a "SetBit" macro 
to
+inputstr.h that conflicts with the preexisting ones in nv_type.h and
+riva_type.h.
+
+commit 3890a0aefc4c133999a10fad9d32745b635634ac
+Author: Alan Coopersmith 
+Date:   Fri Jan 30 20:43:04 2009 -0800
+
+Add README with pointers to mailing list, bugzilla & git repos
+
+commit 302ffbefb880afb7e297c4a41ed3c106b7623fdb
+Author: Alan Coopersmith 
+Date:   Fri Jan 9 16:31:55 2009 -0800
+
+Remove xorgconfig & xorgcfg from See Also list in man page
+
+commit 6c6511f4bd933410778e93429bd37e2f24b78618
+Author: Chris Ball 
+Date:   Mon Nov 3 20:08:32 2008 -0500
+
+Build fix, s/pNv->/pRiva->/.
+
+Fixes 52c034f5a41195f2b3193ec8c18b3f4ed7a763a3.
+
+commit 52c034f5a41195f2b3193ec8c18b3f4ed7a763a3
+Author: Adam Jackson 
+Date:   Mon Nov 3 15:01:58 2008 -0500
+
+Do E-EDID if built against a server that supports it.
+
+commit b5f33108fea77280c9acd219954f20401f760faf
+Author: Adam Jackson 
+Date:   Mon Oct 27 17:54:36 2008 -0400
+
+Adjust the nv34 panel tweak for Toshiba Tecra M2.
+
+commit e387bf31aae78d4447b4af555a8d09f79f72e6e7
+Author: Aaron Plattner 
+Date:   Fri Oct 17 20:45:18 2008 -0700
+
+Only match PCI display devices in our display driver.
+
+Apparently the server n

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

2008-07-13 Thread Julien Cristau 
 debian/changelog |6 +-
 debian/rules |2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit a82d5d421e4faaefd135f45cd4cc6ef646b883aa
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sun Jul 13 12:41:23 2008 +0200

Install README.G80 in the package.

diff --git a/debian/changelog b/debian/changelog
index 6b02778..b2995d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
-xserver-xorg-video-nv (1:2.1.10-2) unstable; urgency=low
+xserver-xorg-video-nv (1:2.1.10-2) UNRELEASED; urgency=low
 
+  [ Chris Lamb ]
   * Update copyright holders in debian/copyright.
 
+  [ Julien Cristau ]
+  * Install README.G80 in the package.
+
  -- Chris Lamb <[EMAIL PROTECTED]>  Thu, 03 Jul 2008 02:30:36 +0100
 
 xserver-xorg-video-nv (1:2.1.10-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 6da318f..66d4edf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,7 +70,7 @@ binary-arch: build install serverabi
dh_testdir
dh_testroot
 
-   dh_installdocs
+   dh_installdocs README.G80
dh_installchangelogs ChangeLog
dh_install --sourcedir=debian/tmp --list-missing --exclude=.la
dh_link


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

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

2008-07-02 Thread Chris Lamb 
 debian/changelog |6 ++
 debian/copyright |   52 +++-
 2 files changed, 41 insertions(+), 17 deletions(-)

New commits:
commit 31b9ad1e2724cb756dd515da49ed2f189f7972fe
Author: Chris Lamb <[EMAIL PROTECTED]>
Date:   Thu Jul 3 02:31:02 2008 +0100

Update copyright holders in debian/copyright.

diff --git a/debian/changelog b/debian/changelog
index 8ea9974..6b02778 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nv (1:2.1.10-2) unstable; urgency=low
+
+  * Update copyright holders in debian/copyright.
+
+ -- Chris Lamb <[EMAIL PROTECTED]>  Thu, 03 Jul 2008 02:30:36 +0100
+
 xserver-xorg-video-nv (1:2.1.10-1) unstable; urgency=low
 
   * New upstream release, closes: #484875.
diff --git a/debian/copyright b/debian/copyright
index 86b6bf3..4f59f86 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,23 +1,41 @@
 This package was downloaded from
 http://xorg.freedesktop.org/releases/individual/driver/
 
-Copyright (c) 2007 NVIDIA, Corporation
+  Copyright (C) 1993-2007 NVIDIA, Corporation
+  Copyright (C) 1994 X Consortium
+  Copyright (C) 1994, 1995, 1996 Video Electronics Standards
+  Copyright (C) 1996-1997 David J. McKay
+  Copyright (C) 1996 Stephen Early
+  Copyright (C) 1997 Mark Eichin
+  Copyright (C) 1997 Metro Link Incorporated
+  Copyright (C) 1998-2005, 2007 Branden Robinson
+  Copyright (C) 1999 The XFree86 Project Inc.
+  Copyright (C) 2001 Andy Ritger
+  Copyright (C) 2005 Adam Jackson
+  Copyright (C) 2005 David Nusinow
+  Copyright (C) 2005 Eugene Konev
+  Copyright (C) 2005 Sun Microsystems, Inc.
+  Copyright (C) 2005-2006 Luc Verhaegen.
+  Copyright (C) 2006 Keith Packard
+  Copyright (C) 2006 Intel Corporation
+  Copyright (C) 2006 Luc Verhaegen
+  Copyright (C) 2008 Red Hat, Inc.
 
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
 
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

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

2008-06-30 Thread Brice Goglin 
 configure|   20 +-
 configure.ac |2 
 debian/changelog |   10 +
 debian/control   |2 
 debian/rules |2 
 debian/xsfbs/xsfbs-autoreconf.mk |  150 ---
 debian/xsfbs/xsfbs.mk|  102 --
 debian/xsfbs/xsfbs.sh|  387 +--
 man/nv.man   |   21 +-
 src/g80_output.c |   62 +-
 src/g80_sor.c|   19 +
 src/g80_type.h   |5 
 src/nv_cursor.c  |   60 ++
 src/nv_dac.c |   60 ++
 src/nv_dma.h |   61 ++
 src/nv_driver.c  |   15 +
 src/nv_hw.c  |   60 ++
 src/nv_local.h   |   60 ++
 src/nv_setup.c   |   64 ++
 src/nv_xaa.c |   60 ++
 src/riva_hw.c|   60 ++
 src/riva_hw.h|   61 ++
 src/riva_local.h |   60 ++
 src/riva_tbl.h   |   60 ++
 src/riva_xaa.c   |   60 ++
 25 files changed, 604 insertions(+), 919 deletions(-)

New commits:
commit 87d6d4bf1ca91b0c71d3d148a673f75be4685e2a
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Tue Jul 1 07:18:09 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index a57f851..8ea9974 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-nv (1:2.1.10-1) UNRELEASED; urgency=low
+xserver-xorg-video-nv (1:2.1.10-1) unstable; urgency=low
 
   * New upstream release, closes: #484875.
   * Run dpkg-shlibdeps with --warnings=6.  Drivers reference symbols from
@@ -6,7 +6,7 @@ xserver-xorg-video-nv (1:2.1.10-1) UNRELEASED; urgency=low
 dpkg-shlibdeps to shut up about symbols it can't find.
 + Build-depend on dpkg-dev >= 1.14.17 for dpkg-shlibdeps --warnings.
 
- -- Brice Goglin <[EMAIL PROTECTED]>  Tue, 01 Jul 2008 07:12:56 +0200
+ -- Brice Goglin <[EMAIL PROTECTED]>  Tue, 01 Jul 2008 07:18:05 +0200
 
 xserver-xorg-video-nv (1:2.1.9-1) unstable; urgency=low
 

commit ba06480955235ed31f7481ea6fc993fc050c88db
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Tue Jul 1 07:13:26 2008 +0200

Run dpkg-shlibdeps with --warnings=6

Drivers reference symbols from /usr/bin/Xorg and other modules, and
that's not a bug, so we want dpkg-shlibdeps to shut up about symbols it
can't find.

Build-depend on dpkg-dev >= 1.14.17 for dpkg-shlibdeps --warnings.

diff --git a/debian/changelog b/debian/changelog
index 39c4c24..a57f851 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 xserver-xorg-video-nv (1:2.1.10-1) UNRELEASED; urgency=low
 
   * New upstream release, closes: #484875.
+  * Run dpkg-shlibdeps with --warnings=6.  Drivers reference symbols from
+/usr/bin/Xorg and other modules, and that's not a bug, so we want
+dpkg-shlibdeps to shut up about symbols it can't find.
++ Build-depend on dpkg-dev >= 1.14.17 for dpkg-shlibdeps --warnings.
 
- -- Brice Goglin <[EMAIL PROTECTED]>  Tue, 01 Jul 2008 06:58:56 +0200
+ -- Brice Goglin <[EMAIL PROTECTED]>  Tue, 01 Jul 2008 07:12:56 +0200
 
 xserver-xorg-video-nv (1:2.1.9-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 96e8cbe..041f68e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL 
PROTECTED]>, Brice Goglin <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 
2:1.4), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, 
x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev
+Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 
2:1.4), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, 
x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev, dpkg-dev 
(>= 1.14.17)
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nv
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-nv.git
diff --git a/debian/rules b/debian/rules
index 83828c4..6da318f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,7 +78,7 @@ binary-arch: build install serverabi
dh_compress
dh_fixperms
dh_installdeb
-   dh_shlibdeps
+   dh_shlibdeps -- --warnings=6
dh_gencontrol
dh_md5sums
dh_builddeb

commit 5db7f93ee1a226396c960b6e5a603a6a83dbfcba
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Tue Jul 1 07:01:26 2008 +0200

New upstream release

diff --git a/configure b/configure
index 93d3080..e649f76 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables a

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

2008-05-10 Thread Brice Goglin 
 ChangeLog |   60 ++
 aclocal.m4|2 -
 configure |   20 +-
 configure.ac  |2 -
 debian/changelog  |6 +
 ltmain.sh |2 -
 man/Makefile.am   |1 
 man/Makefile.in   |1 
 man/nv.man|4 +++
 src/g80_dac.c |2 -
 src/g80_display.c |8 +++
 src/g80_driver.c  |   17 +--
 src/g80_output.c  |4 +++
 src/g80_sor.c |7 +++---
 src/g80_type.h|1 
 src/nv_driver.c   |   37 +
 16 files changed, 131 insertions(+), 43 deletions(-)

New commits:
commit 5cb93615a7b30e51f8796d245bb4ba2bb41446e8
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Sat May 10 16:23:08 2008 +0200

New upstream release

diff --git a/ChangeLog b/ChangeLog
index 220ef60..58afb75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,63 @@
+commit cca0a00c89730c8338af44e62438babc93f078fb
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Fri May 9 18:45:46 2008 -0700
+
+Bump to 2.1.9.
+
+commit 9c98d2ca942049322688b5796a2ed041fd48282d
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Fri May 9 18:44:57 2008 -0700
+
+Yet more G80s.
+
+Sometimes I wish we made fewer products.
+
+commit cb83fbdfa22aa408e6692256cd44b78fef53e801
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Fri May 9 18:31:07 2008 -0700
+
+Add an option to allow validation of dual-link DVI modes.
+
+These modes don't work at bootup (i.e. power saving) configuration on all 
GPUs,
+so they're still disabled by default.  This option allows users to enable 
them
+in case they actually work.
+
+commit 8db2d4e63508f59299098e092ae85e543cf61d03
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Sun Apr 27 16:23:40 2008 -0700
+
+More G80s.
+
+commit 4aa43a2b66e473f9154f1582f5cf0e4b4596e485
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Sun Apr 27 16:23:28 2008 -0700
+
+Fix a few startup bugs.
+
+commit 0ddee2347109e8c64bd2cb4693b97c3fa3aab94b
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Tue Mar 25 16:35:05 2008 -0700
+
+Sort the IsSupported table.
+
+commit c0c7d610800161976fd7dce064beae05d2d4195b
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Mon Apr 28 14:43:12 2008 -0700
+
+I win at C.
+
+commit b62a7cf70db356918aa04fb3f30bf1fd1142b9d5
+Author: Matthieu Herrb <[EMAIL PROTECTED]>
+Date:   Sat Mar 8 23:43:58 2008 +0100
+
+Makefile.am: nuke RCS Id
+
+commit f88ef390985babdb2b489cf52bfa587e1879db38
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Fri Mar 7 12:32:40 2008 -0800
+
+Bug #14885: Add missing static keywords.
+
 commit 4965498f238fbe3d8a0d0b84bf8bceb9237e472a
 Author: Aaron Plattner <[EMAIL PROTECTED]>
 Date:   Thu Mar 6 13:53:54 2008 -0800
diff --git a/aclocal.m4 b/aclocal.m4
index ef947f1..62b902b 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -21,7 +21,7 @@ To do so, use the procedure documented by the package, 
typically `autoreconf'.])
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
diff --git a/configure b/configure
index eaa73e9..93d3080 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-video-nv 2.1.8.
+# Generated by GNU Autoconf 2.61 for xf86-video-nv 2.1.9.
 #
 # Report bugs to .
 #
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='xf86-video-nv'
 PACKAGE_TARNAME='xf86-video-nv'
-PACKAGE_VERSION='2.1.8'
-PACKAGE_STRING='xf86-video-nv 2.1.8'
+PACKAGE_VERSION='2.1.9'
+PACKAGE_STRING='xf86-video-nv 2.1.9'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 ac_unique_file="Makefile.am"
@@ -1425,7 +1425,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xf86-video-nv 2.1.8 to adapt to many kinds of systems.
+\`configure' configures xf86-video-nv 2.1.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1495,7 +1495,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-nv 2.1.8:";;
+ short | recursive ) echo "Configuration of xf86-video-nv 2.1.9:";;
esac
   cat <<\_ACEOF
 
@@ -1613,7 +1613,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xf86-video-nv configure 2.1.8
+xf86-video-nv configure 2.1.9
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1627,7 +1627,7 @@ ca

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

2008-03-27 Thread Julien Cristau 
 debian/changelog |8 ++--
 debian/control   |4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 2642ab966c9ea65274a53413fbc6090f142aadfd
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Thu Mar 27 22:12:45 2008 +0100

Prepare changelog for upload.

diff --git a/debian/changelog b/debian/changelog
index 68c653c..21b8117 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-nv (1:2.1.8-3) UNRELEASED; urgency=low
+xserver-xorg-video-nv (1:2.1.8-3) unstable; urgency=low
 
   [ Timo Aaltonen ]
   * Fix the PCI ID one-liner to use 'sort -u'.
@@ -6,7 +6,7 @@ xserver-xorg-video-nv (1:2.1.8-3) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Drop the XS- prefix from Vcs-* control fields.
 
- -- Timo Aaltonen <[EMAIL PROTECTED]>  Thu, 27 Mar 2008 19:14:49 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]>  Thu, 27 Mar 2008 22:12:36 +0100
 
 xserver-xorg-video-nv (1:2.1.8-2) unstable; urgency=low
 

commit b96b418e22fa151354b05bbc5a142ef85ed339dc
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Thu Mar 27 22:10:07 2008 +0100

Drop the XS- prefix from Vcs-* control fields.

diff --git a/debian/changelog b/debian/changelog
index 799de35..68c653c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 xserver-xorg-video-nv (1:2.1.8-3) UNRELEASED; urgency=low
 
+  [ Timo Aaltonen ]
   * Fix the PCI ID one-liner to use 'sort -u'.
 
+  [ Julien Cristau ]
+  * Drop the XS- prefix from Vcs-* control fields.
+
  -- Timo Aaltonen <[EMAIL PROTECTED]>  Thu, 27 Mar 2008 19:14:49 +0200
 
 xserver-xorg-video-nv (1:2.1.8-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index de2eb68..96e8cbe 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Debian X Strike Force 
 Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL 
PROTECTED]>, Brice Goglin <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 
2:1.4), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, 
x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev
 Standards-Version: 3.7.3
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nv
-XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-nv.git
+Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nv
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-nv.git
 
 Package: xserver-xorg-video-nv
 Architecture: any


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

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

2008-03-27 Thread Timo Aaltonen 
 debian/changelog   |6 ++
 debian/patches/01_gen_pci_ids.diff |2 +-
 src/Makefile.in|2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit b4d526c9337269813136990b1aa801d32c80fcbc
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date:   Thu Mar 27 19:16:10 2008 +0200

Fix the PCI ID one-liner to use 'sort -u'.

diff --git a/debian/changelog b/debian/changelog
index e7e569d..799de35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nv (1:2.1.8-3) UNRELEASED; urgency=low
+
+  * Fix the PCI ID one-liner to use 'sort -u'.
+
+ -- Timo Aaltonen <[EMAIL PROTECTED]>  Thu, 27 Mar 2008 19:14:49 +0200
+
 xserver-xorg-video-nv (1:2.1.8-2) unstable; urgency=low
 
   * Add patch from Timo Aaltonen to include some missing PCI ID's
diff --git a/debian/patches/01_gen_pci_ids.diff 
b/debian/patches/01_gen_pci_ids.diff
index f23512d..9abc542 100644
--- a/debian/patches/01_gen_pci_ids.diff
+++ b/debian/patches/01_gen_pci_ids.diff
@@ -11,4 +11,4 @@ Index: xserver-xorg-video-nv/src/Makefile.am
 +pcidata_DATA = nv.ids
 +
 +nv.ids : nv_driver.c
-+  awk '/{ 0x.*/ || /case 0x.*/ {print $$2}' ${srcdir}/nv_driver.c | sed 
-e s/0x// -e s/,// -e s/:// -e s/^0/10DE0/ | uniq | sort > nv.ids
++  awk '/{ 0x.*/ || /case 0x.*/ {print $$2}' ${srcdir}/nv_driver.c | sed 
-e s/0x// -e s/,// -e s/:// -e s/^0/10DE0/ | sort -u > nv.ids
diff --git a/src/Makefile.in b/src/Makefile.in
index 09b6902..c8ad228 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -721,7 +721,7 @@ uninstall-am: uninstall-nv_drv_laLTLIBRARIES 
uninstall-pcidataDATA
 
 
 nv.ids : nv_driver.c
-   awk '/{ 0x.*/ || /case 0x.*/ {print $$2}' ${srcdir}/nv_driver.c | sed 
-e s/0x// -e s/,// -e s/:// -e s/^0/10DE0/ | uniq | sort > nv.ids
+   awk '/{ 0x.*/ || /case 0x.*/ {print $$2}' ${srcdir}/nv_driver.c | sed 
-e s/0x// -e s/,// -e s/:// -e s/^0/10DE0/ | sort -u > nv.ids
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

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

2008-03-27 Thread Julien Cristau 
 debian/changelog   |8 
 debian/control |2 +-
 debian/patches/01_gen_pci_ids.diff |8 
 debian/rules   |2 +-
 src/Makefile.in|2 +-
 5 files changed, 15 insertions(+), 7 deletions(-)

New commits:
commit 3c30b7bbec1f310739ab4bf3f8a1e8d24a782296
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Wed Mar 26 21:01:01 2008 -0400

Exclude .la files on dh_install

diff --git a/debian/changelog b/debian/changelog
index 2d2a3d3..e7e569d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-video-nv (1:2.1.8-2) unstable; urgency=low
 
   * Add patch from Timo Aaltonen to include some missing PCI ID's
   * Bump standards version to 3.7.3. No changes needed.
+  * Exclude .la files on dh_install
 
- -- David Nusinow <[EMAIL PROTECTED]>  Wed, 26 Mar 2008 20:58:15 -0400
+ -- David Nusinow <[EMAIL PROTECTED]>  Wed, 26 Mar 2008 20:59:15 -0400
 
 xserver-xorg-video-nv (1:2.1.8-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 035a8f9..83828c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,7 +72,7 @@ binary-arch: build install serverabi
 
dh_installdocs
dh_installchangelogs ChangeLog
-   dh_install --sourcedir=debian/tmp --list-missing
+   dh_install --sourcedir=debian/tmp --list-missing --exclude=.la
dh_link
dh_strip
dh_compress

commit 77b030506b5420bd02dd530974106a8fa83865bc
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Wed Mar 26 20:58:31 2008 -0400

Bump standards version to 3.7.3. No changes needed.

diff --git a/debian/changelog b/debian/changelog
index bea52b9..2d2a3d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 xserver-xorg-video-nv (1:2.1.8-2) unstable; urgency=low
 
   * Add patch from Timo Aaltonen to include some missing PCI ID's
+  * Bump standards version to 3.7.3. No changes needed.
 
- -- David Nusinow <[EMAIL PROTECTED]>  Wed, 26 Mar 2008 20:45:29 -0400
+ -- David Nusinow <[EMAIL PROTECTED]>  Wed, 26 Mar 2008 20:58:15 -0400
 
 xserver-xorg-video-nv (1:2.1.8-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 58bc5f8..de2eb68 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL 
PROTECTED]>, Brice Goglin <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 
2:1.4), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, 
x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev
-Standards-Version: 3.7.2.2
+Standards-Version: 3.7.3
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nv
 XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-nv.git
 

commit bf169df1557ded8a8277665f6fa7b52b74bf40d6
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Wed Mar 26 20:57:16 2008 -0400

Add patch from Timo Aaltonen to include some missing PCI ID's

diff --git a/debian/changelog b/debian/changelog
index a7796e5..bea52b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nv (1:2.1.8-2) unstable; urgency=low
+
+  * Add patch from Timo Aaltonen to include some missing PCI ID's
+
+ -- David Nusinow <[EMAIL PROTECTED]>  Wed, 26 Mar 2008 20:45:29 -0400
+
 xserver-xorg-video-nv (1:2.1.8-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/01_gen_pci_ids.diff 
b/debian/patches/01_gen_pci_ids.diff
index 5b1fe10..f23512d 100644
--- a/debian/patches/01_gen_pci_ids.diff
+++ b/debian/patches/01_gen_pci_ids.diff
@@ -1,8 +1,8 @@
 Index: xserver-xorg-video-nv/src/Makefile.am
 ===
 xserver-xorg-video-nv.orig/src/Makefile.am 2007-08-19 12:15:48.0 
-0400
-+++ xserver-xorg-video-nv/src/Makefile.am  2007-08-19 12:16:58.0 
-0400
-@@ -104,3 +104,9 @@
+--- xserver-xorg-video-nv.orig/src/Makefile.am 2008-03-26 20:47:57.0 
-0400
 xserver-xorg-video-nv/src/Makefile.am  2008-03-26 20:53:20.0 
-0400
+@@ -103,3 +103,9 @@
  EXTRA_nv_drv_la_SOURCES = local_xf86Rename.h
  nodist_nv_drv_la_SOURCES = $(xmode_sources)
  endif
@@ -11,4 +11,4 @@ Index: xserver-xorg-video-nv/src/Makefile.am
 +pcidata_DATA = nv.ids
 +
 +nv.ids : nv_driver.c
-+  awk '/{ 0x.*/ {print $$2}' ${srcdir}/nv_driver.c | sed -e s/0x// -e 
s/,// > nv.ids
++  awk '/{ 0x.*/ || /case 0x.*/ {print $$2}' ${srcdir}/nv_driver.c | sed 
-e s/0x// -e s/,// -e s/:// -e s/^0/10DE0/ | uniq | sort > nv.ids
diff --git a/src/Makefile.in b/src/Makefile.in
index 5cc8fe1..09b6902 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -721,7 +721,7 @@ uninstall-am: uninstall-nv_drv_laLTLIBRARIES 
uninstall-pcidataDATA
 
 
 nv.ids : nv_driver.c
-   awk '/{ 0x.*/ {print $$2}' ${srcdir}/nv_driver.c | sed -e s/0

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

2008-03-10 Thread Brice Goglin 
 ChangeLog  |   41 ++
 Makefile.in|   49 +--
 aclocal.m4 |  265 +++---
 compat/Makefile.am |1 
 compat/Makefile.in |7 
 config.guess   |   32 +-
 config.sub |   44 ++-
 configure  |  770 +++--
 configure.ac   |2 
 debian/changelog   |6 
 depcomp|   33 +-
 install-sh |  228 ---
 ltmain.sh  |   58 ++-
 man/Makefile.in|6 
 src/Makefile.am|1 
 src/Makefile.in|   41 +-
 src/g80_output.c   |   86 +++--
 src/g80_sor.c  |6 
 src/nv_driver.c|   12 
 19 files changed, 1173 insertions(+), 515 deletions(-)

New commits:
commit b00c07fd4cf48845f1cb2ee2f125c59bb3a8ea2f
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Mon Mar 10 23:22:44 2008 +0100

New upstream release

diff --git a/ChangeLog b/ChangeLog
index 56fed8c..220ef60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+commit 4965498f238fbe3d8a0d0b84bf8bceb9237e472a
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Thu Mar 6 13:53:54 2008 -0800
+
+Bump to 2.1.8.
+
+commit 806331f411df991dcd1a48108f9ff4e9bb480969
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Thu Mar 6 14:31:16 2008 -0800
+
+Add xf86gtf.c to the compat file list.
+
+commit 09d154246ab55846878e34bc133b08c11765c45b
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Thu Mar 6 12:40:23 2008 -0800
+
+More new chip names.
+
+commit fa97c4c2c69f91ac5a034ef2f62287b7cd5b2bde
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Tue Feb 26 12:24:05 2008 -0800
+
+GeForce 9600 GT.
+
+Note that the 9600 GT should already work in 2.1.7.  This change just adds 
its
+name to the list.
+
+commit a87b93d5c5b4d1a65a60dad271b06a2d560b71b8
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Tue Feb 19 14:17:57 2008 -0800
+
+G80: Fix connector mapping and TMDS initialization on certain GPUs.
+
+commit 3f2a1898fedbada151da31fc163ae54daac0e896
+Author: Søren Sandmann Pedersen <[EMAIL PROTECTED]>
+Date:   Wed Feb 13 10:43:28 2008 -0800
+
+[PATCH] Bug #14484: Fix G80SorSetProperty return value.
+
+Signed-off-by: Aaron Plattner <[EMAIL PROTECTED]>
+
 commit f8b24e5c729c9d3321282b065f4ef79b177f928d
 Author: Aaron Plattner <[EMAIL PROTECTED]>
 Date:   Fri Jan 25 18:23:48 2008 -0800
diff --git a/Makefile.in b/Makefile.in
index 0fe9353..ba191a7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -116,6 +116,7 @@ DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DRIVER_NAME = @DRIVER_NAME@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -145,6 +146,7 @@ MAKEINFO = @MAKEINFO@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -362,8 +364,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  done | \
- $(AWK) '{ files[$$0] = 1; } \
-  END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
 tags: TAGS
 
@@ -388,8 +390,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in 
$(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  done | \
- $(AWK) '{ files[$$0] = 1; } \
-  END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
  test -n "$$unique" || unique=$$empty_fix; \
  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -399,13 +401,12 @@ ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
-   here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  done | \
- $(AWK) '

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

2008-01-26 Thread Brice Goglin 
 ChangeLog |   81 ++
 aclocal.m4|2 -
 configure |   20 ++---
 configure.ac  |2 -
 debian/changelog  |8 +
 ltmain.sh |2 -
 man/nv.man|2 -
 src/g80_dac.c |   11 +++
 src/g80_output.c  |   38 +
 src/g80_sor.c |4 +-
 src/g80_type.h|1 
 src/nv_const.h|4 ++
 src/nv_cursor.c   |6 ++--
 src/nv_driver.c   |   23 ---
 src/riva_cursor.c |4 +-
 15 files changed, 177 insertions(+), 31 deletions(-)

New commits:
commit 8139095ce6ff57ce4db6f698c69c74fac267dc50
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Sat Jan 26 12:39:59 2008 +0100

New upstream release

diff --git a/ChangeLog b/ChangeLog
index 08dff5f..56fed8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,84 @@
+commit f8b24e5c729c9d3321282b065f4ef79b177f928d
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Fri Jan 25 18:23:48 2008 -0800
+
+Bump to 2.1.7.
+
+commit d2367140ad1fe96bce5e780332d21999e5aa31bf
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Fri Jan 25 18:15:12 2008 -0800
+
+Fix warning.
+
+commit e844f10c7b5e41330f2bcb884ab448641dd5bb06
+Author: Giuseppe Bilotta <[EMAIL PROTECTED]>
+Date:   Thu Sep 27 00:22:04 2007 +0200
+
+[PATCH] Enable backlight toggling for Dell Inspiron 8200 GeForce2 Go
+
+GeForce2 Go and similar cards are explicitly excluded from the
+NVBacklightEnable() code (purposedly, as the code used for the other
+chipsets on x86 has no effect.) This causes the backlight to remain
+active on laptops equipped with such a card, even when DPMS modes were
+active.
+
+Fix the issue for Dell Inspiron 8200 by introducing the proper
+registry writes to toggle the backlight.
+
+Signed-off-by: Giuseppe Bilotta <[EMAIL PROTECTED]>
+Signed-off-by: Aaron Plattner <[EMAIL PROTECTED]>
+
+commit 02e431eb0969cabb67f3e4b1cb1a2d7fc5f697f0
+Author: Giuseppe Bilotta <[EMAIL PROTECTED]>
+Date:   Thu Sep 27 00:08:28 2007 +0200
+
+[PATCH] Add macros to retrieve the subsystem vendor/device
+
+Signed-off-by: Giuseppe Bilotta <[EMAIL PROTECTED]>
+Signed-off-by: Aaron Plattner <[EMAIL PROTECTED]>
+
+commit 3449da7a7baf7365c247caa9b4344316a961ec41
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Thu Jan 24 20:51:29 2008 -0800
+
+Update know card list date and add G92 to the manpage.
+
+commit 62ff129257161db99dc4056cf16aa196ccfbc921
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Wed Jan 23 21:32:51 2008 -0800
+
+Fix more load detection false positives.
+
+commit 28f34db87cefdc6b327a98db43da5b4fefe3bdd8
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Wed Jan 23 20:23:32 2008 -0800
+
+New chips.
+
+commit 64721629c3908556fcf8c9941feea1e3b961bf00
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Sat Dec 1 16:02:37 2007 -0800
+
+G80Create{Dac,Sor} return pointers, not Bools.
+
+commit 7f281be7e53ac274016a6af6b2b5dc6f8bddb810
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Fri Nov 30 17:37:20 2007 -0800
+
+Bug #7309: Delay after disabling cursor to avoid wedging the cursor 
hardware on GeForce 6150.
+
+commit 100f5e24da2cbc79ed761083daa9a00b107008ab
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date:   Mon Nov 26 13:14:40 2007 -0800
+
+xcalloc needs 2 args, Xcalloc takes one - yay for inconsistency!
+
+commit e9ada35b4d24abd44bc5d811b59c6f25af5984f4
+Author: Ian Romanick <[EMAIL PROTECTED]>
+Date:   Wed Nov 21 15:35:06 2007 -0800
+
+Build fix for recent removal of ALLOCATE_LOCAL and DEALLOCATE_LOCAL
+
 commit d483ecd851bb84014f1fa86f0ada4540b3ad801e
 Author: Aaron Plattner <[EMAIL PROTECTED]>
 Date:   Tue Nov 13 17:18:10 2007 -0800
diff --git a/aclocal.m4 b/aclocal.m4
index cdb0a74..2ab5fdd 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -18,7 +18,7 @@ you should regenerate the build system entirely.], [63])])
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL
+# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
diff --git a/configure b/configure
index 6d65ed1..c1be141 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-video-nv 2.1.6.
+# Generated by GNU Autoconf 2.61 for xf86-video-nv 2.1.7.
 #
 # Report bugs to .
 #
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='xf86-video-nv'
 PACKAGE_TARNAME='xf86-video-nv'
-PACKAGE_VERSION='2.1.6'
-PACKAGE_STRING='xf86-video-nv 2.1.6'
+PACKAGE_VERSION='2.1.7'
+PACKAGE_STRING='xf86-video-nv 2.1.7'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 ac_unique_file="Makefile.am"
@@ -1423,7 +1423,7 @@ if test "$ac_init_h

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

2007-11-18 Thread Brice Goglin 
 ChangeLog |   36 +
 configure |   20 ++---
 configure.ac  |2 
 debian/changelog  |9 ++
 src/Makefile.am   |2 
 src/Makefile.in   |2 
 src/g80_dac.c |6 +
 src/g80_display.c |   11 ++-
 src/g80_sor.c |   48 +
 src/nv_driver.c   |2 
 src/nvreg.h   |  195 --
 src/nvvga.h   |   80 --
 12 files changed, 106 insertions(+), 307 deletions(-)

New commits:
commit fbf15f65e651c6b157523d094eabb54834218c51
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Sun Nov 18 12:26:58 2007 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 31b41d4..d3074db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-nv (1:2.1.6-1) UNRELEASED; urgency=low
+xserver-xorg-video-nv (1:2.1.6-1) unstable; urgency=low
 
   * New upstream release.
 + Pull upstream commits up to d483ecd851bb84014f1fa86f0ada4540b3ad801e
   for 8800 GT support and one bug fix.
 + Unwedge the hardware if the BIOS left it stuck, closes: #444743.
 
- -- Brice Goglin <[EMAIL PROTECTED]>  Sun, 18 Nov 2007 12:19:55 +0100
+ -- Brice Goglin <[EMAIL PROTECTED]>  Sun, 18 Nov 2007 12:26:47 +0100
 
 xserver-xorg-video-nv (1:2.1.5-1) unstable; urgency=low
 

commit e0d499c7b0876a0033e15371ef3428e1fd8892aa
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Sun Nov 18 12:23:31 2007 +0100

New upstream release

diff --git a/ChangeLog b/ChangeLog
index c065d02..08dff5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+commit d483ecd851bb84014f1fa86f0ada4540b3ad801e
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Tue Nov 13 17:18:10 2007 -0800
+
+G80: Reduce load detection false positives.
+
+commit 4da88cb3dd13a86c477389c5b2d42d7d40ce2023
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Fri Nov 2 16:56:35 2007 -0700
+
+GeForce 8800 GT.
+
+commit 58dbd31953d0e2f30d06b3fc5118a016a17666fe
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Tue Oct 23 13:17:27 2007 -0700
+
+Bump to 2.1.6.
+
+commit 0887084730af8428e902dabc6e00c505f383f57f
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Sun Oct 14 14:15:07 2007 -0700
+
+G80 bug #12397: Fix LVDS detection on certain laptops.
+
+commit 1003bcbe4381201f1d7b34dc1af72f57b2943b67
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Sat Oct 13 14:36:49 2007 -0700
+
+G80 bug #12637: Unwedge the hardware if the BIOS left it stuck.
+
+commit 1e12277650dff10b1083915cb73961525e21a471
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Sat Oct 13 13:50:04 2007 -0700
+
+Remove unused headers.
+
 commit 7a124edd1fcc0be6bdad489b0e8d7db3efe44b14
 Author: Aaron Plattner <[EMAIL PROTECTED]>
 Date:   Fri Sep 21 18:55:21 2007 -0700
diff --git a/configure b/configure
index 3e739fd..6d65ed1 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-video-nv 2.1.5.
+# Generated by GNU Autoconf 2.61 for xf86-video-nv 2.1.6.
 #
 # Report bugs to .
 #
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='xf86-video-nv'
 PACKAGE_TARNAME='xf86-video-nv'
-PACKAGE_VERSION='2.1.5'
-PACKAGE_STRING='xf86-video-nv 2.1.5'
+PACKAGE_VERSION='2.1.6'
+PACKAGE_STRING='xf86-video-nv 2.1.6'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 ac_unique_file="Makefile.am"
@@ -1423,7 +1423,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xf86-video-nv 2.1.5 to adapt to many kinds of systems.
+\`configure' configures xf86-video-nv 2.1.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1493,7 +1493,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-nv 2.1.5:";;
+ short | recursive ) echo "Configuration of xf86-video-nv 2.1.6:";;
esac
   cat <<\_ACEOF
 
@@ -1611,7 +1611,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xf86-video-nv configure 2.1.5
+xf86-video-nv configure 2.1.6
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1625,7 +1625,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xf86-video-nv $as_me 2.1.5, which was
+It was created by xf86-video-nv $as_me 2.1.6, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2320,7 +2320,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xf86

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

2007-09-22 Thread Julien Cristau 
 .gitignore|1 
 ChangeLog |   50 +
 Makefile.in   |2 
 compat/Makefile.in|2 
 config.guess  |6 -
 config.sub|   10 +
 configure |  258 +++---
 configure.ac  |   14 ++
 debian/changelog  |6 +
 debian/xsfbs/xsfbs.sh |7 -
 man/Makefile.in   |2 
 src/Makefile.in   |2 
 src/g80_display.c |1 
 src/g80_driver.c  |   58 ++-
 src/g80_output.c  |   30 -
 src/g80_type.h|8 +
 src/nv_const.h|   13 ++
 src/nv_driver.c   |  223 +++
 src/nv_hw.c   |   26 +++--
 src/nv_setup.c|   33 +-
 src/nv_type.h |4 
 src/riva_driver.c |   49 ++---
 src/riva_setup.c  |   56 +-
 src/riva_type.h   |4 
 24 files changed, 690 insertions(+), 175 deletions(-)

New commits:
commit 026164f17174e6037c623e483ffac1d27534bdc3
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sat Sep 22 09:54:32 2007 +0200

Prepare changelog for upload.

diff --git a/debian/changelog b/debian/changelog
index 5197eca..fa5ef03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-nv (1:2.1.5-1) UNRELEASED; urgency=low
+xserver-xorg-video-nv (1:2.1.5-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Julien Cristau <[EMAIL PROTECTED]>  Sat, 22 Sep 2007 09:37:19 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]>  Sat, 22 Sep 2007 09:54:06 +0200
 
 xserver-xorg-video-nv (1:2.1.3-5) unstable; urgency=low
 

commit 88d43d8181e9d569ebdf5a90f9ad39e5ac048ad7
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sat Sep 22 09:45:34 2007 +0200

New upstream release

Update changelogs and autoreconf

diff --git a/ChangeLog b/ChangeLog
index c2920a8..c065d02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,53 @@
+commit 7a124edd1fcc0be6bdad489b0e8d7db3efe44b14
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Fri Sep 21 18:55:21 2007 -0700
+
+Bump to 2.1.5.
+
+commit fee39378ee291a715c607b8600c5380dfa80d97e
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Fri Sep 21 15:08:46 2007 -0700
+
+Fix stupid, stupid typos reported by Alan Coopersmith.
+
+Thanks!
+
+commit 5ca45e600dcea17dba7cf078de49aef3821ea687
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Fri Sep 21 12:16:56 2007 -0700
+
+Bump to 2.1.4.
+
+commit e58504defab08492cc60c36d5dae4f5c4c8c1caa
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Mon Sep 17 15:44:52 2007 -0700
+
+Fix uninitialized variable warning.
+
+commit 5b56964a29b326d28bcf3a51e98443d426df58bd
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Mon Sep 17 15:41:26 2007 -0700
+
+New products.
+
+commit deff2965ef35260b4b7c4bc23718833bec7143b3
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Mon Sep 17 01:12:02 2007 -0700
+
+libpciaccess support.
+
+commit b2db7d414400d80a5567d71eed9a7e94f1043a20
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Tue Sep 11 22:51:20 2007 -0700
+
+G80: Fix LVDS detection on some laptops.
+
+commit 07fb9f0b00fafe18bd33bddff23cbb4325eb50f8
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Mon Aug 27 12:12:44 2007 -0700
+
+Add release.sh to .gitignore.
+
 commit 69f7a57cd9baabbbee7b7665c3c2c2b91c056a04
 Author: Aaron Plattner <[EMAIL PROTECTED]>
 Date:   Wed Aug 15 17:12:11 2007 -0700
diff --git a/Makefile.in b/Makefile.in
index b501412..0fe9353 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -153,6 +153,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
+PCIACCESS_LIBS = @PCIACCESS_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 SED = @SED@
diff --git a/compat/Makefile.in b/compat/Makefile.in
index bd13214..be77697 100644
--- a/compat/Makefile.in
+++ b/compat/Makefile.in
@@ -106,6 +106,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
+PCIACCESS_LIBS = @PCIACCESS_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 SED = @SED@
diff --git a/config.guess b/config.guess
index 0f0fe71..278f9e9 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2007-03-06'
+timestamp='2007-07-22'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -330,7 +330,7 @@ case 
"${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
-i86pc:SunOS:5.*:*)
+i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)

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

2007-09-16 Thread David Nusinow 
 debian/changelog |   31 
 debian/control   |4 +--
 debian/copyright |3 ++
 debian/patches/01_gen_pci_ids.diff   |   14 ++
 debian/patches/series|1 
 debian/rules |4 +--
 debian/xserver-xorg-video-nv.install |1 
 src/Makefile.in  |   45 ---
 8 files changed, 90 insertions(+), 13 deletions(-)

New commits:
commit 0a41db100c7b562895b82516ff9a974532e3c83f
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sun Sep 16 16:18:38 2007 -0400

* Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index b1115c6..cb40e69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nv (1:2.1.3-5) unstable; urgency=low
+
+  * Upload to unstable
+
+ -- David Nusinow <[EMAIL PROTECTED]>  Sun, 16 Sep 2007 15:43:46 -0400
+
 xserver-xorg-video-nv (1:2.1.3-4) experimental; urgency=low
 
   * Build against xserver 1.4.

commit 3d0a32f0567a5304ad725563e5093efb7e5b3f3b
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Thu Sep 13 23:02:48 2007 +0200

Build against xserver 1.4

diff --git a/debian/changelog b/debian/changelog
index 1313fd6..b1115c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-nv (1:2.1.3-4) experimental; urgency=low
+
+  * Build against xserver 1.4.
+  * Add upstream URL to debian/copyright.
+  * Add myself to Uploaders.
+
+ -- Brice Goglin <[EMAIL PROTECTED]>  Thu, 13 Sep 2007 23:00:29 +0200
+
 xserver-xorg-video-nv (1:2.1.3-3) experimental; urgency=low
 
   * Add quilt to build-depends
diff --git a/debian/control b/debian/control
index b2637ad..58bc5f8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: xserver-xorg-video-nv
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
-Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL 
PROTECTED]>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 
2:1.3.99.0), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, 
x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev
+Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL 
PROTECTED]>, Brice Goglin <[EMAIL PROTECTED]>
+Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 
2:1.4), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, 
x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev
 Standards-Version: 3.7.2.2
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nv
 XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-nv.git
diff --git a/debian/copyright b/debian/copyright
index cad7191..86b6bf3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,6 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
 Copyright (c) 2007 NVIDIA, Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a

commit 3e445c51d9308ed3bae7e986cc09190ee7f6531b
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sun Aug 19 15:03:11 2007 -0400

Add quilt to build-depends

diff --git a/debian/changelog b/debian/changelog
index e803338..1313fd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nv (1:2.1.3-3) experimental; urgency=low
+
+  * Add quilt to build-depends
+
+ -- David Nusinow <[EMAIL PROTECTED]>  Sun, 19 Aug 2007 15:02:48 -0400
+
 xserver-xorg-video-nv (1:2.1.3-2) experimental; urgency=low
 
   * Build against X server 1.3.99.0 (build-dep on it)
diff --git a/debian/control b/debian/control
index 58d6478..b2637ad 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL 
PROTECTED]>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 
2:1.3.99.0), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, 
x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev
+Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 
2:1.3.99.0), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, 
x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev
 Standards-Version: 3.7.2.2
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nv
 XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-nv.git

commit 67b0b4a70ab5ab044eeef23e3ec78ceef7b8daee
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sun Aug 19 12:23:00 2007 -0400

Add 01_gen_pci_ids.diff.

This will ship a set of pci ids that this driver supports so that the
server can automatically load it under the right conditions.

+ Enable our patch system in debian/rules
+ autoreconf because this patch

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

2007-08-15 Thread Julien Cristau 
 ChangeLog  |   39 +
 Makefile.in|  133 +++---
 aclocal.m4 |  674 ---
 compat/Makefile.in |   84 ++-
 configure  | 1139 +
 configure.ac   |2 
 debian/changelog   |9 
 debian/control |2 
 depcomp|   64 ++
 install-sh |  348 
 ltmain.sh  |  233 ++
 man/Makefile.in|   94 ++--
 man/nv.man |   21 
 missing|   61 +-
 mkinstalldirs  |5 
 src/Makefile.in|  169 ---
 src/g80_dac.c  |   11 
 src/g80_display.c  |   95 +++-
 src/g80_display.h  |9 
 src/g80_output.c   |   10 
 src/g80_output.h   |2 
 src/g80_sor.c  |  192 +++-
 src/nv_const.h |3 
 src/nv_cursor.c|2 
 src/nv_dac.c   |3 
 src/nv_dga.c   |2 
 src/nv_dma.h   |2 
 src/nv_driver.c|8 
 src/nv_hw.c|3 
 src/nv_include.h   |2 
 src/nv_local.h |1 
 src/nv_proto.h |3 
 src/nv_setup.c |3 
 src/nv_shadow.c|4 
 src/nv_type.h  |2 
 src/nv_video.c |2 
 src/nv_xaa.c   |3 
 src/nvreg.h|7 
 src/nvvga.h|4 
 src/riva_const.h   |3 
 src/riva_cursor.c  |2 
 src/riva_dac.c |3 
 src/riva_dga.c |2 
 src/riva_driver.c  |3 
 src/riva_hw.c  |2 
 src/riva_hw.h  |2 
 src/riva_include.h |2 
 src/riva_local.h   |1 
 src/riva_proto.h   |3 
 src/riva_setup.c   |2 
 src/riva_shadow.c  |4 
 src/riva_tbl.h |3 
 src/riva_type.h|2 
 src/riva_xaa.c |3 
 54 files changed, 2248 insertions(+), 1239 deletions(-)

New commits:
commit 52c69a5f2c0a147bb4d12d7f0a4b300a8780bc95
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Thu Aug 16 03:06:00 2007 +0200

Add myself to Uploaders and remove Branden with his permission.

diff --git a/debian/changelog b/debian/changelog
index 9be7aa6..e9bb80a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 xserver-xorg-video-nv (1:2.1.3-1) unstable; urgency=low
 
   * New upstream release.
+  * Add myself to Uploaders and remove Branden with his permission.
 
- -- Julien Cristau <[EMAIL PROTECTED]>  Thu, 16 Aug 2007 02:56:16 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]>  Thu, 16 Aug 2007 03:05:31 +0200
 
 xserver-xorg-video-nv (1:2.1.2-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 03409d5..2a87cde 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-nv
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
-Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL 
PROTECTED]>
+Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL 
PROTECTED]>
 Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 
2:1.2.99.902), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, 
x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev
 Standards-Version: 3.7.2.2
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nv

commit 5e39b20e0a9578c58931f7c1630b351e9f2644fb
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Thu Aug 16 02:57:34 2007 +0200

Update changelogs.

diff --git a/ChangeLog b/ChangeLog
index dc2b094..c2920a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,42 @@
+commit 69f7a57cd9baabbbee7b7665c3c2c2b91c056a04
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Wed Aug 15 17:12:11 2007 -0700
+
+Bump to 2.1.3.
+
+commit 3bb842cb55fd201a559bef19c06db4aee0485d26
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Tue Jul 24 21:21:06 2007 -0700
+
+Nuke old RCS tags.
+
+Fix the ends of files.  Update the known cards date.
+
+commit 08b68473351081fe1ed96ba7e206ed0d301b8a91
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Tue Jul 24 20:36:04 2007 -0700
+
+G80: Allow DVI scaling.
+
+Revamp how the scaling code works.  When a mode is set on a DVI output,
+determine the current preferred mode and scale to that.  Add a new scaling
+option, "off", which disables scaling and scans out the actual timings in 
the
+mode to be set.
+
+commit f0ebb42ee94eac4b294d12d02f4406a444b347ff
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Fri Jul 13 13:17:52 2007 -0700
+
+G80: Add an LVDS flat panel scaling property.
+
+This property controls how non-native resolutions are scaled to the native
+resolution.  Valid values are:
+* center: 1:1 pixel ratio with black borders to center the image.
+* fill: Scale image to the native resolution.
+* aspect: Scale image to fit the screen, adding black bars to preserve
+  square pixels.
+Defaults to "aspect".  Change with "xrandr --output LVDS --set scale 
".
+
 commit ec78618d685759a39d386e9929661037b167fe68
 Author: Aaron Plattner <[EMAIL PROTECTED]>
 Date:   Tue Jul 10 11:54:33 2007 -0700
d

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

2007-07-12 Thread Brice Goglin 
 debian/changelog  |6 ++
 debian/xsfbs/xsfbs.mk |8 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit e0af1bf9f253caf12c3e753062575ec988517275
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Thu Jul 12 17:05:51 2007 +0200

add changelog entry

diff --git a/debian/changelog b/debian/changelog
index 428784a..fa60e6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nv (1:2.1.2-3) UNRELEASED; urgency=low
+
+  * Update to a non-buggy xsfbs patching.
+
+ -- Brice Goglin <[EMAIL PROTECTED]>  Thu, 12 Jul 2007 16:40:08 +0200
+
 xserver-xorg-video-nv (1:2.1.2-2) unstable; urgency=low
 
   * Pull upstream commit ec78618d, to "fix a minor GeForceFX + flatpanel +

commit 12a633f722a2ff9677728d1e2ae56767f804232a
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Thu Jul 12 16:06:22 2007 +0200

Fix "display the output of quilt push/pop".

Fix commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d to check the
return value of quilt, not the one of tee.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5f13302..bfca7bb 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -147,9 +147,11 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
fi; \
if $(QUILT) next >/dev/null 2>&1; then \
  echo -n "Applying patches..."; \
- if $(QUILT) push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
+ if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
+   cat $(STAMP_DIR)/log/patch; \
echo "successful."; \
  else \
+   cat $(STAMP_DIR)/log/patch; \
echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
exit 1; \
  fi; \
@@ -164,9 +166,11 @@ unpatch:
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
- if $(QUILT) pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
+ if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
+   cat $(STAMP_DIR)/log/unpatch; \
echo "successful."; \
  else \
+   cat $(STAMP_DIR)/log/unpatch; \
echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
exit 1; \
  fi; \


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

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

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

New commits:
commit cc000283055d76769f5f707ec7da6af8cce31a0b
Author: Julien Cristau <[EMAIL PROTECTED]>
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 <[EMAIL PROTECTED]>
+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 <[EMAIL PROTECTED]>
 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 <[EMAIL PROTECTED]>  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 <[EMAIL PROTECTED]>
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);


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

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

2007-07-10 Thread Julien Cristau 
 ChangeLog |   39 ++
 configure |   20 ++---
 configure.ac  |2 -
 debian/changelog  |6 
 debian/xsfbs/xsfbs.mk |   23 +--
 man/nv.man|5 +++
 src/g80_display.c |   17 +++
 src/g80_display.h |1 
 src/g80_driver.c  |   10 ++
 src/g80_output.c  |3 +-
 src/g80_sor.c |   75 --
 src/g80_type.h|1 
 src/nv_driver.c   |8 +
 13 files changed, 186 insertions(+), 24 deletions(-)

New commits:
commit ba2406ff6da2afdd9f3040083806bba45201de8d
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Tue Jul 10 20:27:26 2007 +0200

Update upstream changelog.

diff --git a/ChangeLog b/ChangeLog
index e8abf32..2f20fc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,42 @@
+commit 493822998184a1d79d6774686983cbd41930f253
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Tue Jul 10 09:58:46 2007 -0700
+
+Bump to 2.1.2.
+
+commit d0d4e37accc697108e03c2ee7fdc0edf1f309620
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Tue Jul 10 09:48:19 2007 -0700
+
+More GeForce 8 series mobile chips.
+
+commit e77a2d9b62bc65062e7e2167642be5ab75ac4864
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Tue Jul 10 00:41:21 2007 -0700
+
+G80: Add a dithering property and corresponding config file option.
+
+commit c1503c864d495f8a3e5380fed5cb8ca5e21a3750
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Sun Jul 8 01:28:42 2007 -0700
+
+GeForce 8600M GT.
+
+commit 42dffde988176a3f85b0586ecb8d672b74050760
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Sun Jul 8 00:53:00 2007 -0700
+
+Work around more MacBook wackiness.
+
+Turn off more corrupt the framebuffer mode.  Don't mess with the pixel 
clock for
+LVDS as long as we're trusting the VBIOS-programmed timings.
+
+commit bc439899f323410b0549068cd88348e7fb62866b
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Tue Jul 3 14:03:59 2007 -0700
+
+Put the GPU into don't corrupt the framebuffer mode to work around MacBook 
wackiness.
+
 commit 0f93ad0e2af26b4e2381f337b58d3a5e50302664
 Author: Aaron Plattner <[EMAIL PROTECTED]>
 Date:   Mon Jul 2 09:01:12 2007 -0700

commit 761a80d61981c8d9864bca623a4a7becd1187d2d
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Tue Jul 10 20:09:49 2007 +0200

New upstream release.

diff --git a/configure b/configure
index 9fd4f35..88fce2d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-video-nv 2.1.1.
+# Generated by GNU Autoconf 2.61 for xf86-video-nv 2.1.2.
 #
 # Report bugs to .
 #
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='xf86-video-nv'
 PACKAGE_TARNAME='xf86-video-nv'
-PACKAGE_VERSION='2.1.1'
-PACKAGE_STRING='xf86-video-nv 2.1.1'
+PACKAGE_VERSION='2.1.2'
+PACKAGE_STRING='xf86-video-nv 2.1.2'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 ac_unique_file="Makefile.am"
@@ -1417,7 +1417,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xf86-video-nv 2.1.1 to adapt to many kinds of systems.
+\`configure' configures xf86-video-nv 2.1.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1487,7 +1487,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-nv 2.1.1:";;
+ short | recursive ) echo "Configuration of xf86-video-nv 2.1.2:";;
esac
   cat <<\_ACEOF
 
@@ -1601,7 +1601,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xf86-video-nv configure 2.1.1
+xf86-video-nv configure 2.1.2
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1615,7 +1615,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xf86-video-nv $as_me 2.1.1, which was
+It was created by xf86-video-nv $as_me 2.1.2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2290,7 +2290,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xf86-video-nv'
- VERSION='2.1.1'
+ VERSION='2.1.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -21292,7 +21292,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xf86-video-nv $as_me 2.1.1, which was
+This file was extended by xf86-video-nv $as_me 2.1.2, which was
 generated by GNU Autocon

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

2007-07-02 Thread Brice Goglin 
 ChangeLog|   70 +++
 aclocal.m4   |2 -
 configure|   24 +-
 configure.ac |2 -
 debian/changelog |6 
 src/g80_driver.c |   30 ++-
 src/nv_driver.c  |1 
 7 files changed, 115 insertions(+), 20 deletions(-)

New commits:
commit 49efe8926529617c2f3b3bfa3bc3ccc257d57532
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Mon Jul 2 22:38:13 2007 +0200

New upstream release 2.1.1

diff --git a/ChangeLog b/ChangeLog
index ead5a39..e8abf32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,73 @@
+commit 0f93ad0e2af26b4e2381f337b58d3a5e50302664
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Mon Jul 2 09:01:12 2007 -0700
+
+Bump to 2.1.1.
+
+commit 4ff01787a6640bf76cc34a51c99227845dc4678e
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Sat Jun 30 21:52:08 2007 -0700
+
+GeForce 8400M G.
+
+commit 63eb1a4aa402ac3bf117634c3c9270261c6a4258
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Sat Jun 30 21:51:15 2007 -0700
+
+Support configs with BAR1 < total RAM < 256 MB.
+
+commit 209c84e788faf3c4d0ce053e5f29ff5f5b798628
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Mon Jun 18 13:08:31 2007 -0700
+
+Bump to 2.1.0.
+
+commit 24770ccf880f056bc0db9464249caca10692fb56
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Mon Jun 18 12:36:29 2007 -0700
+
+Fix some random colormap corruption on DFPs with certain pre-G80 GPUs.
+
+commit 4e56465a79587c4df6bf1dfd7cc87a4f22707a8f
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Thu Jun 7 18:28:56 2007 -0700
+
+G80: Mode validation.
+
+Disable LVDS modes larger than the native resolution.
+Disable dual-link TMDS modes for now since they don't work reliably.
+
+commit 6b71721439802bffd715602af3036083ff442449
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Mon Jun 4 23:15:42 2007 -0700
+
+G80: LVDS support.
+
+commit 70b304cd0df0af515ce8414559f28a7ca7825517
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Mon Jun 4 22:38:14 2007 -0700
+
+G80: Rearrange HW video timing computations.
+
+Compute the HW parameters in G80CrtcModeFixup and stash them in 
adjusted_mode.
+Move some register writes into G80CreateSor.
+
+commit 402b1d1526f0dacd2e3a2564cc89958c32d3100e
+Merge: 1f4790a... 9b8470e...
+Author: Benjamin Herrenschmidt <[EMAIL PROTECTED]>
+Date:   Sun Jun 3 11:18:50 2007 +1000
+
+Merge branch 'master' of 
git://anongit.freedesktop.org/git/xorg/driver/xf86-video-nv
+
+commit 1f4790adcafd402c84a4a761c870a26a5178a4ff
+Author: Benjamin Herrenschmidt <[EMAIL PROTECTED]>
+Date:   Sun Jun 3 11:16:55 2007 +1000
+
+Fix build. Including xf86DDC.h before we include xf86.h doesn't fly
+and it's not necessary anyway as it's pulled in by g80_type.h
+
+Signed-off-by: Benjamin Herrenschmidt <[EMAIL PROTECTED]>
+
 commit 9b8470e9c81e6ce2c8cd69942fb2ffd2d4c06102
 Author: Aaron Plattner <[EMAIL PROTECTED]>
 Date:   Wed May 16 14:45:36 2007 -0700
diff --git a/aclocal.m4 b/aclocal.m4
index aaae5ad..f8a69fa 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -6528,7 +6528,7 @@ path to pkg-config.
 
 _PKG_TEXT
 
-To get pkg-config, see .])],
+To get pkg-config, see .])],
[$4])
 else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
diff --git a/configure b/configure
index d409d13..9fd4f35 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-video-nv 2.1.0.
+# Generated by GNU Autoconf 2.61 for xf86-video-nv 2.1.1.
 #
 # Report bugs to .
 #
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='xf86-video-nv'
 PACKAGE_TARNAME='xf86-video-nv'
-PACKAGE_VERSION='2.1.0'
-PACKAGE_STRING='xf86-video-nv 2.1.0'
+PACKAGE_VERSION='2.1.1'
+PACKAGE_STRING='xf86-video-nv 2.1.1'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 ac_unique_file="Makefile.am"
@@ -1417,7 +1417,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xf86-video-nv 2.1.0 to adapt to many kinds of systems.
+\`configure' configures xf86-video-nv 2.1.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1487,7 +1487,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-nv 2.1.0:";;
+ short | recursive ) echo "Configuration of xf86-video-nv 2.1.1:";;
esac
   cat <<\_ACEOF
 
@@ -1601,7 +1601,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xf86-video-nv configur

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

2007-06-21 Thread Julien Cristau 
 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit e1ef40f2a4a7297035f91d1979dd8ac9fc779936
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Thu Jun 21 23:56:47 2007 +0100

Prepare changelog for upload.

diff --git a/debian/changelog b/debian/changelog
index 852ffc0..f8c50a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-video-nv (1:2.1.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-nv (1:2.1.0-1) unstable; urgency=low
 
+  [ Brice Goglin ]
   * New upstream release.
 
- -- Brice Goglin <[EMAIL PROTECTED]>  Tue, 19 Jun 2007 19:11:56 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]>  Thu, 21 Jun 2007 23:56:15 +0100
 
 xserver-xorg-video-nv (1:2.0.96-1) experimental; urgency=low
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

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

2007-06-19 Thread Brice Goglin 
 ChangeLog  |  192 +++
 Makefile.am|2 
 Makefile.in|9 
 README.G80 |5 
 compat/.gitignore  |2 
 compat/Makefile.am |   15 +
 compat/Makefile.in |  355 +++
 compat/README  |7 
 config.guess   |   32 ++-
 config.h.in|   15 -
 config.sub |   16 +
 configure  |  299 ++
 configure.ac   |   72 +--
 debian/changelog   |   12 +
 debian/control |2 
 man/Makefile.am|9 
 man/Makefile.in|   12 -
 man/nv.man |   29 +-
 src/Makefile.am|   31 ++-
 src/Makefile.in|  155 ---
 src/g80_cursor.c   |  150 +++
 src/g80_cursor.h   |8 
 src/g80_dac.c  |  199 
 src/g80_ddc.c  |  230 ---
 src/g80_ddc.h  |1 
 src/g80_display.c  |  485 +
 src/g80_display.h  |   22 +-
 src/g80_driver.c   |  239 ++--
 src/g80_exa.c  |  329 +
 src/g80_exa.h  |1 
 src/g80_output.c   |  350 +++
 src/g80_output.h   |   31 +++
 src/g80_sor.c  |  301 ++
 src/g80_type.h |   40 ++--
 src/g80_xaa.c  |   10 -
 src/g80_xaa.h  |5 
 src/local_xf86Rename.h |   23 ++
 src/nv_dac.c   |3 
 src/nv_driver.c|  236 ---
 src/nv_hw.c|   19 +
 src/nv_include.h   |6 
 src/nv_local.h |3 
 src/nv_setup.c |3 
 src/nv_type.h  |   11 +
 src/nv_video.c |   13 -
 src/riva_hw.c  |2 
 src/riva_include.h |5 
 src/riva_local.h   |3 
 48 files changed, 2984 insertions(+), 1015 deletions(-)

New commits:
commit f48e652e259e98fd883179b95ebd37d877c07337
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Tue Jun 19 19:12:07 2007 +0200

New upstream release

diff --git a/configure b/configure
index 3d7f65a..d409d13 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-video-nv 2.0.96.
+# Generated by GNU Autoconf 2.61 for xf86-video-nv 2.1.0.
 #
 # Report bugs to .
 #
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='xf86-video-nv'
 PACKAGE_TARNAME='xf86-video-nv'
-PACKAGE_VERSION='2.0.96'
-PACKAGE_STRING='xf86-video-nv 2.0.96'
+PACKAGE_VERSION='2.1.0'
+PACKAGE_STRING='xf86-video-nv 2.1.0'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 ac_unique_file="Makefile.am"
@@ -1417,7 +1417,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xf86-video-nv 2.0.96 to adapt to many kinds of systems.
+\`configure' configures xf86-video-nv 2.1.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1487,7 +1487,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-nv 2.0.96:";;
+ short | recursive ) echo "Configuration of xf86-video-nv 2.1.0:";;
esac
   cat <<\_ACEOF
 
@@ -1601,7 +1601,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xf86-video-nv configure 2.0.96
+xf86-video-nv configure 2.1.0
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1615,7 +1615,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xf86-video-nv $as_me 2.0.96, which was
+It was created by xf86-video-nv $as_me 2.1.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2290,7 +2290,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xf86-video-nv'
- VERSION='2.0.96'
+ VERSION='2.1.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -21292,7 +21292,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xf86-video-nv $as_me 2.0.96, which was
+This file was extended by xf86-video-nv $as_me 2.1.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES= $CONFIG_FILES
@@ -21345,7 +21345,7 @@ Report bugs to <[EMAIL PROTECTED]>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-xf86-video-nv config.status 2.0.96
+xf86-video-nv config.status 2.1.0
 configured by $0, gen

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

2007-04-28 Thread Brice Goglin 
 ChangeLog |  188 +-
 config.guess  |   91 +---
 config.sub|   65 +++--
 debian/changelog  |   23 +-
 debian/control|   14 ++-
 debian/rules  |4 -
 debian/xsfbs/xsfbs.mk |   28 ++-
 ltmain.sh |  126 +++--
 mkinstalldirs |   89 ++-
 9 files changed, 388 insertions(+), 240 deletions(-)

New commits:
commit c1fec9194d396fe3d23e982c56349acecf2fc84f
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Sat Apr 28 21:58:06 2007 +0200

Miscellaneous fixed in debian/control and debian/rules.

  * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
(needed to let xsfbs get access to serverminver).
  * Add XS-Vcs-*.
  * Add a link to www.X.org and a reference to the xf86-video-nv
module in the long description.
  * Remove Fabio from uploaders with his permission. He's always welcome 
back.

diff --git a/debian/changelog b/debian/changelog
index 5975b31..0151b65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,15 @@ xserver-xorg-video-nv (1:2.0.2-2) UNRELEASED; urgency=low
   * Install the upstream changelog (closes: #420006).  Thanks, Bastian
 Kleineidam!
 
- -- Timo Aaltonen <[EMAIL PROTECTED]>  Tue, 24 Apr 2007 14:08:36 +0300
+  [ Brice Goglin ]
+  * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
+(needed to let xsfbs get access to serverminver).
+  * Add XS-Vcs-*.
+  * Add a link to www.X.org and a reference to the xf86-video-nv
+module in the long description.
+  * Remove Fabio from uploaders with his permission. He's always welcome back.
+
+ -- Brice Goglin <[EMAIL PROTECTED]>  Sat, 28 Apr 2007 21:57:17 +0200
 
 xserver-xorg-video-nv (1:2.0.2-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a645329..8de3df8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,11 @@ Source: xserver-xorg-video-nv
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
-Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL 
PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 
2:1.2.0), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, 
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
+Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL 
PROTECTED]>
+Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 
2:1.2.99.902), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, 
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
 Standards-Version: 3.7.2.2
+XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nv
+XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-nv.git
 
 Package: xserver-xorg-video-nv
 Architecture: any
@@ -20,8 +22,8 @@ Description: X.Org X server -- NV display driver
  adds 3D support, but is binary-only and not supported.
  .
  More information about X.Org can be found at:
+ http://www.X.org>
  http://xorg.freedesktop.org>
  http://lists.freedesktop.org/mailman/listinfo/xorg>
  .
- This module can be found as the module 'driver/xf86-video-nv' at
- :pserver:[EMAIL PROTECTED]:/cvs/xorg
+ This package is built from the X.org xf86-video-nv driver module.

commit 71e48a1550c546486f5312fd3185f9272353c523
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Sat Apr 28 21:54:19 2007 +0200

Update upstream ChangeLog

diff --git a/ChangeLog b/ChangeLog
index a73698e..ac9c0ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,124 @@
+commit b4e26dfcc01b2816b6f8445fa8e9388b5e254df9
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Tue Apr 17 15:00:24 2007 -0700
+
+Bump to 2.0.2.
+
+commit b23eeec2bebbbe1939366a8296565ae0120ea6da
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Tue Apr 17 14:59:41 2007 -0700
+
+G80: Add a basic README.
+
+commit b68f3ada7bd857095c7652c175a0ba18bf45801f
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Tue Apr 17 12:47:11 2007 -0700
+
+Add GeForce 8600 and 8500 PCI IDs.
+
+commit 0126c809544cb3a0242fc3bce7ad82d4962aaf1c
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Sun Apr 1 01:17:31 2007 -0700
+
+Remove extraneous DisplayModeRec allocation.
+
+Thanks to Luc Verhaegen for pointing this out.
+
+commit d569934c3de326483347db00d34268b02101599c
+Author: Henry Zhao <[EMAIL PROTECTED]>
+Date:   Sat Mar 31 18:47:30 2007 -0800
+
+10360: Need to inject a mode corresponding panel width/height for 
validation
+
+commit 4d929d383abe064b5334847eb466321a6bf30999
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Tue Mar 27 15:56:52 2007 -0700
+
+REALLY bump to 2.0.1.
+
+I need more caffeine, or something.
+
+commit 0953f081d1592b123dc27fb82d1cfecca079d5de
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date:   Tue Mar 27 15:46:38

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

2007-04-24 Thread Timo Aaltonen 
 debian/changelog |6 ++
 debian/control   |4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit ad695eb5dc51eb0f8baeb33755f3449d16f207a0
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date:   Tue Apr 24 14:10:08 2007 +0300

Replaces/Conflicts: xserver-xorg-driver-nv.

diff --git a/debian/changelog b/debian/changelog
index fd8f4df..79bb907 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nv (1:2.0.2-2) UNRELEASED; urgency=low
+
+  * Replaces/Conflicts: xserver-xorg-driver-nv.
+
+ -- Timo Aaltonen <[EMAIL PROTECTED]>  Tue, 24 Apr 2007 14:08:36 +0300
+
 xserver-xorg-video-nv (1:2.0.2-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 70566da..c8c9926 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,8 @@ Package: xserver-xorg-video-nv
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg-core (>= 2:1.1.1-11)
 Provides: xserver-xorg-video-1.0, xf86-video-driver-riva128
-Conflicts: xserver-xorg-video-riva128
-Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-video-riva128
+Conflicts: xserver-xorg-video-riva128, xserver-xorg-driver-nv
+Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-video-riva128, 
xserver-xorg-driver-nv
 Description: X.Org X server -- NV display driver
  This driver for the X.Org X server (see xserver-xorg for a further 
description)
  provides support for NVIDIA Riva, TNT, GeForce, and Quadro cards.


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

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

2007-04-18 Thread David Nusinow 
 .gitignore|   22 
 COPYING   |   26 
 Makefile.am   |   12 
 Makefile.in   |   20 
 README.G80|   16 
 aclocal.m4|  147 +++-
 autogen.sh|   12 
 config.h.in   |   24 
 configure | 1607 +++---
 configure.ac  |   26 
 debian/changelog  |8 
 debian/control|2 
 debian/copyright  |   72 --
 man/.gitignore|2 
 man/Makefile.am   |9 
 man/Makefile.in   |7 
 man/nv.man|   80 +-
 src/Makefile.am   |   26 
 src/Makefile.in   |  128 ++--
 src/g80_cursor.c  |  185 ++
 src/g80_cursor.h  |3 
 src/g80_ddc.c |  230 +++
 src/g80_ddc.h |1 
 src/g80_display.c |  525 +
 src/g80_display.h |   10 
 src/g80_dma.c |   65 ++
 src/g80_dma.h |   14 
 src/g80_driver.c  |  916 ++
 src/g80_type.h|   75 ++
 src/g80_xaa.c |  554 ++
 src/g80_xaa.h |1 
 src/nv_driver.c   |  151 -
 src/nv_hw.c   |   13 
 src/nv_include.h  |1 
 src/nv_setup.c|   10 
 src/nv_type.h |1 
 src/riva_driver.c |   54 -
 37 files changed, 3595 insertions(+), 1460 deletions(-)

New commits:
commit b4ce754848f9200121fc50500e853c8bf6119209
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Wed Apr 18 23:33:05 2007 -0400

Update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 0f7e529..fd8f4df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-nv (1:2.0.2-1) unstable; urgency=low
+
+  * New upstream release
+  * Update debian copyright to the new COPYING file
+  * Update standards version to 3.7.2.2. No changes needed.
+
+ -- David Nusinow <[EMAIL PROTECTED]>  Wed, 18 Apr 2007 23:27:40 -0400
+
 xserver-xorg-video-nv (1:1.2.0-4) UNRELEASED; urgency=low
 
   * Add link to xserver-xorg-core bug script, so that bugreports contain

commit eb7bd1207d2e86b50947d27f4a7e19d16f59b2c3
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Wed Apr 18 23:32:45 2007 -0400

Update standards version to 3.7.2.2. No changes needed.

diff --git a/debian/control b/debian/control
index 8b2b0b2..70566da 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL 
PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 
2:1.1.1), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, 
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
-Standards-Version: 3.6.1
+Standards-Version: 3.7.2.2
 
 Package: xserver-xorg-video-nv
 Architecture: any

commit 4309f0d5e029f935a09565be40a3eb26a3aebdbe
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Wed Apr 18 23:26:31 2007 -0400

Update debian/copyright to new COPYING file

diff --git a/debian/copyright b/debian/copyright
index ea5dd87..cad7191 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,56 +1,20 @@
-Copyright 1993-2003 NVIDIA, Corporation.  All rights reserved.
-Copyright 1996-1997  David J. McKay
-
-NOTICE TO USER:   The source code  is copyrighted under  U.S. and
-international laws.  Users and possessors of this source code are
-hereby granted a nonexclusive,  royalty-free copyright license to
-use this code in individual and commercial software.
-
-Any use of this source code must include,  in the user documenta-
-tion and  internal comments to the code,  notices to the end user
-as follows:
-
-Copyright 2003 NVIDIA, Corporation.  All rights reserved.
-
-NVIDIA, CORPORATION MAKES NO REPRESENTATION ABOUT THE SUITABILITY
-OF  THIS SOURCE  CODE  FOR ANY PURPOSE.  IT IS  PROVIDED  "AS IS"
-WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND.  NVIDIA, CORPOR-
-ATION DISCLAIMS ALL WARRANTIES  WITH REGARD  TO THIS SOURCE CODE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGE-
-MENT,  AND FITNESS  FOR A PARTICULAR PURPOSE.   IN NO EVENT SHALL
-NVIDIA, CORPORATION  BE LIABLE FOR ANY SPECIAL,  INDIRECT,  INCI-
-DENTAL, OR CONSEQUENTIAL DAMAGES,  OR ANY DAMAGES  WHATSOEVER RE-
-SULTING FROM LOSS OF USE,  DATA OR PROFITS,  WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,  ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE.
-
-U.S. Government  End  Users.   This source code  is a "commercial
-item,"  as that  term is  defined at  48 C.F.R. 2.101 (OCT 1995),
-consisting  of "commercial  computer  software"  and  "commercial
-computer  software  documentation,"  as such  terms  are  used in
-48 C.F.R. 12.212 (SEPT 1995)  and is provided to the U.S. Govern-
-ment only as  a commercial end item.   Consistent with  48 C.F.R.
-12.212 and  48 C.F.R. 227.7202-1 through  227.7202-4 (JUNE 1995),
-all U.S. Government End Users  acquire the source code  with only
-those rights set forth herein.
-
-
-Copyright 1996-1997  David J. McKay
+Copyright

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

2007-02-01 Thread David Nusinow 
New branch 'debian-unstable' available with the following commits:
commit fac0ea98ecc8329810d0841aa1320559f519483a
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Tue Nov 7 06:46:29 2006 +

For each driver, add a symlink to xserver-xorg-core's bug script, so that 
each
new bugreport contains the user's config and log files.  Bump dependencies 
on
xserver-xorg-core to >= 2:1.1.1-11, to make sure that the bug script is
present.

commit c96b9f1f851542335a6fc0f8876688eb289a3527
Author: Thierry Reding <[EMAIL PROTECTED]>
Date:   Tue Sep 26 10:26:34 2006 +

Add some more watch files.

commit c12e8de091dff4cf7aef8908c177975d9d54b3e2
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Tue Sep 19 00:38:06 2006 +

Prepare changelog for upload to unstable

commit ab31caef704ff9f4d3cfb0c1a83c36b6fa21902e
Author: Steve Langasek <[EMAIL PROTECTED]>
Date:   Mon Sep 18 11:22:02 2006 +

merge nv 7.1 video driver to trunk for upload to unstable

commit 9e6cc267e7c09cb8db4240149b093377543c7e07
Author: Steve Langasek <[EMAIL PROTECTED]>
Date:   Mon Sep 18 06:33:05 2006 +

more fixes for unversioned directory names

commit 835e675b93bcbb452725c558eef9eaeedaa6e33f
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Wed Apr 5 00:10:22 2006 +

Prepare changelogs for upload to unstable

commit 1e39629cc7f70f1ea9797b5c3dee0b2a6d5aec37
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Wed Mar 8 01:43:48 2006 +

Revert revision 1399 that added the obsolete loader speed hack patch port. 
Thanks Daniel Stone.

commit 783141035fcad87320fbcf7657e819852177e959
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Mon Mar 6 02:55:14 2006 +

* Partial port of general/028_loader_speed_hack.diff to append _drv to the
  riva128 module name.

commit 5901a867f1c14f11a304de2b02b7b6f6d7f66d5e
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Mon Feb 13 03:46:16 2006 +

Fix Branden's email address

commit 8bccc64e41c7bd190ac259d699652943fa65b72e
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sun Feb 12 16:24:02 2006 +

Move all install files for renaming scheme and delete v4l driver which 
doesn't currently have packaging

commit 5f8611df353c986cd4ed8eb1a6d6c5ddd9cf7332
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Fri Feb 10 03:40:14 2006 +

Change driver package names to new scheme

commit 88515f9cfa3d35e64612307b5949015ec4dfad89
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Mon Jan 30 02:24:55 2006 +

Move .install files to new naming scheme for drivers

commit c4fcdb4891160180733ce9bacf07d6cb7a0570ae
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sun Jan 29 21:21:32 2006 +

Pull in and use xsfbs

commit 31e840ac13776001bf5a3e292740a075bba10067
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sun Jan 29 20:36:06 2006 +

* Rename driver packages to be more consistent and intuitive
  + Video drivers are now named xorg-video-driver-foo and input drivers are
now named xorg-input-driver-foo
  + Video drivers provide xorg-video-driver and input drivers provide
xorg-input-driver
  + xorg-server-core depends on xorg-video-drivers-all | xorg-video-driver
and also xorg-input-drivers-all | xorg-input-drivers

commit 94ed88e6d113f1c6aba4db3b209d95c64803a84f
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Fri Jan 20 04:31:26 2006 +

Fix maintainer and uploader fields. God, I love sed.

commit 33ac07be2240b9eceaaba271e93576c037343c04
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Fri Jan 20 01:29:24 2006 +

Add copyright info

commit c9530a2f3982e89b01cc5bf08f982e045e2aedcc
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Fri Jan 13 05:48:42 2006 +

Add packaging for various drivers

commit 55dee299cb281aeb7b809a1551db31ffab6c3194
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Fri Jan 13 04:05:21 2006 +

Update drivers in modular branch. We'll re-pull the ubuntu packaging 
properly

commit 2961af7f0f3383aef0dfd5c685137e0c753639f7
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Fri Dec 30 18:14:25 2005 +

Vendor drop of the rest of 7.0


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]