xorg-server: Changes to 'ubuntu'
debian/changelog | 2 ++
debian/control | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 49fab4eb4285761f1b7ff5c0499cad2ba4a00043
Author: Loïc Minier <lool@dooz.org>
Date: Wed Oct 15 01:28:46 2008 +0200
Let xserver-xorg-core conflict with xserver-xorg-video-psb << 0.15.0-0ubuntu1~804um5 as these versions didn't have an ABI provide.
diff --git a/debian/changelog b/debian/changelog
index 1cc08a0..070a6fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xorg-server (2:1.5.2-1ubuntu1) intrepid; urgency=low
* Merge from debian-experimental.
* Update patch 142_psb_auto to try vesa if psb fails; thanks Oliver Grawert.
* Refresh patch 100_xserver_exa_force_greedy to apply cleanly.
+ * Let xserver-xorg-core conflict with xserver-xorg-video-psb
+ << 0.15.0-0ubuntu1~804um5 as these versions didn't have an ABI provide.
-- Loic Minier <lool@dooz.org> Tue, 14 Oct 2008 23:03:06 +0200
diff --git a/debian/control b/debian/control
index 7270d96..e18295d 100644
--- a/debian/control
+++ b/debian/control
@@ -47,7 +47,8 @@ Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable
Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0),
xserver-xorg-video, xserver-common (<< 7), xserver-xorg-video-1.0, xserver-xorg-input,
xserver-xorg-video-1.9, xserver-xorg-input-wacom (<< 0.7.8),
- xserver-xorg-video-2, xserver-xorg-input-2
+ xserver-xorg-video-2, xserver-xorg-input-2,
+ xserver-xorg-video-psb (<< 0.15.0-0ubuntu1~804um5)
Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0),
xserver-common (<< 7)
Breaks: xserver-xorg-input-synaptics (<= 0.15.2-0ubuntu3), xserver-xorg-input-evdev (<= 1:2.0.99+git20080912-0ubuntu2)
Reply to: