[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xserver-xorg-video-ati: Changes to 'debian-experimental'



 debian/changelog |    6 +++++-
 debian/control   |    4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit c607f237e02d113d27019cb5ec14c7700a48378c
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date:   Tue Apr 24 13:00:01 2007 +0300

    Replaces/Conflicts: xserver-xorg-driver-ati.

diff --git a/debian/changelog b/debian/changelog
index e06bfc1..8e8c592 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 xserver-xorg-video-ati (1:6.6.191-2) UNRELEASED; urgency=low
 
+  [ Brice Goglin ]
   * Build a xserver-xorg-video-ati-dbg package with debugging symbols.
 
- -- Brice Goglin <Brice.Goglin@ens-lyon.org>  Sat, 31 Mar 2007 14:16:48 +0200
+  [ Timo Aaltonen ]
+  * Replaces/Conflicts: xserver-xorg-driver-ati.
+
+ -- Timo Aaltonen <tjaalton@cc.hut.fi>  Tue, 24 Apr 2007 12:59:41 +0300
 
 xserver-xorg-video-ati (1:6.6.191-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index d6b989d..73106fc 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,8 @@ Standards-Version: 3.7.2
 Package: xserver-xorg-video-ati
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
-Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-video-atimisc, xserver-xorg-driver-r128, xserver-xorg-driver-radeon
-Conflicts: xserver-xorg-video-atimisc, xserver-xorg-driver-r128, xserver-xorg-driver-radeon
+Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-video-atimisc, xserver-xorg-driver-r128, xserver-xorg-driver-radeon, xserver-xorg-driver-ati
+Conflicts: xserver-xorg-video-atimisc, xserver-xorg-driver-r128, xserver-xorg-driver-radeon, xserver-xorg-driver-ati
 Provides: ${xviddriver:Provides}, xf86-video-driver-atimisc, xserver-xorg-driver-r128, xserver-xorg-driver-radeon
 Description: X.Org X server -- ATI display driver
  This driver for the X.Org X server (see xserver-xorg for a further description)



Reply to: