[pkg-nvidia-devel] r928 - in /packages/libvdpau/trunk/debian: changelog control

[rra at users.alioth.debian.org]

Author: rra
Date: Sun May 23 02:05:23 2010
New Revision: 928

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=928
Log:
Version the Conflicts and Replaces against nvidia-libvdpau1*

We need versioned Conflicts or the transitional package can't be installed
at the same time as the package it depends on, which will prevent the
transition from happening.  Also version Replaces, which isn't strictly
necessary but is more correct.

Fix the ordering of debian/changelog.

Modified:
    packages/libvdpau/trunk/debian/changelog
    packages/libvdpau/trunk/debian/control

Modified: packages/libvdpau/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/libvdpau/trunk/debian/changelog?rev=928&op=diff
==============================================================================
--- packages/libvdpau/trunk/debian/changelog (original)
+++ packages/libvdpau/trunk/debian/changelog Sun May 23 02:05:23 2010
@@ -1,11 +1,5 @@
 libvdpau (0.4-4) unstable; urgency=low
 
-  [ Russ Allbery ]
-  * Link libvdpau with libX11 since it uses symbols from that library.
-  * Add myself to Uploaders.
-  * Convert debian/copyright to the DEP-5 format and add the slightly
-    different license used for two of the source files.
-  
   [ Andreas Beckmann ]
   * Build lib32vdpau1 [amd64], so we can replace nvidia-libvdpau-ia32.
     Build rules inspired by lib32z1. (Closes: #572206)
@@ -14,6 +8,13 @@
   * libvdpau-dev: do not ship /usr/lib/vdpau/libvdpau_trace.so, won't be used.
   * libvdpau1: cleanup /usr/lib/libvdpau_trace.so left over by some old
     versions of the nvidia-libvdpau* packages.
+
+  [ Russ Allbery ]
+  * Link libvdpau with libX11 since it uses symbols from that library.
+  * Add myself to Uploaders.
+  * Convert debian/copyright to the DEP-5 format and add the slightly
+    different license used for two of the source files.
+  * Version the Conflicts and Replaces against nvidia-libvdpau1*.
 
  -- Russ Allbery <rra at debian.org>  Sat, 22 May 2010 18:53:43 -0700
 

Modified: packages/libvdpau/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/libvdpau/trunk/debian/control?rev=928&op=diff
==============================================================================
--- packages/libvdpau/trunk/debian/control (original)
+++ packages/libvdpau/trunk/debian/control Sun May 23 02:05:23 2010
@@ -36,8 +36,10 @@
 Package: libvdpau1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: nvidia-libvdpau, nvidia-libvdpau1, nvidia-libvdpau-ia32
-Conflicts: nvidia-libvdpau, nvidia-libvdpau1, nvidia-libvdpau-ia32
+Replaces: nvidia-libvdpau, nvidia-libvdpau-ia32,
+ nvidia-libvdpau1 (<< 195.36.24-2), nvidia-libvdpau1-ia32 (<< 195.36.24-2)
+Conflicts: nvidia-libvdpau, nvidia-libvdpau-ia32,
+ nvidia-libvdpau1 (<< 195.36.24-2), nvidia-libvdpau1-ia32 (<< 195.36.24-2)
 Suggests: nvidia-vdpau-driver [amd64 i386]
  | nvidia-vdpau-driver-ia32 [amd64]
  | vdpau-driver
@@ -54,8 +56,8 @@
 Package: lib32vdpau1
 Architecture: amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: nvidia-libvdpau1-ia32
-Conflicts: nvidia-libvdpau1-ia32
+Replaces: nvidia-libvdpau1-ia32 (<< 195.36.24-2)
+Conflicts: nvidia-libvdpau1-ia32 (<< 195.36.24-2)
 Suggests: nvidia-vdpau-driver-ia32 [amd64] | vdpau-driver-ia32
 Description: Video Decode and Presentation API for Unix (32-bit libraries)
  VDPAU (Video Decode and Presentation API for Unix) is an open source