[pkg-nvidia-devel] r1314 - in /packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian: changelog control

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

Author: anbe-guest
Date: Tue Jul  6 06:25:06 2010
New Revision: 1314

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

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

Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/changelog?rev=1314&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/changelog Tue Jul  6 06:25:06 2010
@@ -1,10 +1,11 @@
-nvidia-graphics-drivers-legacy-71xx (71.86.13-1.0) unstable; urgency=low
+nvidia-graphics-drivers-legacy-71xx (71.86.13-2) UNRELEASED; urgency=low
 
   [ Andreas Beckmann ]
   * add missing Build-Depends: libxext6, fixes FTBFS
   * do not keep generated control files in the repository
   * debian/control: use substvars instead of placeholder substitution
   * no longer generate debian/control
+  * synchronize packaging with nvidia-graphics-drivers-legacy-96xx 96.43.17-1
 
  -- Andreas Beckmann <debian at abeckmann.de>  Tue, 06 Jul 2010 01:30:44 +0200
 

Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/control?rev=1314&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/control Tue Jul  6 06:25:06 2010
@@ -33,7 +33,7 @@
 Conflicts:
  nvidia-glx,
  nvidia-glx-legacy,
- nvidia-glx-legacy-71xx,
+ nvidia-glx-legacy-96xx,
  nvidia-glx-legacy-173xx,
  fglrx-driver,
 Description: NVIDIA binary Xorg driver${nvidia:LegacyDesc}
@@ -84,7 +84,7 @@
 Conflicts:
  nvidia-glx-ia32,
  nvidia-glx-legacy-ia32,
- nvidia-glx-legacy-71xx-ia32,
+ nvidia-glx-legacy-96xx-ia32,
  nvidia-glx-legacy-173xx-ia32,
 Description: NVIDIA binary driver 32-bit libs${nvidia:LegacyDesc}
  These binary drivers provide optimized hardware acceleration of
@@ -142,8 +142,8 @@
  fglrx-glx,
  nvidia-glx (<< 195.36.31),
  nvidia-glx-legacy,
- nvidia-glx-legacy-71xx,
- nvidia-glx-legacy-96xx (<< 96.43.17),
+ nvidia-glx-legacy-71xx (<< 71.86.13-2),
+ nvidia-glx-legacy-96xx,
  nvidia-glx-legacy-173xx,
 Replaces: nvidia-glx${nvidia:Legacy} (<< 96.43.17)
 Description: NVIDIA binary OpenGL libraries${nvidia:LegacyDesc}
@@ -172,8 +172,8 @@
  fglrx-glx-ia32,
  nvidia-glx-ia32 (<< 195.36.31),
  nvidia-glx-legacy-ia32,
- nvidia-glx-legacy-71xx-ia32,
- nvidia-glx-legacy-96xx-ia32 (<< 96.43.17),
+ nvidia-glx-legacy-71xx-ia32 (<< 71.86.13-2),
+ nvidia-glx-legacy-96xx-ia32,
  nvidia-glx-legacy-173xx-ia32,
 Replaces: nvidia-glx${nvidia:Legacy}-ia32 (<< 96.43.17)
 Description: NVIDIA binary OpenGL 32-bit libraries${nvidia:LegacyDesc}
@@ -198,8 +198,8 @@
  libgl1-nvidia-dev,
  nvidia-glx-dev,
  nvidia-glx-legacy-dev,
- nvidia-glx-legacy-71xx-dev,
- nvidia-glx-legacy-96xx-dev (<< 96.43.17),
+ nvidia-glx-legacy-71xx-dev (<< 71.86.13-2),
+ nvidia-glx-legacy-96xx-dev,
  nvidia-glx-legacy-173xx-dev,
 Replaces: nvidia-glx${nvidia:Legacy}-dev (<< 96.43.17)
 Description: NVIDIA OpenGL development files${nvidia:LegacyDesc}