[SCM] Audacity debian packaging branch, master, updated. upstream/1.3.6-33-g6ccef2b

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7f33ada47af08c09d76733e8054a225324f2de2e
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Mon Jan 19 10:19:51 2009 +0100

    Added Build-Conflicts against libwxbase2.6-dev and wx2.6-headers (Closes: #405623).

diff --git a/debian/control b/debian/control
index e40bbdb..314d50f 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,8 @@ Build-Depends: autotools-dev,
                libvorbis-dev (>= 1.0.0-3),
                libwxgtk2.8-dev,
                zip
+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

-- 
Audacity debian packaging