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

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit cf44e95b4e7337de93a13a5ec20da0624ea3b3e7
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jun 19 07:41:22 2010 +0200

    jackd must not be a virtual package, use 'jack-daemon' for that

diff --git a/debian/control.in b/debian/control.in
index 154c249..72d3fe5 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -27,9 +27,11 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/jackd2.git;a=summary
 Package: jackd2
 Architecture: any
 Replaces: libjack0 (<= 1.9.5~dfsg-13),
-    jackd
-Provides: jackd
-Conflicts: jackd
+	jackd (<< 3),
+	jack-daemon
+Provides: jack-daemon
+Conflicts: jack-daemon,
+	jackd (<< 3)
 Depends: ${shlibs:Depends},
  ${misc:Depends},
  coreutils (>= 4.0),
@@ -56,6 +58,7 @@ Depends: ${shlibs:Depends},
 Conflicts: jackd2 (>> ${binary:Version}),
  jackd2 (<< ${binary:Version}),
  libjack-0.116
+Breaks: libjack0 (<< 1:0.118+svn3796-4)
 Suggests: jackd2 (= ${binary:Version})
 Provides: libjack-0.116
 Replaces: libjack-0.116

-- 
jackd2 packaging