[SCM] Debian packaging for jack-audio-connection-kit branch, master.jackd2, updated. debian/1.9.4+svn3842-2-41-g15d16a4
js at users.alioth.debian.org
js at users.alioth.debian.org
Thu Apr 1 13:22:07 UTC 2010
The following commit has been merged in the master.jackd2 branch:
commit 1938b794c4ae487371ddca4504c5b51a4fda015d
Author: Jonas Smedegaard <dr at jones.dk>
Date: Thu Apr 1 15:13:16 2010 +0200
Unfuzz and refresh patches (with quilt compacting options --no-timestamps --no-index -pab).
diff --git a/debian/patches/connect.diff b/debian/patches/connect.diff
index de05208..258d214 100644
--- a/debian/patches/connect.diff
+++ b/debian/patches/connect.diff
@@ -1,5 +1,3 @@
-diff --git a/example-clients/connect.c b/example-clients/connect.c
-index a89e538..4168c29 100644
--- a/example-clients/connect.c
+++ b/example-clients/connect.c
@@ -20,6 +20,7 @@
@@ -10,7 +8,7 @@ index a89e538..4168c29 100644
#endif
#include <string.h>
#include <stdlib.h>
-@@ -37,6 +38,7 @@ main (int argc, char *argv[])
+@@ -37,6 +38,7 @@
{
jack_client_t* client = NULL;
char *my_name = strrchr(argv[0], '/');
@@ -18,7 +16,7 @@ index a89e538..4168c29 100644
connecting = disconnecting = FALSE;
if (my_name == 0) {
my_name = argv[0];
-@@ -56,6 +58,8 @@ main (int argc, char *argv[])
+@@ -56,6 +58,8 @@
return 1;
}
@@ -27,7 +25,7 @@ index a89e538..4168c29 100644
if (argc != 3) {
fprintf (stderr, "usage: %s <src_port> <dst_port>\n", my_name);
fprintf(stderr, "The source port must be an output port of the source client.\n");
-@@ -63,9 +67,16 @@ main (int argc, char *argv[])
+@@ -63,9 +67,16 @@
return 1;
}
diff --git a/debian/patches/jackrec-rename.patch b/debian/patches/jackrec-rename.patch
index dd6fd22..4d83295 100644
--- a/debian/patches/jackrec-rename.patch
+++ b/debian/patches/jackrec-rename.patch
@@ -6,11 +6,9 @@ Description: Rename jack_rec to jackrec
.
I decided to stick to the jackd1 name, as it has always been around.
-diff --git a/example-clients/wscript b/example-clients/wscript
-index 4cf08d1..a0ee80b 100644
--- a/example-clients/wscript
+++ b/example-clients/wscript
-@@ -114,7 +114,7 @@ def build(bld):
+@@ -114,7 +114,7 @@
if bld.env['IS_SUN']:
prog.uselib = 'RT SNDFILE'
prog.uselib_local = 'clientlib'
diff --git a/debian/patches/manpages.patch b/debian/patches/manpages.patch
index 2e78cb8..c13a91f 100644
--- a/debian/patches/manpages.patch
+++ b/debian/patches/manpages.patch
@@ -2,9 +2,6 @@ From: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Bug: http://trac.jackaudio.org/ticket/166
Description: Add manpages to jackd2
-diff --git a/man/alsa_in.0 b/man/alsa_in.0
-new file mode 100644
-index 0000000..91956a0
--- /dev/null
+++ b/man/alsa_in.0
@@ -0,0 +1,97 @@
@@ -105,16 +102,10 @@ index 0000000..91956a0
+.SH AUTHOR
+Torben Hohn
+
-diff --git a/man/alsa_out.0 b/man/alsa_out.0
-new file mode 100644
-index 0000000..7b63b85
--- /dev/null
+++ b/man/alsa_out.0
@@ -0,0 +1 @@
+.so man1/alsa_in.1
-diff --git a/man/fill_template b/man/fill_template
-new file mode 100644
-index 0000000..3ebf9ab
--- /dev/null
+++ b/man/fill_template
@@ -0,0 +1,5 @@
@@ -123,9 +114,6 @@ index 0000000..3ebf9ab
+for i in *.0 ; do
+ sed -e "s/!VERSION!/${1}/g" -e "s/!DATE!/`date '+%B %Y'`/g" < ${i} > ${i%%0}1
+done
-diff --git a/man/jack_bufsize.0 b/man/jack_bufsize.0
-new file mode 100644
-index 0000000..f9d0dd6
--- /dev/null
+++ b/man/jack_bufsize.0
@@ -0,0 +1,14 @@
@@ -143,9 +131,6 @@ index 0000000..f9d0dd6
+When invoked without arguments, it prints the current bufsize, and exits.
+
+
-diff --git a/man/jack_connect.0 b/man/jack_connect.0
-new file mode 100644
-index 0000000..602ac39
--- /dev/null
+++ b/man/jack_connect.0
@@ -0,0 +1,11 @@
@@ -160,16 +145,10 @@ index 0000000..602ac39
+.SH RETURNS
+The exit status is zero if successful, 1 otherwise
+
-diff --git a/man/jack_disconnect.0 b/man/jack_disconnect.0
-new file mode 100644
-index 0000000..90300cc
--- /dev/null
+++ b/man/jack_disconnect.0
@@ -0,0 +1 @@
+.so man1/jack_connect.1
-diff --git a/man/jack_freewheel.0 b/man/jack_freewheel.0
-new file mode 100644
-index 0000000..0941ffd
--- /dev/null
+++ b/man/jack_freewheel.0
@@ -0,0 +1,16 @@
@@ -189,9 +168,6 @@ index 0000000..0941ffd
+There is no useful reason to use this tool other than testing. JACK
+clients that use freewheeling will turn it on and off themselves.
+
-diff --git a/man/jack_impulse_grabber.0 b/man/jack_impulse_grabber.0
-new file mode 100644
-index 0000000..544716b
--- /dev/null
+++ b/man/jack_impulse_grabber.0
@@ -0,0 +1,11 @@
@@ -206,9 +182,6 @@ index 0000000..544716b
+
+
+
-diff --git a/man/jack_load.0 b/man/jack_load.0
-new file mode 100644
-index 0000000..599116e
--- /dev/null
+++ b/man/jack_load.0
@@ -0,0 +1,28 @@
@@ -240,9 +213,6 @@ index 0000000..599116e
+Jeremy Hall
+
+
-diff --git a/man/jack_lsp.0 b/man/jack_lsp.0
-new file mode 100644
-index 0000000..a54ba5e
--- /dev/null
+++ b/man/jack_lsp.0
@@ -0,0 +1,47 @@
@@ -293,9 +263,6 @@ index 0000000..a54ba5e
+Output version information and exit
+
+
-diff --git a/man/jack_metro.0 b/man/jack_metro.0
-new file mode 100644
-index 0000000..e38a954
--- /dev/null
+++ b/man/jack_metro.0
@@ -0,0 +1,40 @@
@@ -339,9 +306,6 @@ index 0000000..e38a954
+.SH AUTHOR
+Anthony Van Groningen
+
-diff --git a/man/jack_monitor_client.0 b/man/jack_monitor_client.0
-new file mode 100644
-index 0000000..0991107
--- /dev/null
+++ b/man/jack_monitor_client.0
@@ -0,0 +1,18 @@
@@ -363,9 +327,6 @@ index 0000000..0991107
+.PP
+This manpage was written by Robert Jordens <jordens at debian.org> for Debian.
+
-diff --git a/man/jack_netsource.0 b/man/jack_netsource.0
-new file mode 100644
-index 0000000..5de4af7
--- /dev/null
+++ b/man/jack_netsource.0
@@ -0,0 +1,109 @@
@@ -478,9 +439,6 @@ index 0000000..5de4af7
+.IP
+\fBjackd \-d net \fR
+
-diff --git a/man/jack_samplerate.0 b/man/jack_samplerate.0
-new file mode 100644
-index 0000000..ef11ed0
--- /dev/null
+++ b/man/jack_samplerate.0
@@ -0,0 +1,9 @@
@@ -493,9 +451,6 @@ index 0000000..ef11ed0
+.B jack_samplerate prints the current samplerate, and exits.
+
+
-diff --git a/man/jack_showtime.0 b/man/jack_showtime.0
-new file mode 100644
-index 0000000..210caa7
--- /dev/null
+++ b/man/jack_showtime.0
@@ -0,0 +1,13 @@
@@ -512,9 +467,6 @@ index 0000000..210caa7
+.PP
+This manpage was written by Stefan Schwandter <swan at debian.org>
+
-diff --git a/man/jack_simple_client.0 b/man/jack_simple_client.0
-new file mode 100644
-index 0000000..a3cf16e
--- /dev/null
+++ b/man/jack_simple_client.0
@@ -0,0 +1,20 @@
@@ -538,9 +490,6 @@ index 0000000..a3cf16e
+.PP
+This manpage was written by Robert Jordens <jordens at debian.org> for Debian.
+
-diff --git a/man/jack_transport.0 b/man/jack_transport.0
-new file mode 100644
-index 0000000..6aa8ddd
--- /dev/null
+++ b/man/jack_transport.0
@@ -0,0 +1,13 @@
@@ -557,9 +506,6 @@ index 0000000..6aa8ddd
+.SH AUTHOR
+Jeremy Hall
+
-diff --git a/man/jack_unload.0 b/man/jack_unload.0
-new file mode 100644
-index 0000000..79b1e33
--- /dev/null
+++ b/man/jack_unload.0
@@ -0,0 +1,19 @@
@@ -582,9 +528,6 @@ index 0000000..79b1e33
+Jeremy Hall
+.PP
+This manpage was written by Robert Jordens <jordens at debian.org> for Debian.
-diff --git a/man/jack_wait.0 b/man/jack_wait.0
-new file mode 100644
-index 0000000..239e8c2
--- /dev/null
+++ b/man/jack_wait.0
@@ -0,0 +1,41 @@
@@ -629,9 +572,6 @@ index 0000000..239e8c2
+Output version information and exit
+
+
-diff --git a/man/jackd.0 b/man/jackd.0
-new file mode 100644
-index 0000000..5700aab
--- /dev/null
+++ b/man/jackd.0
@@ -0,0 +1,547 @@
@@ -1182,9 +1122,6 @@ index 0000000..5700aab
+.PP
+Manpage written by Stefan Schwandter, Jack O'Quin and Alexandre
+Prokoudine.
-diff --git a/man/jackrec.0 b/man/jackrec.0
-new file mode 100644
-index 0000000..1ea2a6f
--- /dev/null
+++ b/man/jackrec.0
@@ -0,0 +1,23 @@
@@ -1211,9 +1148,6 @@ index 0000000..1ea2a6f
+recorder and is included in the JACK toolkit as a result.
+
+
-diff --git a/man/wscript b/man/wscript
-new file mode 100644
-index 0000000..31bd60f
--- /dev/null
+++ b/man/wscript
@@ -0,0 +1,13 @@
@@ -1230,11 +1164,9 @@ index 0000000..31bd60f
+ bld.exec_command("cd man ; sh fill_template %s" % bld.env['JACK_VERSION'])
+ bld.install_files(bld.env['MANDIR'], '*.1')
+
-diff --git a/wscript b/wscript
-index 8d8d8e6..92c631e 100644
--- a/wscript
+++ b/wscript
-@@ -62,6 +62,7 @@ def set_options(opt):
+@@ -62,6 +62,7 @@
opt.add_option('--libdir', type='string', help="Library directory [Default: <prefix>/lib]")
opt.add_option('--libdir32', type='string', help="32bit Library directory [Default: <prefix>/lib32]")
@@ -1242,7 +1174,7 @@ index 8d8d8e6..92c631e 100644
opt.add_option('--dbus', action='store_true', default=False, help='Enable D-Bus JACK (jackdbus)')
opt.add_option('--classic', action='store_true', default=False, help='Force enable standard JACK (jackd) even if D-Bus JACK (jackdbus) is enabled too')
opt.add_option('--doxygen', action='store_true', default=False, help='Enable build of doxygen documentation')
-@@ -151,6 +152,11 @@ def configure(conf):
+@@ -163,6 +164,11 @@
else:
conf.env['LIBDIR'] = conf.env['PREFIX'] + '/lib'
@@ -1254,7 +1186,7 @@ index 8d8d8e6..92c631e 100644
if conf.env['BUILD_DEBUG']:
conf.env.append_unique('CXXFLAGS', '-g')
conf.env.append_unique('CCFLAGS', '-g')
-@@ -255,6 +261,7 @@ def build(bld):
+@@ -267,6 +273,7 @@
bld.add_subdirs('linux')
bld.add_subdirs('example-clients')
bld.add_subdirs('tests')
--
Debian packaging for jack-audio-connection-kit
More information about the pkg-multimedia-commits
mailing list