[SCM] libshout/master: Tidy rules file: Declare package relations more compactly, and fix pre-depend on , multiarch-support only for lib package.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b8eaec060b0765d1e185a6f382f3fb91f014caf7
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu May 9 19:44:50 2013 +0200

    Tidy rules file: Declare package relations more compactly, and fix pre-depend on ,multiarch-support only for lib package.

diff --git a/debian/rules b/debian/rules
index 5be3379..8df9f74 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,30 +22,31 @@ DEB_AUTO_UPDATE_ACLOCAL = 1.11
 DEB_AUTO_UPDATE_AUTOCONF = 2.68
 DEB_AUTO_UPDATE_AUTOHEADER = 2.68
 DEB_AUTO_UPDATE_AUTOMAKE = 1.11
--include /usr/share/cdbs/1/rules/upstream-tarball.mk
+include /usr/share/cdbs/1/rules/upstream-tarball.mk
 include /usr/share//cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 stem = shout
 abi = 3
-pkg = lib$(stem)
+srcpkg = lib$(stem)
 lib = lib$(stem)
 libpkg = lib$(stem)$(abi)
 devpkg = lib$(stem)$(abi)-dev
 
-# Needed at build time by upstream code
-CDBS_BUILD_DEPENDS += , libogg-dev, libvorbis-dev, pkg-config
-CDBS_BUILD_DEPENDS += , libtheora-dev, libspeex-dev
+# Needed by upstream build
+deps = libogg-dev, libvorbis-dev, pkg-config, libtheora-dev, libspeex-dev
 
-# Needed at build time for our packaging
-CDBS_BUILD_DEPENDS += , d-shlibs (>= 0.48)
+# Needed for our packaging
+deps-pkg +=, d-shlibs (>= 0.48)
+
+CDBS_BUILD_DEPENDS +=, $(deps), $(deps-pkg)
 
 # Multiarch quirk (see also other uses of that variable in this file)
-CDBS_PREDEPENDS = $(if $(DEB_HOST_MULTIARCH),multiarch-support)
+CDBS_PREDEPENDS_$(libpkg) = $(if $(DEB_HOST_MULTIARCH),multiarch-support)
 
-DEB_UPSTREAM_PACKAGE = $(pkg)
-DEB_UPSTREAM_URL = http://downloads.us.xiph.org/releases/$(pkg)
+DEB_UPSTREAM_PACKAGE = $(srcpkg)
+DEB_UPSTREAM_URL = http://downloads.us.xiph.org/releases/$(srcpkg)
 DEB_UPSTREAM_TARBALL_MD5 = 11765b2592e7ea623ccd93d3f8df172c
 
 DEB_INSTALL_EXAMPLES_$(devpkg) = examples/example.c

-- 
libshout packaging