[pkg-nvidia-devel] r1074 - /packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control

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

Author: anbe-guest
Date: Thu Jun 10 10:15:42 2010
New Revision: 1074

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1074
Log:
update conflicts for -legacy-173xx

Modified:
    packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control

Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control?rev=1074&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control Thu Jun 10 10:15:42 2010
@@ -23,9 +23,9 @@
  | nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
 Breaks: xserver-xorg-core (<< 2:1.6)
 Conflicts:
+ nvidia-glx,
  nvidia-glx-legacy-71xx,
  nvidia-glx-legacy-96xx,
- nvidia-glx-legacy-173xx,
  fglrx-glx,
 Description: NVIDIA binary Xorg driver${nvidia:LegacyDesc}
  These binary drivers provide optimized hardware acceleration of
@@ -54,9 +54,9 @@
  nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version})
  | nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
 Conflicts:
+ nvidia-glx-ia32,
  nvidia-glx-legacy-71xx-ia32,
  nvidia-glx-legacy-96xx-ia32,
- nvidia-glx-legacy-173xx-ia32,
 Description: NVIDIA binary driver 32bit libs${nvidia:LegacyDesc}
  These binary drivers provide optimized hardware acceleration of
  OpenGL applications via a direct-rendering X Server.
@@ -75,9 +75,9 @@
  libx11-dev,
 Recommends: libgl1-mesa-dev | libgl-dev
 Conflicts:
+ nvidia-glx,
  nvidia-glx-legacy-71xx,
  nvidia-glx-legacy-96xx,
- nvidia-glx-legacy-173xx,
 Description: NVIDIA binary Xorg driver development files${nvidia:LegacyDesc}
  This package contains the development files for the NVIDIA OpenGL
  implementation. This package is only needed for applications that use some
@@ -97,9 +97,9 @@
 Recommends: nvidia-glx${nvidia:Legacy} (>= ${nvidia:Version})
 Provides: nvidia-kernel${nvidia:Legacy}-${nvidia:Version}
 Conflicts:
+ nvidia-kernel-dkms,
  nvidia-kernel-legacy-71xx-dkms,
  nvidia-kernel-legacy-96xx-dkms,
- nvidia-kernel-legacy-173xx-dkms,
  binutils-gold (>> 2.20.51),
  ccache (<< 3.0~),
 Description: NVIDIA binary kernel module DKMS source${nvidia:LegacyDesc}