xorg-server: Changes to 'debian-unstable'
debian/changelog | 2 ++
debian/control | 10 +---------
2 files changed, 3 insertions(+), 9 deletions(-)
New commits:
commit 80ff7b2032bb8cc2f9448c557d5b5761be6e70d9
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Apr 27 23:30:10 2010 +0200
Conflicts cleanup
Change driver ABI Conflicts to Breaks.
Drop old Conflicts/Replaces on pre-modular xserver packages.
diff --git a/debian/changelog b/debian/changelog
index b20d79d..256a711 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ xorg-server (2:1.7.6.901-4) UNRELEASED; urgency=low
[ Julien Cristau ]
* Drop the GLX 1.4 patches to fix server crashes with DRI2 (closes:
#567677).
+ * Change driver ABI Conflicts to Breaks. Drop old Conflicts/Replaces on
+ pre-modular xserver packages.
-- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 20 Apr 2010 17:46:32 +0300
diff --git a/debian/control b/debian/control
index cf5ff4e..d9b5177 100644
--- a/debian/control
+++ b/debian/control
@@ -92,10 +92,7 @@ Depends:
${misc:Depends},
Recommends: libgl1-mesa-dri (>= 7.1~rc1)
Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable
-Conflicts:
- xserver-xorg (<< 6.8.2-38),
- xserver-xfree86 (<< 1:7.0.0),
- xserver-common (<< 7),
+Breaks:
xserver-xorg-video,
xserver-xorg-video-1.0,
xserver-xorg-video-1.9,
@@ -107,16 +104,11 @@ Conflicts:
xserver-xorg-input-2.1,
xserver-xorg-input-4,
xserver-xorg-input-wacom (<< 0.7.8),
-Breaks:
xserver-xorg-input-joystick (<= 1:1.5.0-3),
xserver-xorg-input-synaptics (<= 1.2.2-1),
xserver-xorg-input-tslib (<= 0.0.6-3),
xserver-xorg-input-vmmouse (<= 1:12.6.5-4),
xserver-xorg-input-wacom (<= 0.10.5+20100415-1),
-Replaces:
- xserver-xorg (<< 6.8.2-38),
- xserver-xfree86 (<< 1:7.0.0),
- xserver-common (<< 7)
Provides:
xserver,
${videoabi},
Reply to: