[SCM] Debian packaging for jack-audio-connection-kit branch, master.jackd1, updated. debian/0.118+svn3796-3-46-g2962e73

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

The following commit has been merged in the master.jackd1 branch:
commit de52e3664f1ca37f43b483e0963a0f323f453932
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Mon Jun 14 19:11:00 2010 +0200

    make jackd1 conflict with libjack0
    
    Right now, libjack0 also contains libjackserver.so.X.Y and the inprocess
    clients in /usr/lib/jack.
    
    They are now provided in jackd1, so we need to care for conflicting
    files.

diff --git a/debian/control.in b/debian/control.in
index 4fbfaa8..976e658 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -30,6 +30,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/jack-audio-connection-kit.g
 
 Package: jackd1
 Architecture: any
+Conflicts: libjack0 (<< 1:0.118+svn3796-4),
 Depends: coreutils (>= 4.0),
 	debconf | debconf-2.0,
 	libjack0 (= ${binary:Version}),

-- 
Debian packaging for jack-audio-connection-kit