[pkg-nvidia-devel] r1476 - in /packages/nvidia-graphics-drivers/branches/256.xx-experimental/debian: changelog control

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

Author: anbe-guest
Date: Sat Sep  4 01:12:49 2010
New Revision: 1476

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1476
Log:
add Conflicts: fglrx-driver, fglrx-glx, fglrx-glx-ia32 to the libgl*-nvidia-alternatives packages, too

Modified:
    packages/nvidia-graphics-drivers/branches/256.xx-experimental/debian/changelog
    packages/nvidia-graphics-drivers/branches/256.xx-experimental/debian/control

Modified: packages/nvidia-graphics-drivers/branches/256.xx-experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/branches/256.xx-experimental/debian/changelog?rev=1476&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/branches/256.xx-experimental/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/branches/256.xx-experimental/debian/changelog Sat Sep  4 01:12:49 2010
@@ -10,6 +10,8 @@
   * Update symbols control files.
   * Update nv-kernel.ids.
   * Update lintian overrides.
+  * Add Conflicts: fglrx-driver, fglrx-glx, fglrx-glx-ia32 to the
+    libgl*-nvidia-alternatives packages, too.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Thu, 02 Sep 2010 06:18:24 +0200
 

Modified: packages/nvidia-graphics-drivers/branches/256.xx-experimental/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/branches/256.xx-experimental/debian/control?rev=1476&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/branches/256.xx-experimental/debian/control (original)
+++ packages/nvidia-graphics-drivers/branches/256.xx-experimental/debian/control Sat Sep  4 01:12:49 2010
@@ -581,6 +581,8 @@
  nvidia-glx-legacy-71xx (<< 71.86.14),
  nvidia-glx-legacy-96xx (<< 96.43.18),
  nvidia-glx-legacy-173xx (<< 173.14.27),
+Conflicts:
+ fglrx-glx,
 Description: simplifies replacing MESA libGL with GPU vendor libraries
  Diverts the free libGL.so implementation (MESA) and introduces
  alternatives to simplify plugging in accelerated implementations from GPU
@@ -595,6 +597,8 @@
  nvidia-glx-legacy-71xx-ia32 (<< 71.86.14),
  nvidia-glx-legacy-96xx-ia32 (<< 96.43.18),
  nvidia-glx-legacy-173xx-ia32 (<< 173.14.27),
+Conflicts:
+ fglrx-glx-ia32,
 Description: simplifies replacing MESA libGL with GPU vendor libraries (32-bit)
  Diverts the free libGL.so (32-bit) implementation (MESA) and introduces
  alternatives to simplify plugging in accelerated implementations from GPU
@@ -609,6 +613,8 @@
  nvidia-glx-legacy-71xx (<< 71.86.14),
  nvidia-glx-legacy-96xx (<< 96.43.18),
  nvidia-glx-legacy-173xx (<< 173.14.27),
+Conflicts:
+ fglrx-driver,
 Description: simplifies replacing Xorg module libglx.so with GPU vendor library
  Diverts the free Xorg module libglx.so (Xorg) and introduces alternatives
  to simplify plugging in accelerated implementations from GPU vendors.