debian/changelog | 7 +++++++
debian/control | 1 +
2 files changed, 8 insertions(+)
New commits:
commit 47627877fa7024614bcfa04fff6f09ac1f7fefd1
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Tue Mar 11 00:05:43 2008 +0100
Add Conflicts with xserver-xorg-video-ati (<= 1:6.8.0-1)
diff --git a/debian/changelog b/debian/changelog
index 618fb19..f134cda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-mach64 (1:6.8.1~git20080301.56a1c9f0-3) experimental;
urgency=low
+
+ * Add Conflicts with xserver-xorg-video-ati (<= 1:6.8.0-1) to ease switching
+ between unstable and experimental for now, closes: #469541.
+
+ -- Brice Goglin <[EMAIL PROTECTED]> Mon, 10 Mar 2008 23:59:52 +0100
+
xserver-xorg-video-mach64 (1:6.8.1~git20080301.56a1c9f0-2) experimental;
urgency=low
* Fix Replaces, thanks Michael Biebl, closes: #469142.
diff --git a/debian/control b/debian/control
index 18b0764..9dcedf1 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Package: xserver-xorg-video-mach64
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
Replaces: xserver-xorg-video-ati (<= 1:6.8.0-1)
+Conflicts: xserver-xorg-video-ati (<= 1:6.8.0-1)
Provides: ${xviddriver:Provides}
Description: X.Org X server -- ATI Mach64 display driver
This driver for the X.Org X server (see xserver-xorg for a further
description)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
