[SCM] ardour Debian packaging branch, master, updated. debian/2.8.11-1-7-gc3c7138

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2b3e00ecc548970ed49363b39b787926db0d7a92
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Aug 6 22:06:47 2010 -0400

    Fix have ardour replace and conflict with itself (as same name is used as virtual name for other flavors).

diff --git a/debian/rules b/debian/rules
index 2123aec..ac8ab3a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -133,10 +133,8 @@ CDBS_SUGGESTS_ALL = jamin, qjackctl
 # Ensure only one variant is installed at a time
 CDBS_PROVIDES_ardour-altivec = ardour
 CDBS_PROVIDES_ardour-i686 = ardour
-CDBS_CONFLICTS_ardour-altivec = ardour
-CDBS_CONFLICTS_ardour-i686 = ardour
-CDBS_REPLACES_ardour-altivec = ardour
-CDBS_REPLACES_ardour-i686 = ardour
+CDBS_CONFLICTS_ALL = ardour
+CDBS_REPLACES_ALL = ardour
 
 # Transitional quirk: ardour-gtk renamed to ardour
 # TODO: drop after Squeeze (was introduced before Lenny)

-- 
ardour Debian packaging