[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 0d369ccd9384a8aaa8c0ab3b893c3c2b8f6d0f46
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Mon Jun 14 19:05:15 2010 +0200

    No libjackserver0 package.
    
    For now, simply put all the internal stuff into the daemon package.
    
    In theory, this might be wrong, but we don't have other packages that
    link against libjackserver at the moment.

diff --git a/debian/control.in b/debian/control.in
index af70932..db688f7 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -33,7 +33,6 @@ Architecture: any
 Depends: coreutils (>= 4.0),
 	debconf | debconf-2.0,
 	libjack0 (= ${binary:Version}),
-	libjackserver0 (= ${binary:Version}),
 	${misc:Depends},
 	${shlibs:Depends}
 Recommends: jackd1-firewire [amd64 i386 powerpc],
@@ -63,20 +62,6 @@ Description: JACK Audio Connection Kit (libraries)
  .
  This package contains the shared libraries.
 
-Package: libjackserver0
-Architecture: any
-Section: libs
-Depends: ${misc:Depends},
-	${shlibs:Depends}
-Conflicts: jackd1 (<< ${binary:Version}),
-	jackd1 (>> ${binary:Version})
-Suggests: jackd1 (= ${binary:Version})
-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.
- .
- This package contains libjackserver and the inprocess clients.
-
 Package: jackd1-firewire
 Architecture: amd64 i386 powerpc
 Depends: jackd1 (= ${binary:Version}),
diff --git a/debian/jackd1.install b/debian/jackd1.install
index 6324722..5a9945b 100644
--- a/debian/jackd1.install
+++ b/debian/jackd1.install
@@ -1,2 +1,8 @@
 debian/tmp/usr/bin/jack*
+debian/tmp/usr/lib/libjackserver.so.*
+debian/tmp/usr/lib/jack/inprocess.so
+debian/tmp/usr/lib/jack/intime.so
+debian/tmp/usr/lib/jack/jack_dummy.so
+debian/tmp/usr/lib/jack/jack_net.so
+debian/tmp/usr/lib/jack/jack_oss.so
 debian/bash_completion.d etc
diff --git a/debian/libjackserver0.install b/debian/libjackserver0.install
deleted file mode 100644
index 0787c01..0000000
--- a/debian/libjackserver0.install
+++ /dev/null
@@ -1,6 +0,0 @@
-debian/tmp/usr/lib/libjackserver.so.*
-debian/tmp/usr/lib/jack/inprocess.so
-debian/tmp/usr/lib/jack/intime.so
-debian/tmp/usr/lib/jack/jack_dummy.so
-debian/tmp/usr/lib/jack/jack_net.so
-debian/tmp/usr/lib/jack/jack_oss.so

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