[SCM] libshout/master: Improve multiarch quirks to ease backporting.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 61002c762c7a41ad2378ccf0da4f95957267dc9d
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Mar 25 17:08:12 2012 +0200

    Improve multiarch quirks to ease backporting.

diff --git a/debian/control.in b/debian/control.in
index 9993156..3c2bfe6 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -40,7 +40,8 @@ Package: libshout3
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
+Pre-Depends: ${misc:Pre-Depends},
+ ${cdbs:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Description: MP3/Ogg Vorbis broadcast streaming library
diff --git a/debian/rules b/debian/rules
index 25ec713..ae79704 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,8 +40,9 @@ CDBS_BUILD_DEPENDS_rules_upstream-tarball =
 CDBS_BUILD_DEPENDS_rules_utils_copyright-check =
 
 # Multiarch quirks (should ideally be resolved automagically)
-CDBS_BUILD_DEPENDS += , cdbs (>= 0.4.93~)
 CDBS_BUILD_DEPENDS_rules_debhelper_buildinfo =
+CDBS_BUILD_DEPENDS_rules_buildcore_pkgrel =
+CDBS_PREDEPENDS = $(if $(DEB_HOST_MULTIARCH),multiarch-support)
 
 DEB_UPSTREAM_PACKAGE = $(pkg)
 DEB_UPSTREAM_URL = http://downloads.us.xiph.org/releases/$(pkg)

-- 
libshout packaging