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

xserver-xorg-video-rendition: Changes to 'debian-unstable'



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

New commits:
commit 4491cdfb304fbecc4887c0194532715646e7bc26
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date:   Tue Apr 24 14:12:29 2007 +0300

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

diff --git a/debian/changelog b/debian/changelog
index b6dd57c..55493e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 xserver-xorg-video-rendition (1:4.1.0.dfsg.1-5) 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:42 +0100
+  [ Timo Aaltonen ]
+  * Replaces/Conflicts: xserver-xorg-driver-rendition.
+
+ -- Timo Aaltonen <tjaalton@cc.hut.fi>  Tue, 24 Apr 2007 14:11:33 +0300
 
 xserver-xorg-video-rendition (1:4.1.0.dfsg.1-4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 77d8bfd..ac9dce5 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Package: xserver-xorg-video-rendition
 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-rendition
+Conflicts: xserver-xorg-driver-rendition
 Description: X.Org X server -- Rendition display driver
  This package provides the driver for the Rendition Verite family of chipsets,
  commonly found in 3D accelerators such as the Creative 3D Blaster.



Reply to: