[SCM] audacity/master: Tighten build dependencies.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1d19b9df3ec507cb26a3b992a90cbba994afa908
Author: Benjamin Drung <bdrung at gmail.com>
Date:   Tue Feb 15 22:06:41 2011 +0100

    Tighten build dependencies.

diff --git a/debian/control b/debian/control
index d6a11fc..e88a39d 100644
--- a/debian/control
+++ b/debian/control
@@ -19,18 +19,17 @@ Build-Depends: autotools-dev,
                libgtk2.0-dev,
                libid3tag0-dev,
                libjack-dev,
-               libmad0-dev,
+               libmad0-dev (>= 0.14.2b),
                libogg-dev (>= 1.0.0),
-               libsamplerate0-dev,
-               libsndfile1-dev,
+               libsamplerate0-dev (>= 0.1.2),
+               libsndfile1-dev (>= 1.0.0),
                libsoundtouch1-dev (>= 1.3.1-2),
-               libtwolame-dev,
+               libtwolame-dev (>= 0.3.9),
                libvorbis-dev (>= 1.0.0-3),
                libwxgtk2.8-dev,
                vamp-plugin-sdk (>= 2.0),
                zip
-Build-Conflicts: libwxbase2.6-dev,
-                 wx2.6-headers
+Build-Conflicts: libwxbase2.6-dev, wx2.6-headers
 Homepage: http://audacity.sourceforge.net/
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/audacity.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/audacity.git;a=summary
diff --git a/debian/rules b/debian/rules
index e8a12ac..fafdd05 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,24 +3,27 @@
 # Do not link against unused libraries (make dpkg-shlibdeps happy).
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
+configure_flags := \
+	--disable-dynamic-loading \
+	--with-expat=system \
+	--with-ffmpeg=system \
+	--with-libflac=system \
+	--with-libid3tag=system \
+	--with-libmad=system \
+	--without-libresample \
+	--with-libsamplerate=system \
+	--with-libsndfile=system \
+	--with-libtwolame=system \
+	--with-libvamp=system \
+	--with-libvorbis=system \
+	--with-soundtouch=system \
+	$(NULL)
+
 %:
 	dh $@ --parallel
 
 override_dh_auto_configure:
-	dh_auto_configure -- \
-		--disable-dynamic-loading \
-		--with-expat=system \
-		--with-ffmpeg=system \
-		--with-libflac=system \
-		--with-libid3tag=system \
-		--with-libmad=system \
-		--with-libsamplerate=system \
-		--without-libresample \
-		--with-libsndfile=system \
-		--with-libtwolame=system \
-		--with-libvamp=system \
-		--with-libvorbis=system \
-		--with-soundtouch=system
+	dh_auto_configure -- $(configure_flags)
 
 override_dh_auto_install:
 	dh_auto_install

-- 
Audacity debian packaging