[SCM] Debian packaging for jack-audio-connection-kit branch, master, updated. debian/0.116.1-4-90-g65dbf05

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

The following commit has been merged in the master branch:
commit c02b2507b105167596d899065cfe9fc2dc36dd32
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Tue Nov 17 14:40:46 2009 +0100

    Remove manpage and realtime fixes, they're included upstream.

diff --git a/debian/patches/15_double_manpage.patch b/debian/patches/15_double_manpage.patch
deleted file mode 100644
index 44988a0..0000000
--- a/debian/patches/15_double_manpage.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 8d36562..b8de403 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -10,5 +10,3 @@ clean-local:
- man1_MANS = $(manpages)
- 
- BUILT_SOURCES = $(manpages)
--
--dist_man_MANS = $(manpages)
diff --git a/debian/patches/25_realtime_is_default.patch b/debian/patches/25_realtime_is_default.patch
deleted file mode 100644
index ced2fc9..0000000
--- a/debian/patches/25_realtime_is_default.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-jack defaults to realtime, but the documentation doesn't reflect this,
-yet.
-
-This patch has been sent to upstream, in the meantime, it's a cure for
-debian bug #539581
-
-Index: config/os/gnu-linux/sanitycheck.c
-===================================================================
---- config/os/gnu-linux/sanitycheck.c	(revision 3637)
-+++ config/os/gnu-linux/sanitycheck.c	(working copy)
-@@ -22,6 +22,7 @@
- 	  errors++;
- 	  relogin++;
- 	  fprintf(stderr, "\nJACK is running in realtime mode, but you are not allowed to use realtime scheduling.\n");
-+	  fprintf(stderr, "You can switch off realtime mode by passing -L on the command line.\n");
- 		  
- 	  if (!system_has_rtprio_limits_conf()) {
- 		  errors++;
-Index: jackd/jackd.1.in
-===================================================================
---- jackd/jackd.1.in	(revision 3637)
-+++ jackd/jackd.1.in	(working copy)
-@@ -1,4 +1,4 @@
--.TH "JACKD" "1" "@VERSION@" "April 2006" ""
-+.TH "JACKD" "1" "@VERSION@" "September 2009" ""
- .SH "NAME"
- jackd, jackstart \- JACK Audio Connection Kit sound server
- .SH "SYNOPSIS"
-@@ -65,16 +65,26 @@
- for occasions when the structure of this registry changes in ways
- that are incompatible across JACK versions (which is rare).
- .TP
-+\fB\-L, \-\-no\-realtime\fR 
-+.br
-+Disable realtime scheduling. By default, jackd tries to acquire
-+realtime priorities to achieve reliable operation. However, if you
-+don't need them (read: XRUNs are acceptable), this option tells
-+jackd to start without realtime priorities.
-+.TP
- \fB\-R, \-\-realtime\fR 
- .br
--Use realtime scheduling.  This is needed for reliable low\-latency
-+Use realtime scheduling. This option is the default since 0.116.3,
-+you don't need to set it anymore.
-+.br
-+Realtime scheduling is needed for reliable low\-latency
- performance.  On most systems, it requires \fBjackd\fR to run with
- special scheduler and memory allocation privileges, which may be
- obtained in several ways.  The simplest, and least-secure method is to
- run \fBjackd\fR with root privileges.  This means that all JACK
- clients must also run as root.  With a Linux 2.6 kernel, ordinary
--users can run \fBjackd\fR and its clients using options of the
--realtime LSM.  Linux 2.4 kernels need "POSIX draft capabilities"
-+users can run \fBjackd\fR and its clients using POSIX RT priorities.
-+Linux 2.4 kernels need "POSIX draft capabilities"
- enabled (see the \fB<linux/capability.h>\fR include file).  Using that
- method, ordinary users who invoke the daemon using \fBjackstart\fR,
- can later launch JACK clients without running them as root.  See
-@@ -83,7 +93,7 @@
- .TP
- \fB\-P, \-\-realtime\-priority \fIint\fR
- When running \fB\-\-realtime\fR, set the scheduler priority to
--\fIint\fR.
-+\fIint\fR. You usually don't need this option.
- .TP
- \fB\-\-silent\fR
- Silence any output during operation.
-Index: jackd/jackd.c
-===================================================================
---- jackd/jackd.c	(revision 3637)
-+++ jackd/jackd.c	(working copy)
-@@ -362,7 +362,8 @@
- {
- 	copyright (file);
- 	fprintf (file, "\n"
--"usage: jackd [ --realtime OR -R [ --realtime-priority OR -P priority ] ]\n"
-+"usage: jackd [ --no-realtime OR -L ]\n"
-+"             [ --realtime-priority OR -P priority ]\n"
- "             [ --name OR -n server-name ]\n"
- "             [ --no-mlock OR -m ]\n"
- "             [ --unlock OR -u ]\n"

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