xserver-xorg-video-ark: Changes to 'debian-unstable'
debian/changelog | 5 ++++-
debian/control | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 3dd117e634c87d865f53bc2992f99152fed66da6
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Tue Apr 24 12:53:00 2007 +0300
Replaces/Conflicts: xserver-xorg-driver-ark.
diff --git a/debian/changelog b/debian/changelog
index 2d664b3..4a961ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,10 @@ xserver-xorg-video-ark (1:0.6.0-6) UNRELEASED; urgency=low
* Add a link to www.X.org and a reference to the xf86-video-ark
module in the long description.
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Tue, 24 Apr 2007 01:14:26 +0200
+ [ Timo Aaltonen ]
+ * Replaces/Conflicts: xserver-xorg-driver-ark.
+
+ -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 12:52:17 +0300
xserver-xorg-video-ark (1:0.6.0-5) experimental; urgency=low
diff --git a/debian/control b/debian/control
index c61e9e4..ca2b3e8 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Package: xserver-xorg-video-ark
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
Provides: ${xviddriver:Provides}
-Replaces: xserver-xorg (<< 6.8.2-35)
+Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-driver-ark
+Conflicts: xserver-xorg-driver-ark
Description: X.Org X server -- ark display driver
This package provides the driver for the ark family
of chipsets.
Reply to: