xorg-server: Changes to 'debian-unstable'
debian/changelog | 6 ++++++
debian/control | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 94b8195fc2870690a8b0e3ed8a750b5e92f96a41
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Jun 1 15:06:19 2007 +0200
fglrx has fixed their version check.
Change the conflict to fglrx-driver (<< 8.37.6).
diff --git a/debian/changelog b/debian/changelog
index 740b2da..146980e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.3.0.0.dfsg-6) unstable; urgency=low
+
+ * Change fglrx conflict to << 8.37.6 (closes: #424975).
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 01 Jun 2007 14:58:39 +0200
+
xorg-server (2:1.3.0.0.dfsg-5) unstable; urgency=low
[ Brice Goglin ]
diff --git a/debian/control b/debian/control
index f81a91b..d3f2524 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,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, xserver-common, fglrx-driver
+Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), xserver-xorg-video, xserver-common, fglrx-driver (<< 8.37.6)
Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), xserver-common
Provides: xserver
Description: X.Org X server -- core server
Reply to: