X Strike Force X.Org X11 SVN commit: r870 - branches/6.9/debian
Author: dnusinow
Date: 2005-11-13 12:06:16 -0500 (Sun, 13 Nov 2005)
New Revision: 870
Modified:
branches/6.9/debian/changelog
branches/6.9/debian/control
Log:
* Have x-window-system-core alternately depend on the mesa packages. Thanks
Xavier Bestel.
Modified: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog 2005-11-13 16:49:31 UTC (rev 869)
+++ branches/6.9/debian/changelog 2005-11-13 17:06:16 UTC (rev 870)
@@ -14,8 +14,10 @@
testing. Thanks to Steve Langasek and Daniel Stone.
* Have xserver-xorg conflict with nvidia-glx less than or equal to
1.0.7174-4. Thanks Steve Langasek.
+ * Have x-window-system-core alternately depend on the mesa packages. Thanks
+ Xavier Bestel.
- -- David Nusinow <dnusinow@debian.org> Sun, 13 Nov 2005 11:47:26 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 13 Nov 2005 12:05:18 -0500
xorg-x11 (6.8.99.901.dfsg.1-2) experimental; urgency=low
Modified: branches/6.9/debian/control
===================================================================
--- branches/6.9/debian/control 2005-11-13 16:49:31 UTC (rev 869)
+++ branches/6.9/debian/control 2005-11-13 17:06:16 UTC (rev 870)
@@ -2643,7 +2643,7 @@
Package: x-window-system-core
Architecture: any
-Depends: ${F:XWSC-Special-Depends}xlibmesa-gl, libglu1-xorg, xfonts-base (>> 4.0), xfonts-100dpi, xfonts-75dpi, xfonts-scalable, xbase-clients, xutils
+Depends: ${F:XWSC-Special-Depends}xlibmesa-gl | libgl1-mesa, libglu1-xorg | libglu1-mesa, xfonts-base (>> 4.0), xfonts-100dpi, xfonts-75dpi, xfonts-scalable, xbase-clients, xutils
Description: X Window System core components
This metapackage provides the essential components for a standalone
workstation running the X Window System. It provides the X libraries, an X
Reply to: