Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Control: block -1 by 684871 Please unblock package libvdpau Since nvidia-vdpau-driver-ia32 has been turned into an empty transitional package we can drop the lib32vdpau1 package and therefore remove the unavailable build-depends ia32-libs-dev, fixing #679524 unblock libvdpau/0.4.1-7
diffstat for libvdpau-0.4.1 libvdpau-0.4.1 changelog | 13 +++++++++++++ control | 24 ++---------------------- lib32vdpau1.install | 3 --- lib32vdpau1.lintian-overrides | 1 - lib32vdpau1.postinst | 21 --------------------- lib32vdpau1.symbols | 1 - libvdpau-doc.lintian-overrides | 2 +- rules | 32 +++----------------------------- 8 files changed, 19 insertions(+), 78 deletions(-) diff -Nru libvdpau-0.4.1/debian/changelog libvdpau-0.4.1/debian/changelog --- libvdpau-0.4.1/debian/changelog 2012-05-22 23:13:18.000000000 +0200 +++ libvdpau-0.4.1/debian/changelog 2012-08-16 02:21:22.000000000 +0200 @@ -1,3 +1,16 @@ +libvdpau (0.4.1-7) unstable; urgency=low + + * The last (and only) reverse dependency of lib32vdpau1 was the non-free + nvidia-vdpau-driver-ia32 which is now an empty transitional package. + * d/{control,lib32vdpau1.*}: Drop lib32vdpau1 package. (Closes: #679524) + * d/{control,rules}: Remove support for building the extra 32-bit biarch + library on amd64. + * libvdpau1: Add Replaces/Conflicts: lib32vdpau1 to ensure the old biarch + package gets removed properly. + * Update lintian overrides for duplicate files generated by doxygen. + + -- Andreas Beckmann <deb...@abeckmann.de> Thu, 16 Aug 2012 02:05:59 +0200 + libvdpau (0.4.1-6) unstable; urgency=low [ Maurizio Avogadro ] diff -Nru libvdpau-0.4.1/debian/control libvdpau-0.4.1/debian/control --- libvdpau-0.4.1/debian/control 2012-05-22 23:13:18.000000000 +0200 +++ libvdpau-0.4.1/debian/control 2012-08-16 02:21:22.000000000 +0200 @@ -15,8 +15,6 @@ libx11-dev, x11proto-dri2-dev (>= 2.2), libxext-dev, - g++-multilib [amd64], - ia32-libs-dev [amd64], Build-Depends-Indep: doxygen-latex, graphviz, @@ -57,15 +55,15 @@ nvidia-libvdpau1, nvidia-libvdpau-ia32, nvidia-libvdpau1-ia32, + lib32vdpau1, Conflicts: nvidia-libvdpau, nvidia-libvdpau1, nvidia-libvdpau-ia32, nvidia-libvdpau1-ia32, - lib32vdpau1 [i386], + lib32vdpau1, Suggests: nvidia-vdpau-driver [amd64 i386] - | nvidia-vdpau-driver-ia32 [amd64] | vdpau-driver Description: Video Decode and Presentation API for Unix (libraries) VDPAU (Video Decode and Presentation API for Unix) is an open source @@ -77,24 +75,6 @@ . This package contains the VDPAU wrapper and trace libraries. -Package: lib32vdpau1 -Architecture: amd64 -Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: nvidia-libvdpau1-ia32 -Conflicts: nvidia-libvdpau1-ia32 -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 - library (libvdpau) and API designed by NVIDIA originally for its GeForce - 8 series and later GPU hardware, targeted at the X Window System on Unix - operating-systems (including Linux, FreeBSD, and Solaris). This VDPAU API - allows video programs to offload portions of the video decoding process - and video post-processing to the GPU video-hardware. - . - This package contains the VDPAU wrapper and trace 32-bit libraries. - Package: libvdpau-doc Architecture: all Section: doc diff -Nru libvdpau-0.4.1/debian/lib32vdpau1.install libvdpau-0.4.1/debian/lib32vdpau1.install --- libvdpau-0.4.1/debian/lib32vdpau1.install 2012-05-22 23:13:18.000000000 +0200 +++ libvdpau-0.4.1/debian/lib32vdpau1.install 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -usr/lib32/libvdpau.so -usr/lib32/libvdpau.so.* -usr/lib32/vdpau/libvdpau_trace.so.* diff -Nru libvdpau-0.4.1/debian/lib32vdpau1.lintian-overrides libvdpau-0.4.1/debian/lib32vdpau1.lintian-overrides --- libvdpau-0.4.1/debian/lib32vdpau1.lintian-overrides 2012-05-22 23:13:18.000000000 +0200 +++ libvdpau-0.4.1/debian/lib32vdpau1.lintian-overrides 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -lib32vdpau1: non-dev-pkg-with-shlib-symlink usr/lib32/libvdpau.so.1.0.0 usr/lib32/libvdpau.so diff -Nru libvdpau-0.4.1/debian/lib32vdpau1.postinst libvdpau-0.4.1/debian/lib32vdpau1.postinst --- libvdpau-0.4.1/debian/lib32vdpau1.postinst 2012-05-22 23:13:18.000000000 +0200 +++ libvdpau-0.4.1/debian/lib32vdpau1.postinst 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -#!/bin/sh -set -e - - -if [ "$1" = "configure" ]; then - # <target: squeeze> - # these files were not shipped in the package nvidia-libvdpau (before - # the emul/ia32-linux transition) 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 - # </target: squeeze> -fi - - -#DEBHELPER# - -exit 0 diff -Nru libvdpau-0.4.1/debian/lib32vdpau1.symbols libvdpau-0.4.1/debian/lib32vdpau1.symbols --- libvdpau-0.4.1/debian/lib32vdpau1.symbols 2012-05-22 23:13:18.000000000 +0200 +++ libvdpau-0.4.1/debian/lib32vdpau1.symbols 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "libvdpau1.symbols" diff -Nru libvdpau-0.4.1/debian/libvdpau-doc.lintian-overrides libvdpau-0.4.1/debian/libvdpau-doc.lintian-overrides --- libvdpau-0.4.1/debian/libvdpau-doc.lintian-overrides 2012-05-22 23:13:18.000000000 +0200 +++ libvdpau-0.4.1/debian/libvdpau-doc.lintian-overrides 2012-08-16 02:21:22.000000000 +0200 @@ -1,2 +1,2 @@ # doxygen generated files -duplicate-files usr/share/doc/libvdpau-doc/html/*.map +duplicate-files usr/share/doc/libvdpau-doc/html/ftv2*.png usr/share/doc/libvdpau-doc/html/ftv2*.png diff -Nru libvdpau-0.4.1/debian/rules libvdpau-0.4.1/debian/rules --- libvdpau-0.4.1/debian/rules 2012-05-22 23:13:18.000000000 +0200 +++ libvdpau-0.4.1/debian/rules 2012-08-16 02:21:22.000000000 +0200 @@ -15,13 +15,6 @@ CONFIGURE_OPTIONS ?= $(call cond_enable) \ --enable-dri2 -32-ARCHS=amd64 -ifneq (,$(findstring $(DEB_HOST_ARCH), $(32-ARCHS))) -EXTRA_CONFIGURE += configure32 -EXTRA_BUILD += build32 -EXTRA_INSTALL += install32 -endif - %: dh $@ --with autoreconf @@ -30,33 +23,18 @@ override_dh_autoreconf: dh_autoreconf --as-needed -override_dh_auto_configure: $(EXTRA_CONFIGURE) +override_dh_auto_configure: dh_testdir LDFLAGS="-Wl,--as-needed $$(dpkg-buildflags --get LDFLAGS)" ./configure \ --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ $(CONFIGURE_OPTIONS) -configure32: - dh_testdir - mkdir debian/32 - cd debian/32 && \ - CC="$(CC) -m32" CXX="$(CXX) -m32" \ - LDFLAGS="-Wl,--as-needed $$(dpkg-buildflags --get LDFLAGS)" \ - ../../configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32 \ - $(CONFIGURE_OPTIONS) - -override_dh_auto_build: $(EXTRA_BUILD) +override_dh_auto_build: dh_auto_build -build32: - dh_auto_build --sourcedirectory=debian/32 - -override_dh_auto_install: $(EXTRA_INSTALL) +override_dh_auto_install: dh_auto_install -install32: - dh_auto_install --sourcedirectory=debian/32 - override_dh_installdocs: dh_installdocs -X.md5 @@ -64,9 +42,5 @@ override_dh_makeshlibs: dh_makeshlibs -Xvdpau/libvdpau_trace.so.1 -override_dh_auto_clean: - dh_auto_clean - rm -rf debian/32 - get-orig-source: $(dir $_)libvdpau-get-orig-source