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

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

The following commit has been merged in the master branch:
commit ca440ae0e0ad3c19a2ca236d3be489a120cc6364
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Tue Jun 15 15:19:16 2010 +0200

    Replace, Provide and Conflict on the jackd virtual package.
    
    Also Replace on libjack0, because inprocess clients and
    libjackserver.so.x.y have been moved to the jackd2 package.

diff --git a/debian/control.in b/debian/control.in
index 6baf7f6..5888100 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -26,6 +26,10 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/jack-audio-connection-kit.g
 
 Package: jackd2
 Architecture: any
+Replaces: libjack0 (<= 1.9.5~dfsg-13),
+    jackd
+Provides: jackd
+Conflicts: jackd
 Depends: ${shlibs:Depends},
  ${misc:Depends},
  coreutils (>= 4.0),

-- 
jackd2 packaging