[SCM] intel-vaapi-driver/master: debian/: Multi-Arch support added

[mfv-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2a98c9e4783a0846e46364b1210b7497e2771067
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Wed Feb 15 19:36:55 2012 +0100

    debian/: Multi-Arch support added
    
    Actually it fails to build because of
    a broken debian/rules. Gotta fix asap.
    
    Git-Dch: Short

diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 9445d3a..ce6a378 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
  Reinhard Tartler <siretart at tauware.de>,
  Matteo F. Vescovi <mfv.debian at gmail.com>
 Build-Depends:
- debhelper (>= 8),
+ debhelper (>= 9),
  dh-autoreconf,
  libdrm-dev,
  libva-dev (>> 1.0.15~),
@@ -20,6 +20,8 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/intel-vaapi-driv
 
 Package: libva-intel-vaapi-driver
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends:
  libva1,
  ${misc:Depends},
@@ -47,6 +49,7 @@ Description: VAAPI driver for Intel G45 & HD Graphics family
 
 Package: i965-va-driver
 Architecture: all
+Multi-Arch: foreign
 Depends:
  libva-intel-vaapi-driver,
  ${misc:Depends}
@@ -74,6 +77,7 @@ Description: VAAPI driver for Intel G45 & HD Graphics family (transitional packa
 Package: libva-intel-vaapi-driver-dbg
 Section: debug
 Architecture: any
+Multi-Arch: same
 Depends:
  libva-intel-vaapi-driver (= ${binary:Version}),
  ${misc:Depends}
diff --git a/debian/libva-intel-vaapi-driver.install b/debian/libva-intel-vaapi-driver.install
index 55500c8..6deaf51 100644
--- a/debian/libva-intel-vaapi-driver.install
+++ b/debian/libva-intel-vaapi-driver.install
@@ -1 +1 @@
-usr/lib/dri/*.so
+usr/lib/*/dri/*.so
diff --git a/debian/rules b/debian/rules
index 6fda0f1..60858b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
 	dh $@ --with autoreconf

-- 
intel-vaapi-driver packaging