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

New commits:
commit 2ad974716066ec3517469d3b89388fba14b5544e
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date:   Tue Apr 24 14:17:03 2007 +0300

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

diff --git a/debian/changelog b/debian/changelog
index ae25bfa..14f0da7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 xserver-xorg-video-s3virge (1:1.9.1-4) 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 <[EMAIL PROTECTED]>  Tue,  7 Nov 2006 07:30:43 +0100
+  [ Timo Aaltonen ]
+  * Replaces/Conflicts: xserver-xorg-driver-s3virge.
+
+ -- Timo Aaltonen <[EMAIL PROTECTED]>  Tue, 24 Apr 2007 14:16:28 +0300
 
 xserver-xorg-video-s3virge (1:1.9.1-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 331e732..d16bded 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Package: xserver-xorg-video-s3virge
 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-s3virge
+Conflicts: xserver-xorg-driver-s3virge
 Description: X.Org X server -- S3 ViRGE display driver
  This package provides the driver for the S3 ViRGE and Trio3D family
  of chipsets.  It does not support Trio64 or S3 96x cards; support for


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

Reply via email to