debian/changelog | 6 +++++-
debian/control | 3 ++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 525b14fa28035acab7216c77ef233c7a7f7fb75a
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date: Tue Apr 24 13:12:59 2007 +0300
Replaces/Conflicts: xserver-xorg-driver-cyrix
diff --git a/debian/changelog b/debian/changelog
index 3a4b3e7..9991198 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
xserver-xorg-video-cyrix (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 <[EMAIL PROTECTED]> Tue, 7 Nov 2006 07:30:40 +0100
+ [ Timo Aaltonen ]
+ * Replaces/Conflicts: xserver-xorg-driver-cyrix.
+
+ -- Timo Aaltonen <[EMAIL PROTECTED]> Tue, 24 Apr 2007 13:11:10 +0300
xserver-xorg-video-cyrix (1:1.1.0-4) unstable; urgency=low
diff --git a/debian/control b/debian/control
index b3926bb..555925c 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Package: xserver-xorg-video-cyrix
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-cyrix
+Conflicts: xserver-xorg-driver-cyrix
Description: X.Org X server -- Cyrix display driver
This package provides the driver for the Cyrix family of video cards.
.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
