xserver-xorg-video-fbdev: Changes to 'debian-unstable'
debian/changelog | 6 +++++-
debian/control | 3 ++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 887485c2bb62daeed12420b2dd35b6ebae29e185
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Tue Apr 24 13:16:58 2007 +0300
Replaces/Conflicts: xserver-xorg-driver-fbdev.
diff --git a/debian/changelog b/debian/changelog
index a09bec9..7de14c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
xserver-xorg-video-fbdev (1:0.3.1-3) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Add patch to fix minor warnings from man in fbdev(4).
- -- Julien Cristau <jcristau@debian.org> Sun, 22 Apr 2007 03:06:39 +0200
+ [ Timo Aaltonen ]
+ * Replaces/Conflicts: xserver-xorg-driver-fbdev.
+
+ -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 13:15:40 +0300
xserver-xorg-video-fbdev (1:0.3.1-2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index f9aa4df..158c8c5 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Package: xserver-xorg-video-fbdev
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
Provides: ${xviddriver:Provides}
-Replaces: xserver-xorg (<< 6.8.2-35)
+Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-driver-fbdev
+Conflicts: xserver-xorg-driver-fbdev
Description: X.Org X server -- fbdev display driver
This package provides the driver for the Linux framebuffer device (aka
'fbdev').
Reply to: