[SCM] csound packaging branch, master, updated. debian/5.12.1.dfsg-2-9-g521fd60

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 80658bd932c44a212df207f261d68f25ce5449ba
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Aug 1 15:29:54 2010 -0400

    Use Breaks (not Conflicts).

diff --git a/debian/control.in b/debian/control.in
index ce100a5..6bb64b9 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -13,7 +13,7 @@ Homepage: http://www.csounds.com
 Package: csound
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libcsound64-5.1 (<< 1:5.08.2~dfsg-1)
+Breaks: libcsound64-5.1 (<< 1:5.08.2~dfsg-1)
 Recommends: csound-gui, csound-utils, csound-manpages
 Description: powerful and versatile sound synthesis software
  Csound is a sound and music synthesis system. Drawing from over 450
@@ -46,7 +46,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: csound
-Conflicts: csound (<< 1:5.07.0.dfsg-1)
+Breaks: csound (<< 1:5.07.0.dfsg-1)
 Description: main library for Csound
  This package contains the library which provides most of the Csound
  functionality. This library was built using 64-bit precision for the

-- 
csound packaging