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

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



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

New commits:
commit 4d12324f39c740f0ee42ebf238c14628dc7b1241
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date:   Tue Apr 24 14:15:03 2007 +0300

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

diff --git a/debian/changelog b/debian/changelog
index b327fbb..ac0e482 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-s3 (1:0.4.1-6) UNRELEASED; urgency=low
+
+  * Replaces/Conflicts: xserver-xorg-driver-s3.
+
+ -- Timo Aaltonen <tjaalton@cc.hut.fi>  Tue, 24 Apr 2007 14:13:31 +0300
+
 xserver-xorg-video-s3 (1:0.4.1-5) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/control b/debian/control
index 6eadb10..bd672d9 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Package: xserver-xorg-video-s3
 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-s3
+Conflicts: xserver-xorg-driver-s3
 Description: X.Org X server -- legacy S3 display driver
  This package provides the driver for certain legacy S3 video card chipsets,
  including the Trio64 and 96x cards.  It does not provide support for



Reply to: