[SCM] libva/master: debian/: Multi-Arch support added

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

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

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

diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index b23c9eb..34c9230 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 (>= 7.0.50),
+ debhelper (>= 9),
  dh-autoreconf,
  libdrm-dev,
  libgl1-mesa-dev | libgl-dev,
@@ -24,6 +24,7 @@ DM-Upload-Allowed: yes
 Package: libva-dev
 Section: libdevel
 Architecture: all
+Multi-Arch: foreign
 Depends:
  libva-egl1 (<< ${source:Upstream-Version}+1~),
  libva-egl1 (>= ${source:Upstream-Version}),
@@ -51,6 +52,8 @@ Description: Video Acceleration (VA) API for Linux -- development files
 
 Package: libva1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
@@ -70,6 +73,8 @@ Description: Video Acceleration (VA) API for Linux -- runtime
 
 Package: libva-x11-1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
@@ -87,6 +92,8 @@ Description: Video Acceleration (VA) API for Linux -- X11 runtime
 
 Package: libva-glx1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
@@ -104,6 +111,8 @@ Description: Video Acceleration (VA) API for Linux -- GLX runtime
 
 Package: libva-tpi1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
@@ -121,6 +130,8 @@ Description: Video Acceleration (VA) API for Linux -- TPI runtime
 
 Package: libva-egl1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
@@ -139,6 +150,7 @@ Description: Video Acceleration (VA) API for Linux -- EGL runtime
 Package: vainfo
 Section: video
 Architecture: any
+Multi-Arch: same
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
@@ -156,6 +168,7 @@ Description: Video Acceleration (VA) API for Linux -- info program
 
 Package: libva-utils
 Architecture: any
+Multi-Arch: same
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
diff --git a/debian/libva-dev.install b/debian/libva-dev.install
index fe52020..f4a5982 100644
--- a/debian/libva-dev.install
+++ b/debian/libva-dev.install
@@ -1,7 +1,7 @@
 usr/include
-usr/lib/libva-egl.so
-usr/lib/libva-glx.so
-usr/lib/libva-tpi.so
-usr/lib/libva-x11.so
-usr/lib/libva.so
-usr/lib/pkgconfig
+usr/lib/*/libva-egl.so
+usr/lib/*/libva-glx.so
+usr/lib/*/libva-tpi.so
+usr/lib/*/libva-x11.so
+usr/lib/*/libva.so
+usr/lib/*/pkgconfig
diff --git a/debian/libva-egl1.install b/debian/libva-egl1.install
index 3afc4fe..d253ecb 100644
--- a/debian/libva-egl1.install
+++ b/debian/libva-egl1.install
@@ -1 +1 @@
-usr/lib/libva-egl.so.*
+usr/lib/*/libva-egl.so.*
diff --git a/debian/libva-glx1.install b/debian/libva-glx1.install
index a9c55a5..5eb1ccf 100644
--- a/debian/libva-glx1.install
+++ b/debian/libva-glx1.install
@@ -1 +1 @@
-usr/lib/libva-glx.so.*
+usr/lib/*/libva-glx.so.*
diff --git a/debian/libva-tpi1.install b/debian/libva-tpi1.install
index c9c7c17..22489d0 100644
--- a/debian/libva-tpi1.install
+++ b/debian/libva-tpi1.install
@@ -1 +1 @@
-usr/lib/libva-tpi.so.*
+usr/lib/*/libva-tpi.so.*
diff --git a/debian/libva-x11-1.install b/debian/libva-x11-1.install
index 7616e69..ec23ae6 100644
--- a/debian/libva-x11-1.install
+++ b/debian/libva-x11-1.install
@@ -1 +1 @@
-usr/lib/libva-x11.so.*
+usr/lib/*/libva-x11.so.*
diff --git a/debian/libva1.install b/debian/libva1.install
index 01da472..6a36d7b 100644
--- a/debian/libva1.install
+++ b/debian/libva1.install
@@ -1,2 +1,2 @@
-usr/lib/dri/dummy_drv_video.so
-usr/lib/libva.so.*
+usr/lib/*/dri/dummy_drv_video.so
+usr/lib/*/libva.so.*
diff --git a/debian/rules b/debian/rules
index 3de8832..b8d772c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 CONFIGURE_OPTIONS ?= --prefix=/usr --disable-silent-rules
 

-- 
libva packaging