xserver-xorg-video-cirrus: Changes to 'debian-unstable'
debian/changelog | 6 +++++-
debian/control | 3 ++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 5f53063369014115c3af74331f210880fc3b7c07
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Tue Apr 24 13:05:33 2007 +0300
Replaces/Conflicts: xserver-xorg-driver-cirrus.
diff --git a/debian/changelog b/debian/changelog
index 72d09fe..507c004 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
xserver-xorg-video-cirrus (1:1.1.0-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 <julien.cristau@ens-lyon.org> Tue, 7 Nov 2006 07:30:40 +0100
+ [ Timo Aaltonen ]
+ * Replaces/Conflicts: xserver-xorg-driver-cirrus.
+
+ -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 13:03:59 +0300
xserver-xorg-video-cirrus (1:1.1.0-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 0682f04..8f4bf83 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Package: xserver-xorg-video-cirrus
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-cirrus
+Conflicts: xserver-xorg-driver-cirrus
Description: X.Org X server -- Cirrus display driver
This package provides the driver for the Cirrus Logic family of video
cards.
Reply to: