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

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

Author: anbe-guest
Date: Mon Jun 28 12:37:14 2010
New Revision: 1195

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1195
Log:
fix up fglrx conflicts

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=1195&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Mon Jun 28 12:37:14 2010
@@ -16,6 +16,7 @@
     corresponding real packages, so that the legacy packages can do the same
     and we can stop listing each variant we have in Conflicts and Recommends
     lists.
+  * Add Conflicts: fglrx-driver, fglrx-glx, fglrx-glx-ia32.
   * Update to Standards-Version: 3.9.0.  Not switching to Breaks+Replaces.
     Not touching old versioned Conflicts.  No other changes needed.
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=1195&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Mon Jun 28 12:37:14 2010
@@ -34,7 +34,7 @@
  nvidia-glx-legacy-71xx,
  nvidia-glx-legacy-96xx,
  nvidia-glx-legacy-173xx,
- fglrx-glx,
+ fglrx-driver,
 Description: NVIDIA binary Xorg driver${nvidia:LegacyDesc}
  These binary drivers provide optimized hardware acceleration of
  OpenGL applications via a direct-rendering X Server.