diff -pruN 0.4.1-3/debian/changelog 0.4.1-3ubuntu1/debian/changelog --- 0.4.1-3/debian/changelog 2011-09-08 08:38:38.000000000 +0000 +++ 0.4.1-3ubuntu1/debian/changelog 2011-12-07 02:52:34.000000000 +0000 @@ -1,3 +1,14 @@ +libvdpau (0.4.1-3ubuntu1) precise; urgency=low + + * Merge from debian testing. Remaining changes: + - Drop gcc-multilib and ia32-libs-dev from build-dependencies + - Drop lib32vdpau1 binary package from debian/control + - Drop lib32vdpau1.{lintian-overriders,install,symbols,postinst} files + - Comment out 32-ARCHS in debian/rules so multilib stuff isn't run + - Mark Debian VCS links XS-Debian + + -- Micah Gersten Tue, 06 Dec 2011 20:52:27 -0600 + libvdpau (0.4.1-3) unstable; urgency=low [ Andres Mejia ] @@ -27,6 +38,13 @@ libvdpau (0.4.1-3) unstable; urgency=low -- Andreas Beckmann Thu, 08 Sep 2011 10:32:24 +0200 +libvdpau (0.4.1-2ubuntu1) natty; urgency=low + + * Merge from debian unstable. Remaining changes: (LP: #689778) + - Disable 32bit libraries on amd64, ia32-libs is in universe. + + -- Artur Rona Sat, 04 Dec 2010 17:03:43 +0100 + libvdpau (0.4.1-2) unstable; urgency=high * Provide an upload to unstable to fix build failure. (Closes: #603220) @@ -48,6 +66,13 @@ libvdpau (0.4.1-1) experimental; urgency -- Andres Mejia Mon, 20 Sep 2010 13:52:11 -0400 +libvdpau (0.4-5ubuntu1) maverick; urgency=low + + * disable 32bit libraries on amd64, ia32-libs is in universe, LP: #597736 + * update Maintainers field. + + -- Reinhard Tartler Sat, 26 Jun 2010 18:31:31 +0200 + libvdpau (0.4-5) unstable; urgency=low [ Russ Allbery ] diff -pruN 0.4.1-3/debian/control 0.4.1-3ubuntu1/debian/control --- 0.4.1-3/debian/control 2011-09-08 08:38:38.000000000 +0000 +++ 0.4.1-3ubuntu1/debian/control 2011-12-07 02:46:53.000000000 +0000 @@ -1,7 +1,8 @@ Source: libvdpau Section: libs Priority: optional -Maintainer: Debian NVIDIA Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian NVIDIA Maintainers Uploaders: Jean-Yves Avenard , Andres Mejia , @@ -15,16 +16,14 @@ Build-Depends: libx11-dev, x11proto-dri2-dev (>= 2.2), libxext-dev, - g++-multilib [amd64], - ia32-libs-dev [amd64], Build-Depends-Indep: doxygen-latex, graphviz, ghostscript, Standards-Version: 3.9.2 Homepage: http://cgit.freedesktop.org/~aplattner/libvdpau -Vcs-Git: git://git.debian.org/git/pkg-nvidia/libvdpau.git -Vcs-Browser: http://git.debian.org/?p=pkg-nvidia/libvdpau.git +XS-Debian-Vcs-Git: git://git.debian.org/git/pkg-nvidia/libvdpau.git +XS-Debian-Vcs-Browser: http://git.debian.org/?p=pkg-nvidia/libvdpau.git Package: libvdpau-dev Architecture: any @@ -76,24 +75,6 @@ Description: Video Decode and Presentati . 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 -pruN 0.4.1-3/debian/lib32vdpau1.install 0.4.1-3ubuntu1/debian/lib32vdpau1.install --- 0.4.1-3/debian/lib32vdpau1.install 2011-09-08 08:38:38.000000000 +0000 +++ 0.4.1-3ubuntu1/debian/lib32vdpau1.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -usr/lib32/libvdpau.so -usr/lib32/libvdpau.so.* -usr/lib32/vdpau/libvdpau_trace.so.* diff -pruN 0.4.1-3/debian/lib32vdpau1.lintian-overrides 0.4.1-3ubuntu1/debian/lib32vdpau1.lintian-overrides --- 0.4.1-3/debian/lib32vdpau1.lintian-overrides 2011-09-08 08:38:38.000000000 +0000 +++ 0.4.1-3ubuntu1/debian/lib32vdpau1.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -lib32vdpau1: non-dev-pkg-with-shlib-symlink usr/lib32/libvdpau.so.1.0.0 usr/lib32/libvdpau.so diff -pruN 0.4.1-3/debian/lib32vdpau1.postinst 0.4.1-3ubuntu1/debian/lib32vdpau1.postinst --- 0.4.1-3/debian/lib32vdpau1.postinst 2011-09-08 08:38:38.000000000 +0000 +++ 0.4.1-3ubuntu1/debian/lib32vdpau1.postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -#!/bin/sh -set -e - - -if [ "$1" = "configure" ]; then - # - # 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 - # -fi - - -#DEBHELPER# - -exit 0 diff -pruN 0.4.1-3/debian/lib32vdpau1.symbols 0.4.1-3ubuntu1/debian/lib32vdpau1.symbols --- 0.4.1-3/debian/lib32vdpau1.symbols 2011-09-08 08:38:38.000000000 +0000 +++ 0.4.1-3ubuntu1/debian/lib32vdpau1.symbols 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "libvdpau1.symbols" diff -pruN 0.4.1-3/debian/rules 0.4.1-3ubuntu1/debian/rules --- 0.4.1-3/debian/rules 2011-09-08 08:38:38.000000000 +0000 +++ 0.4.1-3ubuntu1/debian/rules 2011-09-09 05:07:28.000000000 +0000 @@ -15,7 +15,7 @@ endef CONFIGURE_OPTIONS ?= $(call cond_enable) \ --enable-dri2 -32-ARCHS=amd64 +# 32-ARCHS=amd64 ifneq (,$(findstring $(DEB_HOST_ARCH), $(32-ARCHS))) EXTRA_CONFIGURE += configure32 EXTRA_BUILD += build32