[pkg-nvidia-devel] r989 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog control

[anbe-guest at users.alioth.debian.org]

Author: anbe-guest
Date: Thu Jun  3 12:00:19 2010
New Revision: 989

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=989
Log:
nvidia-glx: add Conflicts: fglrx-glx

Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/control

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=989&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Thu Jun  3 12:00:19 2010
@@ -45,6 +45,7 @@
   * nvidia-glx{,-ia32}: add symbols control files and drop .shlibs files,
     accidental linking with libGL.so.1 from NVIDIA is prevented in a different
     way
+  * nvidia-glx: add Conflicts: fglrx-glx
 
  -- Russ Allbery <rra at debian.org>  Wed, 26 May 2010 07:19:43 -0700
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=989&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Thu Jun  3 12:00:19 2010
@@ -26,6 +26,7 @@
  nvidia-glx-legacy-71xx,
  nvidia-glx-legacy-96xx,
  nvidia-glx-legacy-173xx,
+ fglrx-glx,
 Description: NVIDIA binary Xorg driver
  These binary drivers provide optimized hardware acceleration of
  OpenGL applications via a direct-rendering X Server.