From ee401ece4d9cdf568926530d9fcae75c01141a5d Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Fri, 23 Dec 2011 19:47:14 -0500
Subject: [PATCH] Support multiarch

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 debian/changelog           | 1 +
 debian/control             | 9 ++++++---
 debian/control.in          | 4 ++++
 debian/libyaml-0-2.install | 2 +-
 debian/libyaml-dev.install | 6 +++---
 debian/rules               | 6 ++++++
 6 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 57b5bf1..56414be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libyaml (0.1.4-2) UNRELEASED; urgency=low
 
   * Remove extra libyaml-0.so symlink from libyaml-dev.
   * Bump Debhelper compat level to 9.
+  * Support multiarch.  (LP: #905630)
 
  -- Anders Kaseorg <andersk@mit.edu>  Fri, 23 Dec 2011 20:35:55 -0500
 
diff --git a/debian/control b/debian/control
index f3270cc..5906f6b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,9 @@ Source: libyaml
 Section: libs
 Priority: optional
 Maintainer: Anders Kaseorg <andersk@mit.edu>
-Build-Depends: cdbs,
- autotools-dev,
+Build-Depends: autotools-dev,
  debhelper (>= 8.1.3~),
- dh-buildinfo
+ cdbs (>= 0.4.93~)
 Standards-Version: 3.9.2
 Homepage: http://pyyaml.org/wiki/LibYAML
 Vcs-Git: git://andersk.mit.edu/libyaml.git
@@ -13,7 +12,9 @@ Vcs-Browser: http://andersk.mit.edu/gitweb/libyaml.git
 
 Package: libyaml-0-2
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Description: Fast YAML 1.1 parser and emitter library
  LibYAML is a C library for parsing and emitting data in YAML 1.1, a
  human-readable data serialization format.
@@ -22,6 +23,7 @@ Package: libyaml-0-2-dbg
 Section: debug
 Priority: extra
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}, libyaml-0-2 (= ${binary:Version})
 Description: Fast YAML 1.1 parser and emitter library (debugging symbols)
  LibYAML is a C library for parsing and emitting data in YAML 1.1, a
@@ -33,6 +35,7 @@ Description: Fast YAML 1.1 parser and emitter library (debugging symbols)
 Package: libyaml-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}, libyaml-0-2 (= ${binary:Version})
 Description: Fast YAML 1.1 parser and emitter library (development)
  LibYAML is a C library for parsing and emitting data in YAML 1.1, a
diff --git a/debian/control.in b/debian/control.in
index 029a17a..8c368c4 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -10,7 +10,9 @@ Vcs-Browser: http://andersk.mit.edu/gitweb/libyaml.git
 
 Package: libyaml-0-2
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Description: Fast YAML 1.1 parser and emitter library
  LibYAML is a C library for parsing and emitting data in YAML 1.1, a
  human-readable data serialization format.
@@ -19,6 +21,7 @@ Package: libyaml-0-2-dbg
 Section: debug
 Priority: extra
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}, libyaml-0-2 (= ${binary:Version})
 Description: Fast YAML 1.1 parser and emitter library (debugging symbols)
  LibYAML is a C library for parsing and emitting data in YAML 1.1, a
@@ -30,6 +33,7 @@ Description: Fast YAML 1.1 parser and emitter library (debugging symbols)
 Package: libyaml-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}, libyaml-0-2 (= ${binary:Version})
 Description: Fast YAML 1.1 parser and emitter library (development)
  LibYAML is a C library for parsing and emitting data in YAML 1.1, a
diff --git a/debian/libyaml-0-2.install b/debian/libyaml-0-2.install
index 093956b..3de3b10 100644
--- a/debian/libyaml-0-2.install
+++ b/debian/libyaml-0-2.install
@@ -1 +1 @@
-usr/lib/*.so.*
+usr/lib/*/*.so.*
diff --git a/debian/libyaml-dev.install b/debian/libyaml-dev.install
index 99c9fb7..b0e6bc4 100644
--- a/debian/libyaml-dev.install
+++ b/debian/libyaml-dev.install
@@ -1,4 +1,4 @@
 usr/include/*
-usr/lib/*.a
-usr/lib/*.so
-usr/lib/pkgconfig/*
+usr/lib/*/*.a
+usr/lib/*/*.so
+usr/lib/*/pkgconfig/*
diff --git a/debian/rules b/debian/rules
index fd94037..040c68a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,14 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
+CDBS_BUILD_DEPENDS += , cdbs (>= 0.4.93~)  # for $(DEB_HOST_MULTIARCH)
+
 # Debhelper 9 isn’t released yet
 CDBS_BUILD_DEPENDS_rules_debhelper_v9 = debhelper (>= 8.1.3~)
 
+# dh_buildinfo fails at multiarch: http://bugs.debian.org/620104
+CDBS_BUILD_DEPENDS_rules_debhelper_buildinfo =
+
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 DEB_DH_INSTALL_SOURCEDIR = $(DEB_DESTDIR)
 DEB_DH_STRIP_ARGS = --dbg-package=libyaml-0-2-dbg
-- 
2.45.2