debian/changelog | 6 ++++++
debian/control | 3 ++-
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 1bde04bd13f76b2ab6ff3704be1cc46069c771b2
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date: Tue Apr 24 14:35:29 2007 +0300
Replaces/Conflicts: xserver-xorg-driver-trident.
diff --git a/debian/changelog b/debian/changelog
index 827ad52..ecb0c81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-trident (1:1.2.3-2) UNRELEASED; urgency=low
+
+ * Replaces/Conflicts: xserver-xorg-driver-trident.
+
+ -- Timo Aaltonen <[EMAIL PROTECTED]> Tue, 24 Apr 2007 14:35:02 +0300
+
xserver-xorg-video-trident (1:1.2.3-1) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/control b/debian/control
index 3527bd8..70e441b 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Package: xserver-xorg-video-trident
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-trident
+Conflicts: xserver-xorg-driver-trident
Description: X.Org X server -- Trident display driver
This package provides the driver for Trident Blade/Image/ProVidia/TGUI/9xxx
video cards.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
