[SCM] hydrogen packaging branch, master, updated. 1f8e4361335aef5d223885927c688d654b9566e2

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b9e025c540efa75f028691a9ec1ca1fbb724c7cb
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Feb 16 03:38:00 2010 +0100

    Maintain build-dependencies indirectly in debian/rules (resolve to control file when in DEB_MAINTAINER_MODE.

diff --git a/debian/control.in b/debian/control.in
index 12ce36f..e9d3ffb 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,7 +3,7 @@ Section: sound
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr at jones.dk>
-Build-Depends: docbook-utils, @cdbs@, libqt4-dev, libz-dev, pkg-config, libaudiofile-dev, libjack-dev, liblrdf-dev, libsndfile1-dev, libflac++-dev, libflac-dev (>= 1.1.1-3), libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libarchive-dev, libportaudio-dev, libportmidi-dev, liblash-dev, librsvg2-bin, help2man (>= 0.28)
+Build-Depends: @cdbs@
 Standards-Version: 3.8.4
 Homepage: http://www.hydrogen-music.org/
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/hydrogen.git
diff --git a/debian/rules b/debian/rules
index 176ced4..7d92dc5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,7 +50,7 @@ clean::
 
 # Generate man page from main binary
 common-post-build-arch::
-	help2man --name="advanced pattern-based drum machine" --no-info hydrogen -o hydrogen.1
+	help2man --name="advanced pattern-based drum machine" --no-info --no-discard-stderr hydrogen -o hydrogen.1
 clean::
 	rm -f hydrogen.1
 
@@ -58,5 +58,13 @@ clean::
 	rm -f qt4.pyc version.cpp config.h scache.conf
 	rm -rf scons_cache
 
+# Needed by upstream build process
+CDBS_BUILD_DEPENDS += , docbook-utils, libqt4-dev, libz-dev, pkg-config, libarchive-dev
+CDBS_BUILD_DEPENDS += , libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
+CDBS_BUILD_DEPENDS += , libaudiofile-dev, libjack-dev, liblrdf-dev, libsndfile1-dev, libflac++-dev, libflac-dev (>= 1.1.1-3), libportaudio-dev, libportmidi-dev, liblash-dev
+
+# Needed for our packaging
+CDBS_BUILD_DEPENDS += , librsvg2-bin, help2man (>= 0.28)
+
 # Resolve, cleanup and apply CDBS-declared dependencies
 include debian/cdbs/1/rules/package-relations.mk

-- 
hydrogen packaging