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

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



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

New commits:
commit b102fa028b3de6556c75c1c5a402b2d8fc0c794f
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date:   Tue Apr 24 14:36:42 2007 +0300

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

diff --git a/debian/changelog b/debian/changelog
index c5b04ca..ec49609 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 xserver-xorg-video-tseng (1:1.1.0-4) 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:45 +0100
+  [ Timo Aaltonen ]
+  * Replaces/Conflicts: xserver-xorg-driver-tseng.
+
+ -- Timo Aaltonen <tjaalton@cc.hut.fi>  Tue, 24 Apr 2007 14:36:12 +0300
 
 xserver-xorg-video-tseng (1:1.1.0-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a50b843..b4614f9 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Package: xserver-xorg-video-tseng
 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-tseng
+Conflicts: xserver-xorg-driver-tseng
 Description: X.Org X server -- Tseng display driver
  This package provides the driver for Tseng Labs cards.
  .



Reply to: