[SCM] x264/master: Allow dev package to be multiarch installable.

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

The following commit has been merged in the master branch:
commit a698db1b6457ab37672abe4eda047d2c231603c3
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Sat Mar 17 13:16:54 2012 -0400

    Allow dev package to be multiarch installable.

diff --git a/debian/changelog b/debian/changelog
index 878ec80..9b06f8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x264 (2:0.120.2171+git01f7a33-2) unstable; urgency=low
+
+  * Allow dev package to be multiarch installable.
+
+ -- Andres Mejia <amejia at debian.org>  Sat, 17 Mar 2012 13:16:15 -0400
+
 x264 (2:0.120.2171+git01f7a33-1) unstable; urgency=low
 
   * Update to new upstream snapshot
diff --git a/debian/control b/debian/control
index 6178f39..353513d 100644
--- a/debian/control
+++ b/debian/control
@@ -65,6 +65,7 @@ Description: x264 video coding library
 Package: libx264-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends:
  libx264-120 (= ${binary:Version}),
  ${misc:Depends}
diff --git a/debian/control.in b/debian/control.in
index 7e11db1..acff44a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -65,6 +65,7 @@ Description: x264 video coding library
 Package: libx264-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends:
  @libx264N@ (= ${binary:Version}),
  ${misc:Depends}

-- 
x264 packaging