Support multiarch

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

diff --git a/debian/changelog b/debian/changelog
index 57b5bf11e28a01aee36dc1be3e018e77020ec3f8..56414be0a99f166c64d48c43de0d933b087132c3 100644 (file)
--- 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 f3270cc46bfe4e83168884ab159e76b0ad3b8f2e..5906f6b70046a364ea85a598d6ea3ec66a93e28f 100644 (file)
--- 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 029a17af2b3323eefb6b316b27f5f058a2ea7ea9..8c368c401fd274ce7e89481f10c0e3e591210a0b 100644 (file)
--- 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 093956b17518f1129cbb4956eee3e4d422a5a5a9..3de3b10a49844edfe7e12e2fde3eb1357306fbfc 100644 (file)
--- 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 99c9fb7b78e8fa8177dc5073bf8208c7d1d5be50..b0e6bc4f9dbd5953b747f539bc48d25108d9302e 100644 (file)
--- 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 fd94037bc692970dfb4d65c5c4dcfb2e18138a35..040c68a3af0bc0fefc2e1a71ba6d50c13bcd2794 100755 (executable)
--- 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