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

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

Author: anbe-guest
Date: Mon Jul  5 13:26:11 2010
New Revision: 1299

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1299
Log:
remove a legacy substvar, we need a (versioned) conflicts vs the real package (not the virtual one with the same name) due to file conflicts

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=1299&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Mon Jul  5 13:26:11 2010
@@ -113,7 +113,7 @@
 Conflicts:
  libgl1-nvidia-glx,
  fglrx-glx,
- nvidia-glx${nvidia:Legacy} (<< 195.36.31),
+ nvidia-glx (<< 195.36.31),
  nvidia-glx-legacy,
  nvidia-glx-legacy-71xx,
  nvidia-glx-legacy-96xx,
@@ -146,7 +146,7 @@
 Conflicts:
  libgl1-nvidia-glx-ia32,
  fglrx-glx-ia32,
- nvidia-glx${nvidia:Legacy}-ia32 (<< 195.36.31),
+ nvidia-glx-ia32 (<< 195.36.31),
  nvidia-glx-legacy-ia32,
  nvidia-glx-legacy-71xx-ia32,
  nvidia-glx-legacy-96xx-ia32,
@@ -175,7 +175,7 @@
  libgl1-nvidia-dev,
 Conflicts:
  libgl1-nvidia-dev,
- nvidia-glx${nvidia:Legacy}-dev (<< 195.36.31),
+ nvidia-glx-dev (<< 195.36.31),
  nvidia-glx-legacy-dev,
  nvidia-glx-legacy-71xx-dev,
  nvidia-glx-legacy-96xx-dev,