[SCM] jackd2 packaging branch, master, updated. debian/1.9.5.dfsg-13-33-gc3aae7f

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9d9b4b1a9a6ff2ceda071b082be3ed247b887869
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jun 19 09:55:51 2010 +0200

    use conflicts instead of breaks. libjack-jackd2-0 has file conflicts with libjack0 and will keep it

diff --git a/debian/control.in b/debian/control.in
index bd14445..01f088d 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -57,12 +57,11 @@ Depends: ${shlibs:Depends},
  ${misc:Depends}
 Conflicts: jackd2 (>> ${binary:Version}),
  jackd2 (<< ${binary:Version}),
+ libjack0,
  libjack-0.116
-Breaks: libjack0 (<< 1:0.118+svn3796-4)
 Suggests: jackd2 (= ${binary:Version})
 Provides: libjack-0.116
-Replaces: libjack0 (<< 1:0.118+svn3796-4),
- libjack-0.116
+Replaces: libjack-0.116
 Description: JACK Audio Connection Kit (libraries)
  JACK is a low-latency sound server, allowing multiple applications to
  connect to one audio device, and to share audio between themselves.

-- 
jackd2 packaging