xorg-server: Changes to 'debian-experimental'
debian/changelog | 7 +++++++
debian/control | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 1a3be391d07c033212ee04f966dc6cb87e63956b
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Feb 11 11:59:27 2007 -0500
* Conflict with drivers providing xserver-xorg-video-1.0. We're now at ABI
version 1.1.
diff --git a/debian/changelog b/debian/changelog
index 222bb9f..6641dc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.2.0-3) UNRELEASED; urgency=low
+
+ * Conflict with drivers providing xserver-xorg-video-1.0. We're now at ABI
+ version 1.1.
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 11 Feb 2007 11:58:45 -0500
+
xorg-server (2:1.2.0-2) experimental; urgency=low
* Delete useless debian/substvars.
diff --git a/debian/control b/debian/control
index 22d2107..075f6ed 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ 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
+Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), xserver-xorg-video, xserver-xorg-video-1.0
Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0)
Provides: xserver
Description: X.Org X server -- core server
Reply to: