Hi, this patch updates the nvidia-libvdpau cleanup changes I suggested previously to the current evolution (emul/ia32-linux transition, ia32-libs changes) and my previous patches of this series. The shlibs file has been dropped, it was identical to the generated one.
I also incorporate the renaming of nvidia-libvdpau[-ia32] to nvidia-libvdpau1[-ia32] (#534536). There are currently neither transitional packages nor Provides: nvidia-libvdpau etc. in the renamed packages. If they are needed, drop me a note and I can easily add them. The only user of these packages is probably Christian with mplayer-dmo which would have to be rebuilt. The patch for debian/control is not included, please regenerate it via debian/rules clean. Andreas Beckmann wrote: > the new libvdpau packages are missing some symbolic links (they seem to > be created by ldconfig, but should be included in the package anyway): > > nvidia-libvdpau: > /usr/lib/libvdpau_nvidia.so -> libvdpau_nvidia.so.185.18.14 > /usr/lib/libvdpau_trace.so -> libvdpau_trace.so.185.18.14 > (the wrapper library dlopens libvdpau_*.so) > > nvidia-libvdpau-ia32: similarily > > The libvdpau.so symlink should go to the -dev package (and point to > libvdpau.so.1). > > (I just verified that mplayer (from mplayer-dmo source) does dlopen > libvdpau.so.1 not libvdpau.so .) Andreas
Index: debian/nvidia-libvdpau-ia32.links.in =================================================================== --- debian/nvidia-libvdpau-ia32.links.in (.../anbe-35-0-override-cleanup) (revision 830) +++ debian/nvidia-libvdpau-ia32.links.in (.../anbe-40-0-vdpau-cleanup) (revision 830) @@ -1 +0,0 @@ -usr/lib32/libvdpau.so.#VERSION# usr/lib32/libvdpau.so Index: debian/nvidia-libvdpau.shlibs =================================================================== --- debian/nvidia-libvdpau.shlibs (.../anbe-35-0-override-cleanup) (revision 830) +++ debian/nvidia-libvdpau.shlibs (.../anbe-40-0-vdpau-cleanup) (revision 830) @@ -1 +0,0 @@ -libvdpau 1 nvidia-libvdpau Index: debian/nvidia-libvdpau.links.in =================================================================== --- debian/nvidia-libvdpau.links.in (.../anbe-35-0-override-cleanup) (revision 830) +++ debian/nvidia-libvdpau.links.in (.../anbe-40-0-vdpau-cleanup) (revision 830) @@ -1,2 +0,0 @@ -usr/lib/libvdpau.so.#VERSION# usr/lib/libvdpau.so.1 -usr/lib/libvdpau.so.#VERSION# usr/lib/libvdpau.so Index: debian/nvidia-libvdpau-ia32.dirs =================================================================== --- debian/nvidia-libvdpau-ia32.dirs (.../anbe-35-0-override-cleanup) (revision 830) +++ debian/nvidia-libvdpau-ia32.dirs (.../anbe-40-0-vdpau-cleanup) (revision 830) @@ -1 +0,0 @@ -usr/lib32 Index: debian/nvidia-libvdpau.docs.in =================================================================== --- debian/nvidia-libvdpau.docs.in (.../anbe-35-0-override-cleanup) (revision 830) +++ debian/nvidia-libvdpau.docs.in (.../anbe-40-0-vdpau-cleanup) (revision 830) @@ -1,2 +0,0 @@ -#DIRNAME#/usr/share/doc/NVIDIA_Changelog -#DIRNAME#/usr/share/doc/README.txt Index: debian/nvidia-libvdpau.dirs =================================================================== --- debian/nvidia-libvdpau.dirs (.../anbe-35-0-override-cleanup) (revision 830) +++ debian/nvidia-libvdpau.dirs (.../anbe-40-0-vdpau-cleanup) (revision 830) @@ -1 +0,0 @@ -usr/lib Index: debian/nvidia-libvdpau1-ia32.links.in =================================================================== --- debian/nvidia-libvdpau1-ia32.links.in (.../anbe-35-0-override-cleanup) (revision 0) +++ debian/nvidia-libvdpau1-ia32.links.in (.../anbe-40-0-vdpau-cleanup) (revision 830) @@ -0,0 +1,4 @@ +usr/lib32/libvdpau.so.#VERSION# usr/lib32/libvdpau.so.1 +usr/lib32/libvdpau.so.1 usr/lib32/libvdpau.so +usr/lib32/libvdpau_nvidia.so.#VERSION# usr/lib32/libvdpau_nvidia.so +usr/lib32/libvdpau_trace.so.#VERSION# usr/lib32/libvdpau_trace.so Index: debian/control.in =================================================================== --- debian/control.in (.../anbe-35-0-override-cleanup) (revision 830) +++ debian/control.in (.../anbe-40-0-vdpau-cleanup) (revision 830) @@ -63,29 +63,29 @@ For more information on this source package visit NVIDIA's homepage at http://www.nvidia.com/ . -Package: nvidia-libvdpau-ia32 +Package: nvidia-libvdpau1-ia32 Section: non-free/libs Architecture: amd64 Pre-Depends: libc6-i386 (>= 2.9-18) Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: nvidia-kernel-#VERSION# Suggests: nvidia-kernel-source (>= #VERSION#) -Replaces: nvidia-glx-ia32 (< 180.51) -Conflicts: nvidia-glx-ia32 (< 180.51) +Replaces: nvidia-glx-ia32 (< 180.51), nvidia-libvdpau-ia32 +Conflicts: nvidia-glx-ia32 (< 180.51), nvidia-libvdpau-ia32 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 supported graphics cards. See /usr/share/doc/nvidia-libvdpau/README.txt.gz for more information. -Package: nvidia-libvdpau +Package: nvidia-libvdpau1 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) -Conflicts: nvidia-glx (< 180.51) +Replaces: nvidia-glx (< 180.51), nvidia-libvdpau +Conflicts: nvidia-glx (< 180.51), nvidia-libvdpau Description: NVIDIA vdpau libraries These libraries provide the Video Decode and Presentation API for Unix. They provide accelerated video playback (incl. H.264) for the supported @@ -95,9 +95,10 @@ Package: nvidia-libvdpau-dev Section: non-free/libdevel Architecture: i386 amd64 -Depends: nvidia-libvdpau (>= #VERSION#), ${misc:Depends} +Depends: nvidia-libvdpau1 (>= #VERSION#), ${misc:Depends} Replaces: nvidia-glx-dev (< 180.51) -Conflicts: nvidia-glx-dev (< 180.51), nvidia-libvdpau (>= #NEXTVER#) +Conflicts: nvidia-glx-dev (< 180.51), nvidia-libvdpau1 (>= #NEXTVER#) +Provides: nvidia-libvdpau1-dev Description: NVIDIA vdpau development files This package contains the NVIDIA vdpau development files. Index: debian/nvidia-libvdpau1.docs.in =================================================================== --- debian/nvidia-libvdpau1.docs.in (.../anbe-35-0-override-cleanup) (revision 0) +++ debian/nvidia-libvdpau1.docs.in (.../anbe-40-0-vdpau-cleanup) (revision 830) @@ -0,0 +1,2 @@ +#DIRNAME#/usr/share/doc/NVIDIA_Changelog +#DIRNAME#/usr/share/doc/README.txt Index: debian/nvidia-libvdpau1-ia32.dirs =================================================================== --- debian/nvidia-libvdpau1-ia32.dirs (.../anbe-35-0-override-cleanup) (revision 0) +++ debian/nvidia-libvdpau1-ia32.dirs (.../anbe-40-0-vdpau-cleanup) (revision 830) @@ -0,0 +1 @@ +usr/lib32 Index: debian/nvidia-libvdpau1.links.in =================================================================== --- debian/nvidia-libvdpau1.links.in (.../anbe-35-0-override-cleanup) (revision 0) +++ debian/nvidia-libvdpau1.links.in (.../anbe-40-0-vdpau-cleanup) (revision 830) @@ -0,0 +1,3 @@ +usr/lib/libvdpau.so.#VERSION# usr/lib/libvdpau.so.1 +usr/lib/libvdpau_nvidia.so.#VERSION# usr/lib/libvdpau_nvidia.so +usr/lib/libvdpau_trace.so.#VERSION# usr/lib/libvdpau_trace.so Index: debian/changelog =================================================================== --- debian/changelog (.../anbe-35-0-override-cleanup) (revision 830) +++ debian/changelog (.../anbe-40-0-vdpau-cleanup) (revision 830) @@ -14,8 +14,12 @@ invalid symlink) * switch to dh_lintian * update lintian overrides for nvidia-glx* + * nvidia-libvdpau* cleanup (closes: #519792) + * debian/nvidia-libvdpau.shlibs: removed, identical to generated shlibs + * rename nvidia-libvdpau* to nvidia-libvdpau1* (closes: #534536) + * cleanup leftover files from nvidia-libvdpau-ia32 - -- Andreas Beckmann <[email protected]> Sat, 04 Jul 2009 03:06:43 +0200 + -- Andreas Beckmann <[email protected]> Sat, 04 Jul 2009 11:20:56 +0200 nvidia-graphics-drivers (185.18.14-2) UNRELEASED; urgency=low Index: debian/rules =================================================================== --- debian/rules (.../anbe-35-0-override-cleanup) (revision 830) +++ debian/rules (.../anbe-40-0-vdpau-cleanup) (revision 830) @@ -29,10 +29,10 @@ AUTOGEN=debian/nvidia-kernel-source.README.Debian \ debian/copyright debian/nvidia-glx.links debian/nvidia-glx-dev.links \ -debian/nvidia-libvdpau.links debian/nvidia-libvdpau-ia32.links \ +debian/nvidia-libvdpau1.links debian/nvidia-libvdpau1-ia32.links \ debian/nvidia-glx.lintian-overrides.amd64 debian/nvidia-glx.lintian-overrides.i386 \ debian/nvidia-glx.docs debian/nvidia-glx.examples \ -debian/nvidia-libvdpau.docs \ +debian/nvidia-libvdpau1.docs \ debian/nvidia-glx.postrm debian/nvidia-glx.init \ debian/nvidia-glx-ia32.lintian-overrides debian/nvidia-glx-ia32.links \ debian/nvidia-kernel-source.docs debian/nvidia-glx-dev.preinst \ @@ -195,11 +195,11 @@ install -m 0644 $(dirname)/usr/lib/libcuda.so.${version} \ $(CURDIR)/debian/nvidia-glx/usr/lib install -m 0644 $(dirname)/usr/lib/libvdpau_nvidia.so.${version} \ - $(CURDIR)/debian/nvidia-libvdpau/usr/lib + $(CURDIR)/debian/nvidia-libvdpau1/usr/lib install -m 0644 $(dirname)/usr/lib/libvdpau.so.${version} \ - $(CURDIR)/debian/nvidia-libvdpau/usr/lib + $(CURDIR)/debian/nvidia-libvdpau1/usr/lib install -m 0644 $(dirname)/usr/lib/libvdpau_trace.so.${version} \ - $(CURDIR)/debian/nvidia-libvdpau/usr/lib + $(CURDIR)/debian/nvidia-libvdpau1/usr/lib @@ -234,11 +234,11 @@ install $(dirname)/usr/lib32/libcuda.so.${version} \ $(CURDIR)/debian/nvidia-glx-ia32/usr/lib32 ; \ install $(dirname)/usr/lib32/libvdpau.so.${version} \ - $(CURDIR)/debian/nvidia-libvdpau-ia32/usr/lib32 ; \ + $(CURDIR)/debian/nvidia-libvdpau1-ia32/usr/lib32 ; \ install $(dirname)/usr/lib32/libvdpau_nvidia.so.${version} \ - $(CURDIR)/debian/nvidia-libvdpau-ia32/usr/lib32 ; \ + $(CURDIR)/debian/nvidia-libvdpau1-ia32/usr/lib32 ; \ install $(dirname)/usr/lib32/libvdpau_trace.so.${version} \ - $(CURDIR)/debian/nvidia-libvdpau-ia32/usr/lib32 ; \ + $(CURDIR)/debian/nvidia-libvdpau1-ia32/usr/lib32 ; \ install $(dirname)/usr/lib32/libnvidia-tls.so.${version} \ $(CURDIR)/debian/nvidia-glx-ia32/usr/lib32 ; \ install $(dirname)/usr/lib32/tls/libnvidia-tls.so.${version} \ Index: debian/nvidia-libvdpau1.dirs =================================================================== --- debian/nvidia-libvdpau1.dirs (.../anbe-35-0-override-cleanup) (revision 0) +++ debian/nvidia-libvdpau1.dirs (.../anbe-40-0-vdpau-cleanup) (revision 830) @@ -0,0 +1 @@ +usr/lib Index: debian/nvidia-libvdpau-dev.links =================================================================== --- debian/nvidia-libvdpau-dev.links (.../anbe-35-0-override-cleanup) (revision 0) +++ debian/nvidia-libvdpau-dev.links (.../anbe-40-0-vdpau-cleanup) (revision 830) @@ -0,0 +1 @@ +usr/lib/libvdpau.so.1 usr/lib/libvdpau.so Index: debian/nvidia-libvdpau1-ia32.postinst =================================================================== --- debian/nvidia-libvdpau1-ia32.postinst (.../anbe-35-0-override-cleanup) (revision 0) +++ debian/nvidia-libvdpau1-ia32.postinst (.../anbe-40-0-vdpau-cleanup) (revision 830) @@ -0,0 +1,49 @@ +#!/bin/sh +# postinst script for nvidia-libvdpau1-ia32 +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <postinst> `configure' <most-recently-configured-version> +# * <old-postinst> `abort-upgrade' <new version> +# * <conflictor's-postinst> `abort-remove' `in-favour' <package> +# <new-version> +# * <postinst> `abort-remove' +# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' +# <failed-install-package> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + configure) + + # these files were not shipped in the package nvidia-libvdpau (before + # the emul/ia32-linux transiotion) but generated by ldconfig + test ! -L /emul/ia32-linux/usr/lib/libvdpau.so.1 || \ + rm /emul/ia32-linux/usr/lib/libvdpau.so.1 || true + test ! -L /emul/ia32-linux/usr/lib/libvdpau_nvidia.so || \ + rm /emul/ia32-linux/usr/lib/libvdpau_nvidia.so || true + test ! -L /emul/ia32-linux/usr/lib/libvdpau_trace.so || \ + rm /emul/ia32-linux/usr/lib/libvdpau_trace.so || true + + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0
