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

[siretart at users.alioth.debian.org]

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

    take over files from old jackd package

diff --git a/debian/control.in b/debian/control.in
index 626751d..7e1665e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -36,8 +36,10 @@ Depends: coreutils (>= 4.0),
 	${misc:Depends},
 	${shlibs:Depends}
 Replaces: libjack0 (<< 1:0.118+svn3796-4),
-	jack-daemon
-Conflicts: jack-daemon
+	jack-daemon,
+	jackd (<< 3)
+Conflicts: jack-daemon,
+	jackd (<< 3)
 Recommends: jackd1-firewire [amd64 i386 powerpc],
 	libpam-modules,
 	qjackctl

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