Merge tag 'upstream/0.1.5' into debian

[libyaml.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index fd94037bc692970dfb4d65c5c4dcfb2e18138a35..f5f939aa336b8c70a32adeb6ac149a3b70f28cc2 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
+DEB_DBG_PACKAGE_libyaml-0-2 = libyaml-0-2-dbg