[pkg-nvidia-devel] r1288 - /packages/nvidia-graphics-drivers/trunk/debian/control

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

Author: anbe-guest
Date: Sun Jul  4 13:11:46 2010
New Revision: 1288

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1288
Log:
libgl1-nvidia-* has file conflicts with nvidia-glx-legacy{,-{71,96,173}xx}-*

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

Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=1288&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Sun Jul  4 13:11:46 2010
@@ -114,6 +114,10 @@
  libgl1-nvidia-glx,
  fglrx-glx,
  nvidia-glx${nvidia:Legacy} (<< 195.36.31),
+ nvidia-glx-legacy,
+ nvidia-glx-legacy-71xx,
+ nvidia-glx-legacy-96xx,
+ nvidia-glx-legacy-173xx,
 Replaces: nvidia-glx${nvidia:Legacy} (<< 195.36.31)
 Description: NVIDIA binary OpenGL libraries${nvidia:LegacyDesc}
  These binary libraries provide optimized hardware acceleration of
@@ -143,6 +147,10 @@
  libgl1-nvidia-glx-ia32,
  fglrx-glx-ia32,
  nvidia-glx${nvidia:Legacy}-ia32 (<< 195.36.31),
+ nvidia-glx-legacy-ia32,
+ nvidia-glx-legacy-71xx-ia32,
+ nvidia-glx-legacy-96xx-ia32,
+ nvidia-glx-legacy-173xx-ia32,
 Replaces: nvidia-glx${nvidia:Legacy}-ia32 (<< 195.36.31)
 Description: NVIDIA binary OpenGL 32-bit libraries${nvidia:LegacyDesc}
  These binary 32-bit libraries provide optimized hardware acceleration of
@@ -168,6 +176,10 @@
 Conflicts:
  libgl1-nvidia-dev,
  nvidia-glx${nvidia:Legacy}-dev (<< 195.36.31),
+ nvidia-glx-legacy-dev,
+ nvidia-glx-legacy-71xx-dev,
+ nvidia-glx-legacy-96xx-dev,
+ nvidia-glx-legacy-173xx-dev,
 Replaces: nvidia-glx${nvidia:Legacy}-dev (<< 195.36.31)
 Description: NVIDIA OpenGL development files${nvidia:LegacyDesc}
  This package contains the development files for the NVIDIA OpenGL