[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

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



 debian/changelog |    6 ++++++
 debian/control   |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit ad695eb5dc51eb0f8baeb33755f3449d16f207a0
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
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 <tjaalton@cc.hut.fi>  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.



Reply to: