Merge remote branch 'origin/multiarch' into debian-unstable

Conflicts:
	debian/control
	debian/rules

8 files changed, 25 insertions, 10 deletions

diff --git a/debian/compat b/debian/compat
index 45a4fb75..ec635144 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 793dbb22..1a21fbc5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: Cyril Brulebois <kibi@debian.org>
 Build-Depends:
- debhelper (>= 8),
+ debhelper (>= 8.1.2ubuntu2),
  dh-autoreconf,
  quilt,
  libx11-dev,
@@ -42,6 +42,8 @@ Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: Userspace interface to kernel DRM services -- runtime
  This library implements the userspace interface to the kernel DRM
  services.  DRM stands for "Direct Rendering Manager", which is the
@@ -58,6 +60,7 @@ Architecture: any
 Depends:
  libdrm2 (= ${binary:Version}),
  ${misc:Depends},
+Multi-Arch: same
 Description: Userspace interface to kernel DRM services -- debugging symbols
  This library implements the userspace interface to the kernel DRM
  services.  DRM stands for "Direct Rendering Manager", which is the
@@ -73,6 +76,8 @@ Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Userspace interface to intel-specific kernel DRM services -- runtime
  This library implements the userspace interface to the intel-specific kernel
  DRM services.  DRM stands for "Direct Rendering Manager", which is the
@@ -86,6 +91,7 @@ Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
 Depends:
  libdrm-intel1 (= ${binary:Version}),
  ${misc:Depends},
+Multi-Arch: same
 Description: Userspace interface to intel-specific kernel DRM services -- debugging symbols
  This library implements the userspace interface to the kernel DRM services.
  DRM stands for "Direct Rendering Manager", which is the kernelspace portion
@@ -100,6 +106,8 @@ Architecture: linux-any
 Depends: ${shlibs:Depends},
  ${misc:Depends},
 Conflicts: libdrm-nouveau1
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Userspace interface to nouveau-specific kernel DRM services -- runtime
  This library implements the userspace interface to the nouveau-specific kernel
  DRM services. DRM stands for "Direct Rendering Manager", which is the
@@ -113,6 +121,7 @@ Architecture: linux-any
 Depends: libdrm-nouveau1a (= ${binary:Version}),
  ${misc:Depends},
 Conflicts: libdrm-nouveau1-dbg
+Multi-Arch: same
 Description: Userspace interface to nouveau-specific kernel DRM -- debugging symbols
  This library implements the userspace interface to the kernel DRM services.
  DRM stands for "Direct Rendering Manager", which is the kernelspace portion
@@ -127,6 +136,8 @@ Architecture: linux-any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Userspace interface to radeon-specific kernel DRM services -- runtime
  This library implements the userspace interface to the radeon-specific kernel
  DRM services.  DRM stands for "Direct Rendering Manager", which is the
@@ -140,6 +151,7 @@ Architecture: linux-any
 Depends:
  libdrm-radeon1 (= ${binary:Version}),
  ${misc:Depends},
+Multi-Arch: same
 Description: Userspace interface to radeon-specific kernel DRM services -- debugging symbols
  This library implements the userspace interface to the kernel DRM services.
  DRM stands for "Direct Rendering Manager", which is the kernelspace portion
@@ -152,6 +164,8 @@ Package: libkms1
 Section: libs
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: Userspace interface to kernel DRM buffer management
  This library implements a unified userspace interface to the different buffer
  management interfaces of the kernel DRM hardware drivers.
@@ -161,6 +175,7 @@ Section: debug
 Priority: extra
 Architecture: linux-any
 Depends: libkms1 (= ${binary:Version}), ${misc:Depends}
+Multi-Arch: same
 Description: Userspace interface to kernel DRM buffer management -- debugging symbols
  This library implements a unified userspace interface to the different buffer
  management interfaces of the kernel DRM hardware drivers.
diff --git a/debian/libdrm-dev.install b/debian/libdrm-dev.install
index 6cd8ddd2..76f28fa2 100644
--- a/debian/libdrm-dev.install
+++ b/debian/libdrm-dev.install
@@ -1,4 +1,4 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
diff --git a/debian/libdrm-intel1.install b/debian/libdrm-intel1.install
index 149ef107..23861696 100644
--- a/debian/libdrm-intel1.install
+++ b/debian/libdrm-intel1.install
@@ -1 +1 @@
-usr/lib/libdrm_intel.so.1*
+usr/lib/*/libdrm_intel.so.1*
diff --git a/debian/libdrm-nouveau1a.install b/debian/libdrm-nouveau1a.install
index b19813f5..6c550808 100644
--- a/debian/libdrm-nouveau1a.install
+++ b/debian/libdrm-nouveau1a.install
@@ -1 +1 @@
-usr/lib/libdrm_nouveau.so.1*
+usr/lib/*/libdrm_nouveau.so.1*
diff --git a/debian/libdrm-radeon1.install b/debian/libdrm-radeon1.install
index 24e5a6b7..158f5592 100644
--- a/debian/libdrm-radeon1.install
+++ b/debian/libdrm-radeon1.install
@@ -1 +1 @@
-usr/lib/libdrm_radeon.so.1*
+usr/lib/*/libdrm_radeon.so.1*
diff --git a/debian/libdrm2.install b/debian/libdrm2.install
index c2f2241f..6e2fd9b1 100644
--- a/debian/libdrm2.install
+++ b/debian/libdrm2.install
@@ -1 +1 @@
-usr/lib/libdrm.so.2*
+usr/lib/*/libdrm.so.2*
diff --git a/debian/libkms1.install b/debian/libkms1.install
index 2d29800f..84efd1f3 100644
--- a/debian/libkms1.install
+++ b/debian/libkms1.install
@@ -1 +1 @@
-usr/lib/libkms.so.1*
+usr/lib/*/libkms.so.1*