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

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

Author: anbe-guest
Date: Sat Jun 12 05:15:20 2010
New Revision: 1100

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1100
Log:
add Conflicts: nvidia-glx-legacy that was never really taken care of

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=1100&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sat Jun 12 05:15:20 2010
@@ -63,6 +63,7 @@
   * use generic download URLs pointing to the directories, not the files
     itself, remove placeholder substitution for URL_X86, URL_X86_64
   * no longer generate debian/copyright and convert it to DEP-5 format
+  * add Conflicts: nvidia-glx-legacy that was never really taken care of
 
  -- 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=1100&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Sat Jun 12 05:15:20 2010
@@ -24,6 +24,7 @@
  | nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
 Breaks: xserver-xorg-core (<< 2:1.6)
 Conflicts:
+ nvidia-glx-legacy,
  nvidia-glx-legacy-71xx,
  nvidia-glx-legacy-96xx,
  nvidia-glx-legacy-173xx,
@@ -55,6 +56,7 @@
  nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version})
  | nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
 Conflicts:
+ nvidia-glx-legacy-ia32,
  nvidia-glx-legacy-71xx-ia32,
  nvidia-glx-legacy-96xx-ia32,
  nvidia-glx-legacy-173xx-ia32,
@@ -76,6 +78,7 @@
  libx11-dev,
 Recommends: libgl1-mesa-dev | libgl-dev
 Conflicts:
+ nvidia-glx-legacy,
  nvidia-glx-legacy-71xx,
  nvidia-glx-legacy-96xx,
  nvidia-glx-legacy-173xx,