X Strike Force X.Org X11 SVN commit: r2902 - branches/7.1/xserver/xorg-server/debian
Author: dparsons
Date: 2006-08-22 11:05:29 -0400 (Tue, 22 Aug 2006)
New Revision: 2902
Modified:
branches/7.1/xserver/xorg-server/debian/changelog
branches/7.1/xserver/xorg-server/debian/control
Log:
* Tighten dependencies between X11R7.1 server and video drivers.
xserver-xorg-core Depends: xserver-xorg-video-all | xserver-xorg-video-1.0
and Conflicts: xserver-xorg-video.
Modified: branches/7.1/xserver/xorg-server/debian/changelog
===================================================================
--- branches/7.1/xserver/xorg-server/debian/changelog 2006-08-22 14:52:33 UTC (rev 2901)
+++ branches/7.1/xserver/xorg-server/debian/changelog 2006-08-22 15:05:29 UTC (rev 2902)
@@ -1,3 +1,11 @@
+xorg-server (1:1.1.1-4) UNRELEASED; urgency=low
+
+ * Tighten dependencies between X11R7.1 server and video drivers.
+ xserver-xorg-core Depends: xserver-xorg-video-all | xserver-xorg-video-1.0
+ and Conflicts: xserver-xorg-video.
+
+ -- Drew Parsons <dparsons@debian.org> Wed, 23 Aug 2006 01:00:52 +1000
+
xorg-server (1:1.1.1-3) unstable; urgency=low
* Add 16_s390_fix.diff to fix FTBFS on s390. Thanks Bastian Blank.
Modified: branches/7.1/xserver/xorg-server/debian/control
===================================================================
--- branches/7.1/xserver/xorg-server/debian/control 2006-08-22 14:52:33 UTC (rev 2901)
+++ branches/7.1/xserver/xorg-server/debian/control 2006-08-22 15:05:29 UTC (rev 2902)
@@ -13,9 +13,9 @@
Package: xserver-xorg-core
Architecture: any
-Depends: x11-common (>= 1:7.0.0), xserver-xorg-video-all | xserver-xorg-video, xserver-xorg-input-all | xserver-xorg-input, ${shlibs:Depends}, ${misc:Depends}
+Depends: x11-common (>= 1:7.0.0), xserver-xorg-video-all | xserver-xorg-video-1.0, xserver-xorg-input-all | xserver-xorg-input, ${shlibs:Depends}, ${misc:Depends}
Recommends: xkb-data
-Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0)
+Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), xserver-xorg-video
Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0)
Provides: xserver
Description: X.Org X server -- core server
Reply to: