X Strike Force X.Org X11 SVN commit: r869 - branches/6.9/debian
Author: dnusinow
Date: 2005-11-13 11:49:31 -0500 (Sun, 13 Nov 2005)
New Revision: 869
Modified:
branches/6.9/debian/changelog
branches/6.9/debian/control
Log:
* Have xserver-xorg conflict with nvidia-glx less than or equal to
1.0.7174-4. Thanks Steve Langasek.
Modified: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog 2005-11-13 16:40:50 UTC (rev 868)
+++ branches/6.9/debian/changelog 2005-11-13 16:49:31 UTC (rev 869)
@@ -12,8 +12,10 @@
- debian/905_debian_xdm.diff
* Remove replaces and conflicts in xdmx package that were for internal
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.
- -- David Nusinow <dnusinow@debian.org> Sun, 13 Nov 2005 11:37:53 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 13 Nov 2005 11:47:26 -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:40:50 UTC (rev 868)
+++ branches/6.9/debian/control 2005-11-13 16:49:31 UTC (rev 869)
@@ -2463,7 +2463,7 @@
Depends: xserver-common (>= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: xlibs, discover | discover1, mdetect, xresprobe (>= 0.4.13), laptop-detect
Suggests: libglide2 (>> 2001.01.26)
-Conflicts: xlibs (<< 6.8.2.dfsg.1-5), xserver-xfree86 (<< 6.8.2.dfsg.1-1)
+Conflicts: xlibs (<< 6.8.2.dfsg.1-5), xserver-xfree86 (<< 6.8.2.dfsg.1-1), nvidia-glx (<= 1.0.7174-4)
Replaces: xserver-xfree86
Provides: xserver
Description: the X.Org X server
Reply to: