debian/changelog | 8 ++++++++
debian/control | 7 +++++--
2 files changed, 13 insertions(+), 2 deletions(-)
New commits:
commit bf41439b1d2ce5db97a261e3cd023eb6da88e561
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 30 01:06:16 2007 +0200
* Add conflict on xserver-xorg-input-wacom (<< 0.7.8) to xserver-xorg-core.
That driver is built against the old ABI, but doesn't provide
xserver-xorg-input.
diff --git a/debian/changelog b/debian/changelog
index e9694d7..c95e521 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.4-4) UNRELEASED; urgency=low
+
+ * Add conflict on xserver-xorg-input-wacom (<< 0.7.8) to xserver-xorg-core.
+ That driver is built against the old ABI, but doesn't provide
+ xserver-xorg-input.
+
+ -- Julien Cristau <jcristau@debian.org> Sun, 30 Sep 2007 01:03:20 +0200
+
xorg-server (2:1.4-3) unstable; urgency=low
[ David Nusinow ]
diff --git a/debian/control b/debian/control
index 3ab5a47..8cdf016 100644
--- a/debian/control
+++ b/debian/control
@@ -41,8 +41,11 @@ Architecture: any
Depends: x11-common (>= 1:7.0.0), ${shlibs:Depends}, ${misc:Depends}, xserver-xorg
Recommends: xkb-data, xfonts-base
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, xserver-xorg-video-1.0, xserver-xorg-input, xserver-xorg-video-1.9
-Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), xserver-common
+Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0),
+ xserver-xorg-video, xserver-common, xserver-xorg-video-1.0, xserver-xorg-input,
+ xserver-xorg-video-1.9, xserver-xorg-input-wacom (<< 0.7.8)
+Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0),
+ xserver-common
Provides: xserver
Description: Xorg X server - core server
The Xorg X server is an X server for several architectures and operating