diff -Nru xvba-video-0.7.8/debian/changelog xvba-video-0.7.8/debian/changelog --- xvba-video-0.7.8/debian/changelog 2011-12-13 17:39:16.000000000 +0000 +++ xvba-video-0.7.8/debian/changelog 2012-04-21 18:26:57.000000000 +0000 @@ -1,3 +1,11 @@ +xvba-video (0.7.8-1ubuntu3) precise; urgency=low + + * debian/rules, debian/install.in: + - Add support for the multiarch paths to the packaging and install VA-API + driver in the correct location. (LP: #969579) + + -- Krzysztof Klimonda Thu, 19 Apr 2012 19:45:19 +0200 + xvba-video (0.7.8-1ubuntu2) precise; urgency=low * debian/control: Accept fglrx-update package also (LP: #871615) diff -Nru xvba-video-0.7.8/debian/links xvba-video-0.7.8/debian/links --- xvba-video-0.7.8/debian/links 2011-12-13 17:38:32.000000000 +0000 +++ xvba-video-0.7.8/debian/links 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/lib/va/drivers/xvba_drv_video.so usr/lib/va/drivers/fglrx_drv_video.so -usr/lib/va/drivers/fglrx_drv_video.so usr/lib/dri/fglrx_drv_video.so diff -Nru xvba-video-0.7.8/debian/links.in xvba-video-0.7.8/debian/links.in --- xvba-video-0.7.8/debian/links.in 1970-01-01 00:00:00.000000000 +0000 +++ xvba-video-0.7.8/debian/links.in 2012-04-19 17:55:06.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/@MULTIARCH@/dri/xvba_drv_video.so usr/lib/@MULTIARCH@/dri/fglrx_drv_video.so diff -Nru xvba-video-0.7.8/debian/rules xvba-video-0.7.8/debian/rules --- xvba-video-0.7.8/debian/rules 2011-12-13 17:38:32.000000000 +0000 +++ xvba-video-0.7.8/debian/rules 2012-04-21 18:29:00.000000000 +0000 @@ -13,6 +13,8 @@ ARCH := x86 endif +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + configure: configure-stamp configure-stamp: dh_testdir @@ -24,15 +26,20 @@ touch $@ clean: + [ -f debian/links ] && rm debian/links || true dh_testdir dh_testroot dh_clean +%: %.in + sed -e 's/@MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ + install: build + $(MAKE) -f debian/rules debian/links dh_testdir dh_testroot dh_prep - dh_install "$(ARCH)/xvba_drv_video.so" "usr/lib/va/drivers/" + dh_install "$(ARCH)/xvba_drv_video.so" "usr/lib/$(DEB_HOST_MULTIARCH)/dri/" binary-arch: build install dh_testdir