[pkg-nvidia-devel] r667 - /packages/nvidia-graphics-drivers/trunk/debian/

ceros-guest at users.alioth.debian.org ceros-guest at users.alioth.debian.org
Sun Nov 29 22:02:29 UTC 2009 

Author: ceros-guest
Date: Sun Nov 29 22:02:28 2009
New Revision: 667

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=667
Log:
* Add Provides entry of vdpau-driver for vdpau driver packages.
* Rename nvidia-libvdpau1-driver to nvidia-vdpau-driver.
* Rename nvidia-libvdpau1-driver-ia32 to nvidia-vdpau-driver-ia32.
* Add proper Replaces and Conflicts entries for package renames.
* Update Depends entries for nvidia-libvdpau1* packages.

Added:
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver-ia32.dirs
      - copied unchanged from r664, packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver-ia32.dirs
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver-ia32.links.in
      - copied unchanged from r664, packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver-ia32.links.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.dirs
      - copied unchanged from r664, packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver.dirs
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.docs.in
      - copied unchanged from r664, packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver.docs.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.links.in
      - copied unchanged from r664, packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver.links.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.lintian-overrides.amd64.in
      - copied, changed from r664, packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver.lintian-overrides.amd64.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.lintian-overrides.i386.in
      - copied, changed from r664, packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver.lintian-overrides.i386.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.postinst
      - copied unchanged from r664, packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver.postinst
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.postrm
      - copied unchanged from r664, packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver.postrm
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.symbols.amd64
      - copied, changed from r664, packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver.symbols.amd64
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.symbols.i386
      - copied, changed from r664, packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver.symbols.i386
Removed:
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver-ia32.dirs
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver-ia32.links.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver.dirs
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver.docs.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver.links.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver.lintian-overrides.amd64.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver.lintian-overrides.i386.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver.postinst
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver.postrm
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver.symbols.amd64
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver.symbols.i386
Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/control
    packages/nvidia-graphics-drivers/trunk/debian/control.in
    packages/nvidia-graphics-drivers/trunk/debian/rules

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=667&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sun Nov 29 22:02:28 2009
@@ -1,8 +1,13 @@
 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
+  * Add Provides entry of vdpau-driver for vdpau driver packages.
+  * Rename nvidia-libvdpau1-driver to nvidia-vdpau-driver.
+  * Rename nvidia-libvdpau1-driver-ia32 to nvidia-vdpau-driver-ia32.
+  * Add proper Replaces and Conflicts entries for package renames.
+  * Update Depends entries for nvidia-libvdpau1* packages.
+
+ -- Andres Mejia <mcitadel at gmail.com>  Sun, 29 Nov 2009 15:52:27 -0500
 
 nvidia-graphics-drivers (190.42-3) unstable; urgency=low
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=667&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Sun Nov 29 22:02:28 2009
@@ -68,7 +68,7 @@
 Section: non-free/libs
 Architecture: amd64
 Pre-Depends: libc6-i386 (>= 2.9-18)
-Depends: nvidia-libvdpau1-driver-ia32 (>= 190.42),
+Depends: nvidia-vdpau-driver-ia32 (>= 190.42),
  ${shlibs:Depends}, ${misc:Depends}
 Recommends: nvidia-kernel-190.42
 Suggests: nvidia-kernel-source (>= 190.42)
@@ -83,7 +83,7 @@
 Package: nvidia-libvdpau1
 Section: non-free/libs
 Architecture: i386 amd64
-Depends: nvidia-libvdpau1-driver (>= 190.42),
+Depends: nvidia-vdpau-driver (>= 190.42),
  ${shlibs:Depends}, ${misc:Depends}
 Recommends: nvidia-kernel-190.42
 Suggests: nvidia-kernel-source (>= 190.42)
@@ -95,30 +95,32 @@
  graphics cards. See /usr/share/doc/nvidia-libvdpau/README.txt.gz for 
  more information.
 
-Package: nvidia-libvdpau1-driver
-Section: non-free/libs
-Architecture: i386 amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: nvidia-kernel-190.42
-Suggests: nvidia-kernel-source (>= 190.42)
-Replaces: nvidia-glx (< 180.51), nvidia-libvdpau
+Package: nvidia-vdpau-driver
+Section: non-free/libs
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: nvidia-kernel-190.42
+Suggests: nvidia-kernel-source (>= 190.42)
+Replaces: nvidia-glx (< 180.51), nvidia-libvdpau, nvidia-libvdpau1-driver
 Conflicts: nvidia-glx (< 180.51), nvidia-libvdpau,
- nvidia-libvdpau1 (<< 190.42-3)
+ nvidia-libvdpau1 (<< 190.42-3), nvidia-libvdpau1-driver
+Provides: vdpau-driver
 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
  graphics cards. See /usr/share/doc/nvidia-libvdpau/README.txt.gz for
  more information.
 
-Package: nvidia-libvdpau1-driver-ia32
-Section: non-free/libs
-Architecture: amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: nvidia-kernel-190.42
-Suggests: nvidia-kernel-source (>= 190.42)
-Replaces: nvidia-glx (< 180.51), nvidia-libvdpau
+Package: nvidia-vdpau-driver-ia32
+Section: non-free/libs
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: nvidia-kernel-190.42
+Suggests: nvidia-kernel-source (>= 190.42)
+Replaces: nvidia-glx (< 180.51), nvidia-libvdpau, nvidia-libvdpau1-driver-ia32
 Conflicts: nvidia-glx (< 180.51), nvidia-libvdpau,
- nvidia-libvdpau1 (<< 190.42-3)
+ nvidia-libvdpau1 (<< 190.42-3), nvidia-libvdpau1-driver-ia32
+Provides: vdpau-driver
 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=667&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control.in Sun Nov 29 22:02:28 2009
@@ -68,7 +68,7 @@
 Section: non-free/libs
 Architecture: amd64
 Pre-Depends: libc6-i386 (>= 2.9-18)
-Depends: nvidia-libvdpau1-driver-ia32 (>= #VERSION#),
+Depends: nvidia-vdpau-driver-ia32 (>= #VERSION#),
  ${shlibs:Depends}, ${misc:Depends}
 Recommends: nvidia-kernel-#VERSION#
 Suggests: nvidia-kernel-source (>= #VERSION#)
@@ -83,7 +83,7 @@
 Package: nvidia-libvdpau1
 Section: non-free/libs
 Architecture: i386 amd64
-Depends: nvidia-libvdpau1-driver (>= #VERSION#),
+Depends: nvidia-vdpau-driver (>= #VERSION#),
  ${shlibs:Depends}, ${misc:Depends}
 Recommends: nvidia-kernel-#VERSION#
 Suggests: nvidia-kernel-source (>= #VERSION#)
@@ -95,30 +95,32 @@
  graphics cards. See /usr/share/doc/nvidia-libvdpau/README.txt.gz for 
  more information.
 
-Package: nvidia-libvdpau1-driver
-Section: non-free/libs
-Architecture: i386 amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: nvidia-kernel-#VERSION#
-Suggests: nvidia-kernel-source (>= #VERSION#)
-Replaces: nvidia-glx (< 180.51), nvidia-libvdpau
+Package: nvidia-vdpau-driver
+Section: non-free/libs
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: nvidia-kernel-#VERSION#
+Suggests: nvidia-kernel-source (>= #VERSION#)
+Replaces: nvidia-glx (< 180.51), nvidia-libvdpau, nvidia-libvdpau1-driver
 Conflicts: nvidia-glx (< 180.51), nvidia-libvdpau,
- nvidia-libvdpau1 (<< 190.42-3)
+ nvidia-libvdpau1 (<< 190.42-3), nvidia-libvdpau1-driver
+Provides: vdpau-driver
 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
  graphics cards. See /usr/share/doc/nvidia-libvdpau/README.txt.gz for
  more information.
 
-Package: nvidia-libvdpau1-driver-ia32
-Section: non-free/libs
-Architecture: amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: nvidia-kernel-#VERSION#
-Suggests: nvidia-kernel-source (>= #VERSION#)
-Replaces: nvidia-glx (< 180.51), nvidia-libvdpau
+Package: nvidia-vdpau-driver-ia32
+Section: non-free/libs
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: nvidia-kernel-#VERSION#
+Suggests: nvidia-kernel-source (>= #VERSION#)
+Replaces: nvidia-glx (< 180.51), nvidia-libvdpau, nvidia-libvdpau1-driver-ia32
 Conflicts: nvidia-glx (< 180.51), nvidia-libvdpau,
- nvidia-libvdpau1 (<< 190.42-3)
+ nvidia-libvdpau1 (<< 190.42-3), nvidia-libvdpau1-driver-ia32
+Provides: vdpau-driver
 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

Copied: packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.lintian-overrides.amd64.in (from r664, packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver.lintian-overrides.amd64.in)
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.lintian-overrides.amd64.in?rev=667&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver.lintian-overrides.amd64.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.lintian-overrides.amd64.in Sun Nov 29 22:02:28 2009
@@ -1,4 +1,8 @@
-nvidia-libvdpau1-driver: binary-has-unneeded-section ./usr/lib/libvdpau_nvidia.so.#VERSION# .comment
+nvidia-vdpau-driver: binary-has-unneeded-section ./usr/lib/libvdpau_nvidia.so.#VERSION# .comment
 
 # libvdpau.so.1 does dlopen("libvdpau_*.so")
-nvidia-libvdpau1-driver: non-dev-pkg-with-shlib-symlink usr/lib/libvdpau_nvidia.so.#VERSION# usr/lib/libvdpau_nvidia.so
+nvidia-vdpau-driver: non-dev-pkg-with-shlib-symlink usr/lib/libvdpau_nvidia.so.#VERSION# usr/lib/libvdpau_nvidia.so
+
+# libvdpau_nvidia.so* will reside in usr/lib/vdpau in the future
+nvidia-vdpau-driver: shlib-without-versioned-soname usr/lib/libvdpau_nvidia.so.190.42 libvdpau_nvidia.so
+nvidia-vdpau-driver: package-name-doesnt-match-sonames libvdpau-nvidia

Copied: packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.lintian-overrides.i386.in (from r664, packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver.lintian-overrides.i386.in)
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.lintian-overrides.i386.in?rev=667&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver.lintian-overrides.i386.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.lintian-overrides.i386.in Sun Nov 29 22:02:28 2009
@@ -1,7 +1,11 @@
-nvidia-libvdpau1-driver: shlib-without-PT_GNU_STACK-section usr/lib/libvdpau_nvidia.so.#VERSION#
-nvidia-libvdpau1-driver: shlib-with-non-pic-code usr/lib/libvdpau_nvidia.so.#VERSION#
-nvidia-libvdpau1-driver: binary-has-unneeded-section ./usr/lib/libvdpau_nvidia.so.#VERSION# .comment
-nvidia-libvdpau1-driver: binary-has-unneeded-section ./usr/lib/libvdpau_nvidia.so.#VERSION# .note
+nvidia-vdpau-driver: shlib-without-PT_GNU_STACK-section usr/lib/libvdpau_nvidia.so.#VERSION#
+nvidia-vdpau-driver: shlib-with-non-pic-code usr/lib/libvdpau_nvidia.so.#VERSION#
+nvidia-vdpau-driver: binary-has-unneeded-section ./usr/lib/libvdpau_nvidia.so.#VERSION# .comment
+nvidia-vdpau-driver: binary-has-unneeded-section ./usr/lib/libvdpau_nvidia.so.#VERSION# .note
 
 # libvdpau.so.1 does dlopen("libvdpau_*.so")
-nvidia-libvdpau1-driver: non-dev-pkg-with-shlib-symlink usr/lib/libvdpau_nvidia.so.#VERSION# usr/lib/libvdpau_nvidia.so
+nvidia-vdpau-driver: non-dev-pkg-with-shlib-symlink usr/lib/libvdpau_nvidia.so.#VERSION# usr/lib/libvdpau_nvidia.so
+
+# libvdpau_nvidia.so* will reside in usr/lib/vdpau in the future
+nvidia-vdpau-driver: shlib-without-versioned-soname usr/lib/libvdpau_nvidia.so.190.42 libvdpau_nvidia.so
+nvidia-vdpau-driver: package-name-doesnt-match-sonames libvdpau-nvidia

Copied: packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.symbols.amd64 (from r664, packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver.symbols.amd64)
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.symbols.amd64?rev=667&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver.symbols.amd64 (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.symbols.amd64 Sun Nov 29 22:02:28 2009
@@ -1,2 +1,2 @@
-libvdpau_nvidia.so nvidia-libvdpau1-driver #MINVER#
+libvdpau_nvidia.so nvidia-vdpau-driver #MINVER#
  vdp_imp_device_create_x11 at Base 180.06

Copied: packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.symbols.i386 (from r664, packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver.symbols.i386)
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.symbols.i386?rev=667&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-driver.symbols.i386 (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.symbols.i386 Sun Nov 29 22:02:28 2009
@@ -1,4 +1,4 @@
-libvdpau_nvidia.so nvidia-libvdpau1-driver #MINVER#
+libvdpau_nvidia.so nvidia-vdpau-driver #MINVER#
  mknod at Base 180.06
  stat at Base 180.06
  vdp_imp_device_create_x11 at Base 180.06

Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=667&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Sun Nov 29 22:02:28 2009
@@ -44,11 +44,11 @@
 debian/nvidia-libvdpau1.lintian-overrides.amd64 debian/nvidia-libvdpau1.lintian-overrides.i386 \
 debian/nvidia-libvdpau1-ia32.lintian-overrides \
 debian/nvidia-libvdpau1-ia32.symbols \
-debian/nvidia-libvdpau1-driver.docs \
-debian/nvidia-libvdpau1-driver-ia32.links \
-debian/nvidia-libvdpau1-driver.links \
-debian/nvidia-libvdpau1-driver.lintian-overrides.amd64 \
-debian/nvidia-libvdpau1-driver.lintian-overrides.i386 \
+debian/nvidia-vdpau-driver.docs \
+debian/nvidia-vdpau-driver-ia32.links \
+debian/nvidia-vdpau-driver.links \
+debian/nvidia-vdpau-driver.lintian-overrides.amd64 \
+debian/nvidia-vdpau-driver.lintian-overrides.i386 \
 
 
 AUTOGEN=$(AUTOCLEAN) debian/copyright
@@ -202,7 +202,7 @@
 	install -m 0644 $(dirname)/usr/lib/libGLcore.so.${version} \
 		$(CURDIR)/debian/nvidia-glx/usr/lib
 	install -m 0644 $(dirname)/usr/lib/libvdpau_nvidia.so.${version} \
-			$(CURDIR)/debian/nvidia-libvdpau1-driver/usr/lib
+			$(CURDIR)/debian/nvidia-vdpau-driver/usr/lib
 	install -m 0644 $(dirname)/usr/lib/libvdpau.so.${version} \
 			$(CURDIR)/debian/nvidia-libvdpau1/usr/lib
 	install -m 0644 $(dirname)/usr/lib/libvdpau_trace.so.${version} \
@@ -239,7 +239,7 @@
 		install $(dirname)/usr/lib32/libGL.so.${version} \
 			$(CURDIR)/debian/nvidia-glx-ia32/usr/lib32 ; \
 		install $(dirname)/usr/lib32/libvdpau.so.${version} \
-			$(CURDIR)/debian/nvidia-libvdpau1-driver-ia32/usr/lib32 ; \
+			$(CURDIR)/debian/nvidia-vdpau-driver-ia32/usr/lib32 ; \
 		install $(dirname)/usr/lib32/libvdpau_nvidia.so.${version} \
 			$(CURDIR)/debian/nvidia-libvdpau1-ia32/usr/lib32 ; \
 		install $(dirname)/usr/lib32/libvdpau_trace.so.${version} \

More information about the Pkg-nvidia-devel mailing list