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

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



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

New commits:
commit c22ca467cc9f3fae5e66111407f5e26bf5a93532
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date:   Tue Apr 24 14:46:52 2007 +0300

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

diff --git a/debian/changelog b/debian/changelog
index 4ffd88e..619c3f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 xserver-xorg-video-voodoo (1:1.1.0-5) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Add link to xserver-xorg-core bug script, so that bugreports contain
     the user's config and log files.
   * Bump dependency on xserver-xorg-core to >= 2:1.1.1-11, as previous
     versions don't have the bug script.
 
- -- Julien Cristau <julien.cristau@ens-lyon.org>  Tue,  7 Nov 2006 07:30:46 +0100
+  [ Timo Aaltonen ]
+  * Replaces/Conflicts: xserver-xorg-driver-voodoo.
+
+ -- Timo Aaltonen <tjaalton@cc.hut.fi>  Tue, 24 Apr 2007 14:46:30 +0300
 
 xserver-xorg-video-voodoo (1:1.1.0-4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 4ecac54..ced4f47 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Package: xserver-xorg-video-voodoo
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg-core (>= 2:1.1.1-11)
 Provides: xserver-xorg-video-1.0
-Replaces: xserver-xorg (<< 6.8.2-35)
+Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-driver-voodoo
+Conflicts: xserver-xorg-driver-voodoo
 Description: X.Org X server -- Voodoo display driver
  This package provides the driver for 3dfx Voodoo1 and Voodoo2 chipsets.
  .



Reply to: