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

adiknoth-guest at users.alioth.debian.org adiknoth-guest at users.alioth.debian.org
Thu Nov 19 15:22:59 UTC 2009 

The following commit has been merged in the master branch:
commit fa61c44173937528dc9b147caea0af0577f4b05e
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Thu Nov 19 16:01:32 2009 +0100

    Provide jackd-firewire. Only use ALSA on Linux.
    
    Put all 1394 backends into jackd-firewire.
    
    Restrict the ALSA backend to libjack0.
    
    More housekeeping in debian/control, especially reviewed descriptions
    from the language team.

diff --git a/debian/control b/debian/control
index 488b565..0b21f04 100644
--- a/debian/control
+++ b/debian/control
@@ -30,33 +30,31 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/jackd2.git;a=summary
 Package: jackd
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         coreutils (>= 4.0),
-         debconf | debconf-2.0,
-         libjackserver0 (= ${binary:Version}),
-         libjackserver-bin (= ${binary:Version})
-Section: sound
-Provides: jack-server
-Conflicts: jackdmp
-Description: JACK Audio Connection Kit (jackd server binary)
- 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.
+	 ${misc:Depends},
+	 coreutils (>= 4.0),
+	 debconf | debconf-2.0,
+	 libjack0 (= ${binary:Version})
+Recommends: qjackctl,
+	    libpam-modules,
+	    jackd-firewire [amd64 i386 powerpc]
+Suggests: jack-tools,
+	  meterbridge,
+	  libjackasyn0
+Description: JACK Audio Connection Kit (server and example clients)
+ JACK is a low-latency sound server, allowing multiple applications to
+ connect to one audio device, and to share audio between themselves.
  .
- See <http://jackaudio.org/> for more info.
- .
- This package contains the classic "jackd" server binary.
+ This package contains the daemon jackd as well as some example clients.
 
 Package: jackdbus
 Architecture: any
-Depends: ${shlibs:Depends}, libjackserver0 (= ${binary:Version}), python
+Depends: ${shlibs:Depends},
+         libjack0 (= ${binary:Version}),
+         python
 Provides: jack-server
-Description: D-Bus integration for JACK Audio Connection Kit
- 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.
+Description: JACK Audio Connection Kit (server and example clients)
+ 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 the D-Bus JACK.
 
@@ -64,27 +62,37 @@ Package: libjack0
 Architecture: any
 Section: libs
 Conflicts: libjackmp0
-Description: JACK Audio Connection Kit (client 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.
+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.
  .
- See <http://jackaudio.org/> for more info.
+ This package contains the shared libraries.
+
+Package: jackd-firewire
+Architecture: amd64 i386 powerpc
+Depends: ${shlibs:Depends},
+	 ${misc:Depends},
+	 jackd (= ${binary:Version})
+Description: JACK Audio Connection Kit (FFADO and FreeBoB backends)
+ 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 the client library.
+ This package contains the IEEE1394 (FireWire) backends FFADO and FreeBoB.
 
 Package: libjack-dev
 Architecture: any
 Section: libdevel
-Depends: libjack0 (= ${binary:Version}), pkg-config, libjackserver-bin (= ${binary:Version}), libjackserver0 (= ${binary:Version}), libdbus-1-dev
+Depends: libjack0 (= ${binary:Version}), 
+    	 ${asound:Depends},
+	     ${misc:Depends},
+         ${shlibs:Depends},
+         pkg-config,
+         libdbus-1-dev
 Conflicts: libjack0.100.0-dev (<< 0.102.20-2)
 Replaces: libjack0.71.2-0 (<< 0.75.0-1)
-Description: JACK Audio Connection Kit (client 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.
+Description: JACK Audio Connection Kit (development files)
+ 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 files needed for the development of JACK applications
  and an API reference.
diff --git a/debian/jackd-firewire.install b/debian/jackd-firewire.install
new file mode 100644
index 0000000..1cae6a2
--- /dev/null
+++ b/debian/jackd-firewire.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/jack/jack_freebob.so
+debian/tmp/usr/lib/jack/jack_firewire.so
diff --git a/debian/libjack0.install b/debian/libjack0.install
index 9674616..6fe97ff 100644
--- a/debian/libjack0.install
+++ b/debian/libjack0.install
@@ -1,2 +1,10 @@
 debian/tmp/usr/lib/lib*.so*
-debian/tmp/usr/lib/jack/*
+debian/tmp/usr/lib/jack/netmanager.so
+debian/tmp/usr/lib/jack/audioadapter.so
+debian/tmp/usr/lib/jack/profiler.so
+debian/tmp/usr/lib/jack/inprocess.so
+debian/tmp/usr/lib/jack/jack_net.so
+debian/tmp/usr/lib/jack/jack_loopback.so
+debian/tmp/usr/lib/jack/jack_netone.so
+debian/tmp/usr/lib/jack/netadapter.so
+debian/tmp/usr/lib/jack/jack_dummy.so
diff --git a/debian/rules b/debian/rules
index cd352db..bc82353 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,9 +6,21 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) ./waf configure --prefix=/usr && ./waf --destdir=$(CURDIR)/debian/tmp
 DEB_MAKE_INSTALL_TARGET = install
-#DEB_DH_INSTALL_SOURCEDIR = debian/tmp
-#DEB_DH_SHLIBDEPS_ARGS_jackdmp = -l debian/jackdmp/usr/lib/libjackdmp.so
-DEB_DH_INSTALLINIT_ARGS := -- start 90 2 3 4 5 . stop 15 0 1 6 .
+
+DEB_DH_MAKESHLIBS_ARGS := -V -Xintime -Xinprocess -Xjack_alsa -Xjack_oss\
+	-Xjack_dummy -Xjack_freebob -Xjack_firewire
+
+install/libjack0::
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+	dh_install -plibjack0 debian/tmp/usr/lib/jack/jack_alsa.so
+endif	
+
+ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
+DEB_DH_GENCONTROL_ARGS := -u'-Vasound:Depends=libasound2-dev'
+else
+DEB_DH_GENCONTROL_ARGS := -u'-Vasound:Depends='
+endif
+
 
 clean::
 	-rm -R .waf-*

-- 
jackd2 packaging

More information about the pkg-multimedia-commits mailing list