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

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

Author: ceros-guest
Date: Sun Nov 29 03:22:52 2009
New Revision: 664

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=664
Log:
Fix issue with upgrading from 190.42-2. (Closes: #558369)

Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/control
    packages/nvidia-graphics-drivers/trunk/debian/control.in

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=664&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sun Nov 29 03:22:52 2009
@@ -1,3 +1,9 @@
+nvidia-graphics-drivers (190.42-4) unstable; urgency=low
+
+  * Fix issue with upgrading from 190.42-2. (Closes: #558369)
+
+ -- Andres Mejia <mcitadel at gmail.com>  Sat, 28 Nov 2009 20:08:12 -0500
+
 nvidia-graphics-drivers (190.42-3) unstable; urgency=low
 
   [ Andres Mejia ]

Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=664&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Sun Nov 29 03:22:52 2009
@@ -102,7 +102,8 @@
 Recommends: nvidia-kernel-190.42
 Suggests: nvidia-kernel-source (>= 190.42)
 Replaces: nvidia-glx (< 180.51), nvidia-libvdpau
-Conflicts: nvidia-glx (< 180.51), nvidia-libvdpau
+Conflicts: nvidia-glx (< 180.51), nvidia-libvdpau,
+ nvidia-libvdpau1 (<< 190.42-3)
 Description: NVIDIA vdpau driver
  These libraries provide the Video Decode and Presentation API for Unix.
  They provide accelerated video playback (incl. H.264) for the supported
@@ -116,7 +117,8 @@
 Recommends: nvidia-kernel-190.42
 Suggests: nvidia-kernel-source (>= 190.42)
 Replaces: nvidia-glx (< 180.51), nvidia-libvdpau
-Conflicts: nvidia-glx (< 180.51), nvidia-libvdpau
+Conflicts: nvidia-glx (< 180.51), nvidia-libvdpau,
+ nvidia-libvdpau1 (<< 190.42-3)
 Description: NVIDIA vdpau 32-bit driver
  These libraries provide the Video Decode and Presentation API for Unix.
  They provide accelerated video playback (incl. H.264) for the supported

Modified: packages/nvidia-graphics-drivers/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control.in?rev=664&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control.in Sun Nov 29 03:22:52 2009
@@ -102,7 +102,8 @@
 Recommends: nvidia-kernel-#VERSION#
 Suggests: nvidia-kernel-source (>= #VERSION#)
 Replaces: nvidia-glx (< 180.51), nvidia-libvdpau
-Conflicts: nvidia-glx (< 180.51), nvidia-libvdpau
+Conflicts: nvidia-glx (< 180.51), nvidia-libvdpau,
+ nvidia-libvdpau1 (<< 190.42-3)
 Description: NVIDIA vdpau driver
  These libraries provide the Video Decode and Presentation API for Unix.
  They provide accelerated video playback (incl. H.264) for the supported
@@ -116,7 +117,8 @@
 Recommends: nvidia-kernel-#VERSION#
 Suggests: nvidia-kernel-source (>= #VERSION#)
 Replaces: nvidia-glx (< 180.51), nvidia-libvdpau
-Conflicts: nvidia-glx (< 180.51), nvidia-libvdpau
+Conflicts: nvidia-glx (< 180.51), nvidia-libvdpau,
+ nvidia-libvdpau1 (<< 190.42-3)
 Description: NVIDIA vdpau 32-bit driver
  These libraries provide the Video Decode and Presentation API for Unix.
  They provide accelerated video playback (incl. H.264) for the supported