[SCM] Audacity debian packaging branch, master, updated. debian/1.3.12-2-10-g2646e45

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

The following commit has been merged in the master branch:
commit 18e8e47a2f784a34d9db433f365ee3ac09e0ed2b
Author: Benjamin Drung <bdrung at gmail.com>
Date:   Tue Jun 29 18:58:26 2010 +0200

    Convert versioned Conflicts into Breaks.

diff --git a/debian/control b/debian/control
index 90a5904..145c86c 100644
--- a/debian/control
+++ b/debian/control
@@ -53,7 +53,7 @@ Package: audacity-data
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: audacity
-Conflicts: audacity (<= 1.3.6-2)
+Breaks: audacity (<= 1.3.6-2)
 Replaces: audacity (<= 1.3.6-2)
 Description: A fast, cross-platform audio editor (data)
  Audacity is a multi-track audio editor for Linux/Unix, MacOS and

-- 
Audacity debian packaging