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

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



 debian/changelog |    6 ++++++
 debian/control   |    3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 02193949fa9305f797a2e03d9f2be0634e2c73d9
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date:   Tue Apr 24 14:41:00 2007 +0300

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

diff --git a/debian/changelog b/debian/changelog
index e681c6d..c64ef0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-vesa (1:1.3.0-2) UNRELEASED; urgency=low
+
+  * Replaces/Conflicts: xserver-xorg-driver-vesa.
+
+ -- Timo Aaltonen <tjaalton@cc.hut.fi>  Tue, 24 Apr 2007 14:40:25 +0300
+
 xserver-xorg-video-vesa (1:1.3.0-1) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/control b/debian/control
index 3eef32f..1a07316 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Package: xserver-xorg-video-vesa
 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-vesa
+Conflicts: xserver-xorg-driver-vesa
 Description: X.Org X server -- VESA display driver
  This driver for the X.Org X server (see xserver-xorg for a further description)
  uses the standard VESA interface provided on all video cards, but runs



Reply to: