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

[rra at users.alioth.debian.org]

Author: rra
Date: Fri Apr  9 18:14:58 2010
New Revision: 807

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=807
Log:
Add Conflicts and Replaces for ia32 vdpau fixes

* Add Conflicts and Replaces for the fix in 190.53-3 to the
  nvidia-*vdpau*-ia32 packages.  (190.53-2 installed files in
  the opposite package as was intended.)  (Closes: #577059)

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=807&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Fri Apr  9 18:14:58 2010
@@ -1,5 +1,8 @@
 nvidia-graphics-drivers (190.53-4) UNRELEASED; urgency=low
 
+  * Add Conflicts and Replaces for the fix in 190.53-3 to the
+    nvidia-*vdpau*-ia32 packages.  (190.53-2 installed files in
+    the opposite package as was intended.)  (Closes: #577059)
   * Remove postinst for generated module packages.  This script used to
     set up the NVIDIA device files in /dev, but this is now handled by
     nvidia-kernel-common.

Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=807&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Fri Apr  9 18:14:58 2010
@@ -71,8 +71,10 @@
  ${shlibs:Depends}, ${misc:Depends}
 Recommends: nvidia-kernel-${nvidia:Version}
 Suggests: nvidia-kernel-source (>= ${nvidia:Version})
-Replaces: nvidia-glx-ia32 (<< 180.51), nvidia-libvdpau-ia32
-Conflicts: nvidia-glx-ia32 (<< 180.51), nvidia-libvdpau-ia32
+Replaces: nvidia-glx-ia32 (<< 180.51), nvidia-libvdpau-ia32,
+ nvidia-vdpau-driver-ia32 (<< 190.53-3)
+Conflicts: nvidia-glx-ia32 (<< 180.51), nvidia-libvdpau-ia32,
+ nvidia-vdpau-driver-ia32 (<< 190.53-3)
 Description: NVIDIA vdpau 32bit libraries
  These libraries provide the Video Decode and Presentation API for Unix
  (32 bit). They provide accelerated video playback (incl. H.264) for the 
@@ -133,9 +135,11 @@
 Recommends: nvidia-kernel-${nvidia:Version}
 Enhances: lib32vdpau1
 Suggests: nvidia-kernel-source (>= ${nvidia:Version})
-Replaces: nvidia-glx (<< 180.51), nvidia-libvdpau, nvidia-libvdpau1-driver-ia32
+Replaces: nvidia-glx (<< 180.51), nvidia-libvdpau,
+ nvidia-libvdpau1-driver-ia32, nvidia-libvdpau1-ia32 (<< 190.53-3)
 Conflicts: nvidia-glx (<< 180.51), nvidia-libvdpau,
- nvidia-libvdpau1 (<< 190.42-3), nvidia-libvdpau1-driver-ia32
+ nvidia-libvdpau1 (<< 190.42-3), nvidia-libvdpau1-driver-ia32,
+ nvidia-libvdpau1-ia32 (<< 190.53-3)
 Provides: vdpau-driver
 Description: NVIDIA vdpau 32-bit driver
  These libraries provide the Video Decode and Presentation API for Unix.