[SCM] jackd2 packaging branch, master, updated. upstream/1.9.3+svn3819-7-g7e75e01

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

The following commit has been merged in the master branch:
commit 7e75e010c481477da1400bed0192e3c80b45064d
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Thu Nov 19 15:27:13 2009 +0100

    Merge packages.
    
    I feel libjackserver* is a little bit too much.
    
    For now, I simply put everything into one file.
    
    Note that this will currently break on FreeBSD and the lot, we need
    to manually take care about alsa_{in,out} and the firewire backends.

diff --git a/debian/control b/debian/control
index 76c91eb..488b565 100644
--- a/debian/control
+++ b/debian/control
@@ -27,54 +27,6 @@ Homepage: http://jackaudio.org/
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/jackd2.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/jackd2.git;a=summary
 
-Package: libjackserver0
-Architecture: any
-Section: sound
-Depends: ${shlibs:Depends}, libjack0 (= ${binary:Version})
-Conflicts: jackd (<< 1.8), libjack0.100.0-0 (<< 0.102.20-2), libjack0.80.0-0,
- libjack0 (<< 1.8), libjack-dev (<< 1.8), libjack0.100.0-0 (<< 1.8),
- libjack0.100.0-dev (<< 1.8), jack-audio-connection-kit
-Replaces: jack-audio-connection-kit
-Description: JACK Audio Connection Kit (server library)
- Low-latency sound server. JACK allows the connection of multiple applications
- to an audio device, as well as allowing them to share audio between
- themselves.
- .
- See <http://jackaudio.org/> for more info.
- .
- This package contains the server library.
-
-Package: libjackserver-dev
-Architecture: any
-Section: libdevel
-Depends: libjack-dev (= ${binary:Version}), libjackserver0 (= ${binary:Version}), pkg-config
-Description: JACK Audio Connection Kit (server library development files)
- Low-latency sound server. JACK allows the connection of multiple applications
- to an audio device, as well as allowing them to share audio between
- themselves.
- .
- See <http://jackaudio.org/> for more info.
- .
- This package contains files needed for the development of applications that implement
- a JACK server.
-
-Package: libjackserver-bin
-Architecture: any
-Section: sound
-Depends: ${shlibs:Depends}
-Conflicts: jackd (<< 1.8), libjack0.100.0-0 (<< 0.102.20-2), libjack0.80.0-0,
- libjack0 (<< 1.8), libjack-dev (<< 1.8), libjack0.100.0-0 (<< 1.8),
- libjack0.100.0-dev (<< 1.8)
-Description: JACK Audio Connection Kit (drivers, inprocess clients and essential tools)
- Low-latency sound server. JACK allows the connection of multiple applications
- to an audio device, as well as allowing them to share audio between
- themselves.
- .
- See <http://jackaudio.org/> for more info.
- .
- This package contains the essential tools (like jack_connect and jack_lsp),
- drivers (ALSA, FireWire, etc.) and inprocess clients (like netjack ones)
-
 Package: jackd
 Architecture: any
 Depends: ${shlibs:Depends},
diff --git a/debian/jackd.install b/debian/jackd.install
index bd615a7..6324722 100644
--- a/debian/jackd.install
+++ b/debian/jackd.install
@@ -1 +1,2 @@
-debian/tmp/usr/bin/jackd
+debian/tmp/usr/bin/jack*
+debian/bash_completion.d etc
diff --git a/debian/libjack0.install b/debian/libjack0.install
index f784808..9674616 100644
--- a/debian/libjack0.install
+++ b/debian/libjack0.install
@@ -1 +1,2 @@
-debian/tmp/usr/lib/libjack.so*
+debian/tmp/usr/lib/lib*.so*
+debian/tmp/usr/lib/jack/*
diff --git a/debian/libjackserver-bin.install b/debian/libjackserver-bin.install
deleted file mode 100644
index a3832a8..0000000
--- a/debian/libjackserver-bin.install
+++ /dev/null
@@ -1,13 +0,0 @@
-debian/tmp/usr/bin/jack_disconnect
-debian/tmp/usr/bin/jack_simple_client
-debian/tmp/usr/bin/jack_load
-debian/tmp/usr/bin/jack_midisine
-debian/tmp/usr/bin/jack_zombie
-debian/tmp/usr/bin/jack_connect
-debian/tmp/usr/bin/jack_lsp
-debian/tmp/usr/bin/jack_freewheel
-debian/tmp/usr/bin/jack_unload
-debian/tmp/usr/bin/jack_metro
-debian/tmp/usr/bin/jack_midiseq
-debian/tmp/usr/bin/jack_showtime
-debian/tmp/usr/lib/jack/*
diff --git a/debian/libjackserver0.install b/debian/libjackserver0.install
deleted file mode 100644
index 0945abd..0000000
--- a/debian/libjackserver0.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libjackserver.so*

-- 
jackd2 packaging