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

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



 debian/changelog |    6 ++++++
 debian/control   |    3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit e833a0c7669cccb57004e42a617981a6d93e75a1
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date:   Tue Apr 24 14:32:23 2007 +0300

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

diff --git a/debian/changelog b/debian/changelog
index 0547e72..c105274 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-tdfx (1:1.3.0-2) UNRELEASED; urgency=low
+
+  * Replaces/Conflicts: xserver-xorg-driver-tdfx.
+
+ -- Timo Aaltonen <tjaalton@cc.hut.fi>  Tue, 24 Apr 2007 14:31:44 +0300
+
 xserver-xorg-video-tdfx (1:1.3.0-1) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/control b/debian/control
index eedea36..65237c9 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Package: xserver-xorg-video-tdfx
 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-tdfx
+Conflicts: xserver-xorg-driver-tdfx
 Description: X.Org X server -- tdfx display driver
  This package provides the driver for 3dfx Voodoo video cards and their
  derivatives.



Reply to: