[SCM] ecasound/master: refresh patches
ghedo-guest at users.alioth.debian.org
ghedo-guest at users.alioth.debian.org
Wed May 11 19:37:23 UTC 2011
The following commit has been merged in the master branch:
commit 0402d0121b952440400cbfb2adad0c086a8558b2
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date: Wed May 11 17:42:29 2011 +0200
refresh patches
diff --git a/debian/patches/0001-fix-manpages-errors.patch b/debian/patches/0001-fix-manpages-errors.patch
index 26cded2..699e4eb 100644
--- a/debian/patches/0001-fix-manpages-errors.patch
+++ b/debian/patches/0001-fix-manpages-errors.patch
@@ -11,8 +11,6 @@ Fix errors and warnings in the manpages found by lintian
Documentation/ecatools.1 | 20 +++---
5 files changed, 105 insertions(+), 105 deletions(-)
-diff --git a/Documentation/ecalength.1 b/Documentation/ecalength.1
-index 8e01803..d1c6885 100644
--- a/Documentation/ecalength.1
+++ b/Documentation/ecalength.1
@@ -2,10 +2,10 @@
@@ -28,7 +26,7 @@ index 8e01803..d1c6885 100644
.PP
.SH "DESCRIPTION"
-@@ -18,7 +18,7 @@ Limitations:
+@@ -18,7 +18,7 @@
.IP ""
- With files without header information (raw files), ecalength will only work
correctly if the audio file is at a sampling rate of 44100 hz\&.
@@ -37,7 +35,7 @@ index 8e01803..d1c6885 100644
.IP ""
- It is not foolproof, feeding it with something other than an audio
file WILL result in ugly things being spewed back\&.
-@@ -38,31 +38,31 @@ Changes the format assumed by default for headerless data\&. (adjust)
+@@ -38,31 +38,31 @@
.IP
.IP "-t"
Prints the summed length of all the files processed\&. (total)
@@ -75,11 +73,9 @@ index 8e01803..d1c6885 100644
.PP
.SH "SEE ALSO"
-diff --git a/Documentation/ecasound-iam.1 b/Documentation/ecasound-iam.1
-index badac29..11521d6 100644
--- a/Documentation/ecasound-iam.1
+++ b/Documentation/ecasound-iam.1
-@@ -77,11 +77,11 @@ reimplement the debug routines\&. \fI[-]\fP
+@@ -77,11 +77,11 @@
.PP
.IP "resource-file \&'path-to-file\&'"
Overrides the global and user resource files\&. Does not affect
@@ -93,7 +89,7 @@ index badac29..11521d6 100644
for \&'cs-option\&'\&.
.PP
.IP "help\&', \&'h\&'"
-@@ -208,7 +208,7 @@ Returns the chainsetup length in samples (if known)\&. \fI[li]\fP
+@@ -208,7 +208,7 @@
.PP
.IP "cs-set-length \&'seconds\&'"
Sets processing time in seconds (doesn\&'t have to be an integer value)\&.
@@ -102,7 +98,7 @@ index badac29..11521d6 100644
according to the longest input object\&. \fI[-]\fP
.PP
.IP "cs-set-length-samples \&'samples\&'"
-@@ -222,13 +222,13 @@ chainsetup length is not explicitly set with \&'cs-set-length\&')\&. \fI[-]\fP
+@@ -222,13 +222,13 @@
.PP
.IP "cs-set-param"
Interpret general chainsetup parameters like for example
@@ -118,7 +114,7 @@ index badac29..11521d6 100644
.PP
.IP "cs-status, status, st"
Prints out status information about available chainsetup\&.
-@@ -242,7 +242,7 @@ issue \&'cs-select\&'\&. \fI[s]\fP
+@@ -242,7 +242,7 @@
.IP "cs-option \&'-prefix:arg1,\&.\&.\&.,argN\&'"
One powerful feature of the interactive-mode is that it
provides full access to ecasound\&'s command-line syntax\&.
@@ -127,7 +123,7 @@ index badac29..11521d6 100644
a bandpass filter is added to the currently selected
chain, with initial parameters 400 (center frequency)
and 200 (width in Hz)\&.
-@@ -320,13 +320,13 @@ while commands with \fIao-\fP operate on outputs\&.
+@@ -320,13 +320,13 @@
.IP
.IP "ai-add \&'input_format_string\&'"
Adds a new input object\&. See ecasound (1) man page for more info about
@@ -143,7 +139,7 @@ index badac29..11521d6 100644
a default output device is added (see ecasoundrc (5))\&. Note on syntax: if any
of the parameters (such as a filename) contains commas, the parameter
should be enclosed in double-quotes\&. \fI[-]\fP
-@@ -398,7 +398,7 @@ Returns the audio object length in samples\&. \fI[li]\fP
+@@ -398,7 +398,7 @@
.PP
.IP "ai-get-format, ao-get-format"
Returns the audio format of the selected audio input/output as a
@@ -152,7 +148,7 @@ index badac29..11521d6 100644
.PP
.IP "ai-list, ao-list"
Returns a list of all input/output objects\&. \fI[S]\fP
-@@ -560,7 +560,7 @@ with JACK package\&. \fI[-]\fP
+@@ -560,7 +560,7 @@
.IP "jack-list-connections"
Returns a list of all JACK ports and a list of connections
for each port\&. This command is similar to the \&'jack_lsp\&' command
@@ -161,7 +157,7 @@ index badac29..11521d6 100644
.IP
.SH "INTERNAL COMMANDS"
Internal commands are not directly aimed at normal use\&. They
-@@ -697,9 +697,9 @@ one registered type\&. The used syntax is:
+@@ -697,9 +697,9 @@
is present for all parameters of the described object type\&.
The used syntax is:
.IP
@@ -174,17 +170,15 @@ index badac29..11521d6 100644
.IP
For exact descriptions of these fields, please see
the header file \fIecasound/libecasound/eca-operator\&.h\fP\&.
-@@ -719,4 +719,4 @@ ecasound (1), ecatools (1), ecasoundrc (5)
+@@ -719,4 +719,4 @@
.IP
.SH "AUTHOR"
- Kai Vehmanen, <kvehmanen -at- eca -dot- cx <kvehmanen -at- eca -dot- cx>>
+ Kai Vehmanen, <kvehmanen \-at\- eca \-dot\- cx <kvehmanen \-at\- eca \-dot\- cx>>
-diff --git a/Documentation/ecasound.1 b/Documentation/ecasound.1
-index 1dfd0ff..8e8cf1e 100644
--- a/Documentation/ecasound.1
+++ b/Documentation/ecasound.1
-@@ -39,7 +39,7 @@ control ecasound with simple commands ("start", "stop", "pause",
+@@ -39,7 +39,7 @@
etc\&.)\&. See ecasound-iam \&.
.IP
.IP "-C"
@@ -193,7 +187,7 @@ index 1dfd0ff..8e8cf1e 100644
.IP
.IP "-D"
-@@ -58,7 +58,7 @@ connected (i\&.e\&. it can be run/processed)\&. But it is possible
+@@ -58,7 +58,7 @@
to have another chainsetup select (i\&.e\&. can be configured)
while other one is current connteced (i\&.e\&. running)\&.
.IP
@@ -202,7 +196,7 @@ index 1dfd0ff..8e8cf1e 100644
Execute a set of Ecasound Interactive mode (EIAM) commands
at launch\&. These commands are executed immediately after
ecasound is started\&. If the command line contains sufficient
-@@ -68,7 +68,7 @@ line options are parsed, but before the processing engine
+@@ -68,7 +68,7 @@
is started\&. Note that this command is a feature of
the ecasound frontend binary and not supported by
the library backend\&. This means that other clients may
@@ -211,7 +205,7 @@ index 1dfd0ff..8e8cf1e 100644
commands are not saved as part of chainsetup or session
state\&.
.IP
-@@ -91,16 +91,16 @@ a public network, be sure to block ecasound\&'s port in your
+@@ -91,16 +91,16 @@
firewall! As there is no access control implemented for incoming
connections, anyone can otherwise connect, control and observe your
ecasound sessions\&.
@@ -231,7 +225,7 @@ index 1dfd0ff..8e8cf1e 100644
.IP
.IP "--osc-udp-port=NNN"
Enables support for Open Source Control (OSC)\&. Ecasound will listen
-@@ -115,7 +115,7 @@ This option was added to ecasound 2\&.7\&.0\&.
+@@ -115,7 +115,7 @@
.IP
.IP "--keep-running,-K"
Do not exit when processing is finished/stopped\&. Only affects
@@ -240,7 +234,7 @@ index 1dfd0ff..8e8cf1e 100644
Option added to ecasound 2\&.4\&.2\&.
.IP
.IP "--help,-h"
-@@ -152,12 +152,12 @@ Quiet mode, no output\&. Same as \fI-d:0\fP\&.
+@@ -152,12 +152,12 @@
.IP
.IP "-a:chainname1, chainname2, \&.\&.\&."
Selects active signal chains\&. All inputs and outputs following
@@ -256,7 +250,7 @@ index 1dfd0ff..8e8cf1e 100644
chains effects, inputs and outputs are assigned to\&. Look at the \fBEXAMPLES\fP
section for more detailed info about the usage of this option\&.
.IP
-@@ -176,20 +176,20 @@ format allows it - in readwrite mode\&.
+@@ -176,20 +176,20 @@
.IP
.IP "-z:feature"
Enables \&'feature\&'\&. Most features can be disabled using notation
@@ -286,7 +280,7 @@ index 1dfd0ff..8e8cf1e 100644
in which channels are mixed by averaging\&. Mixmode selection was first
added to ecasound 2\&.4\&.0\&.
See ecasoundrc man page\&.
-@@ -218,10 +218,10 @@ performance, but can cause total lock-ups if something goes wrong\&.
+@@ -218,10 +218,10 @@
The \&'sched_priority\&' can be omitted (0=omitted)\&. If given,
this is the static priority to the highest priority ecasound thread\&.
Other ecasound threads run with priority \&'sched_priority-1\&.\&.\&.n\&'\&.
@@ -299,7 +293,7 @@ index 1dfd0ff..8e8cf1e 100644
See section \fIGeneral chainsetup options\fP for details\&.
.IP
\fBPROCESSING CONTROL\fP
-@@ -229,7 +229,7 @@ See section \fIGeneral chainsetup options\fP for details\&.
+@@ -229,7 +229,7 @@
Sets processing time in seconds (doesn\&'t have to be an integer value)\&.
If processing time isn\&'t set, engine stops when all inputs are
finished\&. This option is equivalent to the \&'cs-set-length\&' EIAM
@@ -308,7 +302,7 @@ index 1dfd0ff..8e8cf1e 100644
according to the longest input object\&.
.IP
.IP "-tl"
-@@ -249,9 +249,9 @@ For available options, see "OBJECT TYPE SPECIFIC NOTES" below\&.
+@@ -249,9 +249,9 @@
.IP "-f:sample_format,channel,sample-rate,interleaving"
Sets the audio stream parameters for subsequent audio objects\&.
To set different parameters for different audio objects, multiple
@@ -320,7 +314,7 @@ index 1dfd0ff..8e8cf1e 100644
.IP
When an audio object is opened (e\&.g\&. a file or sound device
is opened, or connection is made to a sound server), the audio
-@@ -260,25 +260,25 @@ not all audio objects allow to set any or all of the parameters\&.
+@@ -260,25 +260,25 @@
For instance when opening existing audio files, many file formats
have a header describing the file audio parameters\&. In
these cases the audio file header overrides the parameters
@@ -352,7 +346,7 @@ index 1dfd0ff..8e8cf1e 100644
Currently supported formats are "u8" (same as "8"), "s16_le" (same
as "16"), "s16_be", "s24_le", "s24_be", "s32_le", "s32_be", "f32_le"
and "f32_be"\&. An empty string "" picks the system default sample
-@@ -287,7 +287,7 @@ format\&.
+@@ -287,7 +287,7 @@
The 4th parameter defines the channel layout\&. The available
options are \&'i\&' (interleaved\&' and \&'n\&' (noninterleaved)\&. With
the noninterleaved setting, ecasound will process samples
@@ -361,7 +355,7 @@ index 1dfd0ff..8e8cf1e 100644
The default setting is \&'i\&'\&.
.IP
.IP "-y:seconds"
-@@ -297,7 +297,7 @@ use the \fI\&.ewf\fP format\&.
+@@ -297,7 +297,7 @@
.IP
.IP "-i[:]input-file-or-device[,params]"
Specifies a new input source that is connected to all selected chains (chains
@@ -370,7 +364,7 @@ index 1dfd0ff..8e8cf1e 100644
not possible, but one input can be connected to multiple chains\&. Input can be
a a file, device or some other audio object (see below)\&. If the input is
a file, its type is determined using the file name extension\&. If the object
-@@ -312,11 +312,11 @@ are installed; FLAC files (\&.flac) with flac command-line tools or using
+@@ -312,11 +312,11 @@
libsndfile; and AAC files (\&.aac/\&.m4a/\&.mp4) with faad2/faac tools\&. Supported
realtime devices are OSS audio devices (/dev/dsp*), ALSA audio and loopback
devices and JACK audio subsystem\&. If no inputs are specified, the first
@@ -384,7 +378,7 @@ index 1dfd0ff..8e8cf1e 100644
the default output device is used (see ~/\&.ecasoundrc)\&. If the object
name contains any commas, the name must be enclosed in backquotes to
avoid confusing the parser\&. Note, many object types do not support
-@@ -352,7 +352,7 @@ as the second parameter is played back continuously looping
+@@ -352,7 +352,7 @@
back to the beginning when the end of file is reached\&. Any additional
parameters given are passed unaltered to the file object\&.
Parameters 3\&.\&.\&.N are passed as is to the child object (i\&.e\&.
@@ -393,7 +387,7 @@ index 1dfd0ff..8e8cf1e 100644
"bar1,bar2" to the "foo\&.wav" object\&.
.IP
To select and use only a specific segment of an audio object,
-@@ -416,7 +416,7 @@ A variant of \&'jack\&' object type is \&'jack_multi\&'\&. The full object synta
+@@ -416,7 +416,7 @@
is \fBjack_multi,destport1,\&.\&.\&.,destportN\fP\&. When a \&'jack_multi\&' object
is connected to a JACK server, first channel of the object is connected
to JACK port \&'destport1\&', second to \&'destport2\&' and so forth\&. For
@@ -402,7 +396,7 @@ index 1dfd0ff..8e8cf1e 100644
creates a stereo ecasound output object, with its left and right
channels routed to two difference JACK clients\&. The destination ports
must be active when the ecasound engine is launched, or otherwise
-@@ -463,7 +463,7 @@ Loop devices make it possible to route (loop back) data between
+@@ -468,7 +468,7 @@
chains\&. Option syntax is \fB-[io][:]loop,tag\fP\&. If you add
a loop output with tag \&'1\&', all data written to this output is routed
to any loop input with tag \&'1\&'\&. The tag can be either numerical
@@ -411,7 +405,7 @@ index 1dfd0ff..8e8cf1e 100644
with other input/output objects, you can attach the same loop
device to multiple chains and this way split/mix the signal\&.
.IP
-@@ -487,17 +487,17 @@ objects, except all i/o is done at realtime speed\&.
+@@ -492,17 +492,17 @@
Object type \&'resample\&' can be used to resample audio
object\&'s audio data to match the sampling rate used
in the active chainsetup\&. For example,
@@ -432,7 +426,7 @@ index 1dfd0ff..8e8cf1e 100644
"bar1,bar2" to the "foo\&.wav" object\&.
.IP
If ecasound was compiled with support for libsamplerate, you can
-@@ -508,7 +508,7 @@ available\&. To force ecasound to use the internal resampler,
+@@ -513,7 +513,7 @@
.IP "Reverse - \&'reverse\&'"
Object type \&'reverse\&' can be used to reverse audio
data coming from an audio object\&. As an example,
@@ -441,7 +435,7 @@ index 1dfd0ff..8e8cf1e 100644
\&'foo\&.wav\&' backwards\&. Reversing output objects is not
supported\&. Note! Trying to reverse audio object types with really
slow seek operation (like mp3), works extremely badly\&.
-@@ -516,7 +516,7 @@ Try converting to an uncompressed format (wav or raw)
+@@ -521,7 +521,7 @@
first, and then do reversation\&.
.IP
Parameters 3\&.\&.\&.N are passed as is to the child object (i\&.e\&.
@@ -450,7 +444,7 @@ index 1dfd0ff..8e8cf1e 100644
"bar1,bar2" to the "foo\&.wav" object\&.
.IP
.IP "System standard streams and named pipes - \&'stdin\&', \&'stdout\&'"
-@@ -537,12 +537,12 @@ produce an infinite stream\&. This feature was first added to Ecasound
+@@ -542,12 +542,12 @@
.IP "Typeselect - \&'typeselect\&'"
The special \&'typeselect\&' object type can be used to override
how ecasound maps filename extensions and object types\&. For
@@ -465,7 +459,7 @@ index 1dfd0ff..8e8cf1e 100644
"bar1,bar2" to the "foo\&.wav" object\&.
.IP
\fBMIDI SETUP\fP
-@@ -601,7 +601,7 @@ preset database\&.
+@@ -606,7 +606,7 @@
.IP "-ev"
Analyzes sample data to find out how much the signal can
be amplified without clipping\&. The resulting percent value
@@ -474,7 +468,7 @@ index 1dfd0ff..8e8cf1e 100644
summary, containing info about the stereo-image and
distribution of sample values, is printed out at the end
of processing\&.
-@@ -613,7 +613,7 @@ on every read\&.
+@@ -618,7 +618,7 @@
.IP
.IP "-ezf"
Finds the optimal value for DC-adjusting\&. You can use the result
@@ -483,7 +477,7 @@ index 1dfd0ff..8e8cf1e 100644
.IP
\fIGENERAL SIGNAL PROCESSING ALGORITHMS\fP
.IP "-eS:stamp-id"
-@@ -624,13 +624,13 @@ used by controllers and other operators\&.
+@@ -629,13 +629,13 @@
.IP "-ea:amplify%"
Adjusts the signal amplitude to \&'amplify%\&' percent (linear scale, i\&.e\&.
individual samples are multiplied by \&'amplify%/100\&')\&. See also
@@ -499,7 +493,7 @@ index 1dfd0ff..8e8cf1e 100644
.IP
.IP "-eadb:gain-dB[,channel]"
Adjusts signal level by \&'gain-dB\&', with a gain of 0dB having no effect
-@@ -643,7 +643,7 @@ only applied to the given channel (1\&.\&.\&.n)\&.
+@@ -648,7 +648,7 @@
Amplifies signal by amplify-% percent (linear scale, i\&.e\&. individual
samples are multiplied by \&'amplify%/100\&')\&. If number of consecutive
clipped samples (resulting sample value is outside the nominal
@@ -508,7 +502,7 @@ index 1dfd0ff..8e8cf1e 100644
.IP
.IP "-eal:limit-%"
Limiter effect\&. Limits audio level to \&'limit-%\&' (linear scale) with
-@@ -674,7 +674,7 @@ The default is 1\&.0, and holds the volume very constant without many nasty
+@@ -679,7 +679,7 @@
side effects\&. However the dynamics in music are severely restricted,
and a value of 0\&.5 might keep the music more intact\&.
.IP
@@ -517,7 +511,7 @@ index 1dfd0ff..8e8cf1e 100644
Noise gate\&. Supports multichannel processing (each channel
processed separately)\&. When signal amplitude falls below
\&'threshold_level_%\&' percent (100% means maximum amplitude), gate
-@@ -695,7 +695,7 @@ only right (2nd) channel is let through\&.
+@@ -700,7 +700,7 @@
.IP
.IP "-ezx:channel-count,delta-ch1,\&.\&.\&.,delta-chN"
Adjusts the signal DC by \&'delta-chX\&', where X is the
@@ -526,7 +520,7 @@ index 1dfd0ff..8e8cf1e 100644
values\&.
.IP
\fIENVELOPE MODULATION\fP
-@@ -780,9 +780,9 @@ Option added to ecasound 2\&.4\&.5\&.
+@@ -785,9 +785,9 @@
Reorder, omit and/r duplicate chain channels\&. The resulting
audio stream has total of \&'N\&' channels\&. Each parameter specifies
the source channel to use for given output channel\&. As an
@@ -538,7 +532,7 @@ index 1dfd0ff..8e8cf1e 100644
would route the second channel to both two output channels
(\&'out1,out2\&' = \&'in2,in2\&')\&. If \&'chX\&' is zero, the given channel \&'X\&'
will be muted in the output stream\&. Option added to ecasound 2\&.7\&.0\&.
-@@ -915,11 +915,11 @@ the \fBEXAMPLES\fP section\&.
+@@ -920,11 +920,11 @@
Sine oscillator with frequency of \&'freq\&' Hz and initial phase
of \&'i_phase\&' times pi\&.
.IP
@@ -552,7 +546,7 @@ index 1dfd0ff..8e8cf1e 100644
All \&'posN\&' and \&'valueN\&' must be between 0\&.0 and 1\&.0\&. Also,
for all \&'posN\&' values \&'pos1 < pos2 < \&.\&.\&. < posN\&' must be true\&.
.IP
-@@ -934,24 +934,24 @@ Linear envelope that starts from \&'start_value\&' and linearly
+@@ -939,24 +939,24 @@
changes to \&'end_value\&' during \&'time_in_seconds\&'\&. Can
be used for fadeins and fadeouts\&.
.IP
@@ -588,7 +582,7 @@ index 1dfd0ff..8e8cf1e 100644
.IP
.IP "-km:fx-param,start-value,end-value,controller,channel"
MIDI continuous controller (control change messages)\&.
-@@ -967,7 +967,7 @@ Defaults to \fI/dev/midi\fP\&.
+@@ -972,7 +972,7 @@
.IP
.IP "-ksv:fx-param,start-value,end-value,stamp-id,rms-toggle"
Volume analyze controller\&. Analyzes the audio stored in
@@ -597,7 +591,7 @@ index 1dfd0ff..8e8cf1e 100644
control data based on the results\&. If \&'rms-toggle\&' is non-zero,
RMS-volume is used to calculate the control value\&. Otherwise
average peak-amplitude is used\&.
-@@ -1000,7 +1000,7 @@ debugging ECI/EIAM scripts and applications\&.
+@@ -1005,7 +1005,7 @@
.IP "ECASOUND_LOGLEVEL"
Select which messages are written to the logfile defined by
\fIECASOUND_LOGFILE\fP\&. The syntax for \fI-d:level\fP is used\&. If not
@@ -606,17 +600,15 @@ index 1dfd0ff..8e8cf1e 100644
but \&'functions (64)\&' and \&'continuous (128)\&' class messages)\&.
.PP
.IP "COLUMNS"
-@@ -1107,4 +1107,4 @@ increase the debug level to see what\&'s going on\&.
+@@ -1112,4 +1112,4 @@
.SH "AUTHOR"
.PP
-Kai Vehmanen, <kvehmanen -at- eca -dot- cx <kvehmanen -at- eca -dot- cx>>
+Kai Vehmanen, <kvehmanen \-at\- eca \-dot\- cx <kvehmanen \-at\- eca \-dot\- cx>>
-diff --git a/Documentation/ecasoundrc.5 b/Documentation/ecasoundrc.5
-index 82121a0..f88f3a6 100644
--- a/Documentation/ecasoundrc.5
+++ b/Documentation/ecasoundrc.5
-@@ -30,7 +30,7 @@ MIDI-device\&. If the device name is given in \fIrawmidi,/dev/midi*\fP
+@@ -30,7 +30,7 @@
format, OSS/Linux or OSS/Lite drivers are used\&.
Device \fIrawmidi,/dev/snd/midiCxDy\fP opens an ALSA raw-MIDI
device with card number \&'x\&' and device number \&'y\&'\&.
@@ -625,7 +617,7 @@ index 82121a0..f88f3a6 100644
Defaults to \fIrawmidi,/dev/midi\fP\&.
.IP
.IP "default-output"
-@@ -128,7 +128,7 @@ backslash-espacing can be used to include white-space to
+@@ -128,7 +128,7 @@
individual parameters\&. By default Ecasound will try to
launch \fIlame\fP\&. As a special exception (added to Ecasound
2\&.7\&.0), if the output program is "lame" and options
@@ -634,17 +626,15 @@ index 82121a0..f88f3a6 100644
big-endian samples\&.
.IP
.IP "ext-cmd-ogg-input"
-@@ -223,4 +223,4 @@ ecasound (1), ecatools (1), ecasound-iam (1)
+@@ -223,4 +223,4 @@
.SH "AUTHOR"
.PP
-Kai Vehmanen, <kvehmanen -at- eca -dot- cx <kvehmanen -at- eca -dot- cx>>
+Kai Vehmanen, <kvehmanen \-at\- eca \-dot\- cx <kvehmanen \-at\- eca \-dot\- cx>>
-diff --git a/Documentation/ecatools.1 b/Documentation/ecatools.1
-index 824dc57..4013dbe 100644
--- a/Documentation/ecatools.1
+++ b/Documentation/ecatools.1
-@@ -15,7 +15,7 @@ ecatools \- audio processing utils based on ecasound
+@@ -15,7 +15,7 @@
.PP
\fBecanormalize\fP file1 [ file2 \&.\&.\&. fileN ]
.PP
@@ -653,7 +643,7 @@ index 824dc57..4013dbe 100644
.PP
\fBecasignalview\fP [ options ] [ input ] [ output ]
.PP
-@@ -99,7 +99,7 @@ Set libecasound debug level\&. See ecasound(1)\&.
+@@ -99,7 +99,7 @@
.IP
.IP "-f"
Flush the playlist contents\&. See also
@@ -662,7 +652,7 @@ index 824dc57..4013dbe 100644
.IP
.IP "-h"
Print usage information and exit\&.
-@@ -109,25 +109,25 @@ Skip \&'number\&' of files\&.
+@@ -109,25 +109,25 @@
.IP
.IP "-l"
List the current playlist contents to stdout\&. See also
@@ -693,7 +683,7 @@ index 824dc57..4013dbe 100644
.IP
\fBECASIGNALVIEW\fP
.PP
-@@ -182,7 +182,7 @@ Quit ecasignalview\&.
+@@ -182,7 +182,7 @@
.IP
It is also possible to reset the max-peak and clipped-samples
counters by sending a SIGHUP signal to the process (i\&.e\&.
@@ -702,7 +692,7 @@ index 824dc57..4013dbe 100644
.PP
More complete documentation for ecasignalview can be found
from "Ecasound User\&'s Guide" (see \&'\&'http://www\&.eca\&.cx/ecasound
-@@ -196,7 +196,7 @@ Path to the ecasound executable\&. Used by many ecatools\&.
+@@ -196,7 +196,7 @@
.PP
\fIECAPLAY_OUTPUT_DEVICE\fP
Device ecaplay should use for audio output\&. Same syntax
@@ -711,10 +701,9 @@ index 824dc57..4013dbe 100644
.PP
.SH "FILES"
-@@ -217,4 +217,4 @@ ecasound (1), ecalength(1), "HTML docs in the Documentation subdirectory"
+@@ -217,4 +217,4 @@
.SH "AUTHOR"
.PP
-Kai Vehmanen, <kvehmanen -at- eca -dot- cx <kvehmanen -at- eca -dot- cx>>
+Kai Vehmanen, <kvehmanen \-at\- eca \-dot\- cx <kvehmanen \-at\- eca \-dot\- cx>>
---
diff --git a/debian/patches/0003-build-shared-libecasound.patch b/debian/patches/0003-build-shared-libecasound.patch
index 908be43..30a088a 100644
--- a/debian/patches/0003-build-shared-libecasound.patch
+++ b/debian/patches/0003-build-shared-libecasound.patch
@@ -10,11 +10,9 @@ Build libecasound as shared library instead of static
libecasound/plugins/Makefile.in | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
-diff --git a/libecasound/Makefile.am b/libecasound/Makefile.am
-index 1f90b35..b1a26f6 100644
--- a/libecasound/Makefile.am
+++ b/libecasound/Makefile.am
-@@ -363,7 +363,7 @@ libecasound_tester_src = \
+@@ -364,7 +364,7 @@
libecasound_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src)
libecasound_debug_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src)
@@ -23,11 +21,9 @@ index 1f90b35..b1a26f6 100644
libecasound_la_LIBADD = $(eca_libadd)
libecasound_debug_la_LDFLAGS = $(libecasound_la_LDFLAGS)
libecasound_debug_la_LIBADD = $(libecasound_la_LIBADD)
-diff --git a/libecasound/Makefile.in b/libecasound/Makefile.in
-index 74a544e..79e04ed 100644
--- a/libecasound/Makefile.in
+++ b/libecasound/Makefile.in
-@@ -737,7 +737,7 @@ libecasound_tester_src = \
+@@ -708,7 +708,7 @@
libecasound_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src)
libecasound_debug_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src)
@@ -36,11 +32,9 @@ index 74a544e..79e04ed 100644
libecasound_la_LIBADD = $(eca_libadd)
libecasound_debug_la_LDFLAGS = $(libecasound_la_LDFLAGS)
libecasound_debug_la_LIBADD = $(libecasound_la_LIBADD)
-diff --git a/libecasound/plugins/Makefile.am b/libecasound/plugins/Makefile.am
-index 8b1e3ef..493709d 100644
--- a/libecasound/plugins/Makefile.am
+++ b/libecasound/plugins/Makefile.am
-@@ -105,7 +105,7 @@ plugin_all_sources = $(all_af_src) \
+@@ -105,7 +105,7 @@
libecasound_plugins_la_SOURCES = audioio_dummy.cpp $(plugin_cond_sources)
EXTRA_libecasound_plugins_la_SOURCES = $(plugin_all_sources)
libecasound_plugins_la_LIBADD = $(ECA_S_EXTRA_LIBS)
@@ -49,11 +43,9 @@ index 8b1e3ef..493709d 100644
libecasound_plugins_debug_la_SOURCES = $(libecasound_plugins_la_SOURCES)
EXTRA_libecasound_plugins_debug_la_SOURCES = $(EXTRA_libecasound_plugins_la_SOURCES)
-diff --git a/libecasound/plugins/Makefile.in b/libecasound/plugins/Makefile.in
-index 97861c6..3f6a8af 100644
--- a/libecasound/plugins/Makefile.in
+++ b/libecasound/plugins/Makefile.in
-@@ -356,7 +356,7 @@ plugin_all_sources = $(all_af_src) \
+@@ -328,7 +328,7 @@
libecasound_plugins_la_SOURCES = audioio_dummy.cpp $(plugin_cond_sources)
EXTRA_libecasound_plugins_la_SOURCES = $(plugin_all_sources)
libecasound_plugins_la_LIBADD = $(ECA_S_EXTRA_LIBS)
@@ -62,4 +54,3 @@ index 97861c6..3f6a8af 100644
libecasound_plugins_debug_la_SOURCES = $(libecasound_plugins_la_SOURCES)
EXTRA_libecasound_plugins_debug_la_SOURCES = $(EXTRA_libecasound_plugins_la_SOURCES)
libecasound_plugins_debug_la_LIBADD = $(libecasound_plugins_la_LIBADD)
---
diff --git a/debian/patches/0004-build-shared-libecasoundc.patch b/debian/patches/0004-build-shared-libecasoundc.patch
index e15ce73..99edc9f 100644
--- a/debian/patches/0004-build-shared-libecasoundc.patch
+++ b/debian/patches/0004-build-shared-libecasoundc.patch
@@ -8,11 +8,9 @@ Build libecasoundc as shared library instead of static
libecasoundc/Makefile.in | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
-diff --git a/libecasoundc/Makefile.am b/libecasoundc/Makefile.am
-index fda06a3..ad8d846 100644
--- a/libecasoundc/Makefile.am
+++ b/libecasoundc/Makefile.am
-@@ -14,9 +14,9 @@ AUTOMAKE_OPTIONS = foreign
+@@ -14,9 +14,9 @@
# !!!
# remember to update eca-version.cpp
if ECA_AM_DEBUG_MODE
@@ -24,12 +22,10 @@ index fda06a3..ad8d846 100644
endif
INCLUDES = -I$(srcdir)
-diff --git a/libecasoundc/Makefile.in b/libecasoundc/Makefile.in
-index 6f55563..1f5c45a 100644
--- a/libecasoundc/Makefile.in
+++ b/libecasoundc/Makefile.in
-@@ -288,7 +288,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+@@ -261,7 +261,7 @@
+ top_srcdir = @top_srcdir@
EXTRA_DIST = ChangeLog
AUTOMAKE_OPTIONS = foreign
- at ECA_AM_DEBUG_MODE_FALSE@eca_ldflags = -s -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@ -static
@@ -37,7 +33,7 @@ index 6f55563..1f5c45a 100644
# ----------------------------------------------------------------------
# defines
-@@ -296,7 +296,7 @@ AUTOMAKE_OPTIONS = foreign
+@@ -269,7 +269,7 @@
# !!!
# remember to update eca-version.cpp
@@ -46,4 +42,3 @@ index 6f55563..1f5c45a 100644
INCLUDES = -I$(srcdir)
@ECA_AM_DEBUG_MODE_FALSE at lib_LTLIBRARIES = libecasoundc.la
# -I$(top_srcdir)/libecasound
---
diff --git a/debian/patches/0005-build-shared-libkvutils.patch b/debian/patches/0005-build-shared-libkvutils.patch
index ff0b4df..4d627f5 100644
--- a/debian/patches/0005-build-shared-libkvutils.patch
+++ b/debian/patches/0005-build-shared-libkvutils.patch
@@ -10,11 +10,9 @@ Build libkvutils as shared library instead of static
libecasound/Makefile.in | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
-diff --git a/kvutils/Makefile.am b/kvutils/Makefile.am
-index 76408b6..2a9446b 100644
--- a/kvutils/Makefile.am
+++ b/kvutils/Makefile.am
-@@ -56,7 +56,7 @@ kvutil_headers = kvu_dbc.h \
+@@ -56,7 +56,7 @@
kvu_value_queue.h
libkvutils_la_SOURCES = $(kvutil_sources) $(kvutil_headers)
@@ -23,11 +21,9 @@ index 76408b6..2a9446b 100644
libkvutils_debug_la_SOURCES = $(libkvutils_la_SOURCES)
libkvutils_debug_la_LDFLAGS = $(libkvutils_la_LDFLAGS)
-diff --git a/kvutils/Makefile.in b/kvutils/Makefile.in
-index 95c8869..922ca8c 100644
--- a/kvutils/Makefile.in
+++ b/kvutils/Makefile.in
-@@ -326,7 +326,7 @@ kvutil_headers = kvu_dbc.h \
+@@ -299,7 +299,7 @@
kvu_value_queue.h
libkvutils_la_SOURCES = $(kvutil_sources) $(kvutil_headers)
@@ -36,11 +32,9 @@ index 95c8869..922ca8c 100644
libkvutils_debug_la_SOURCES = $(libkvutils_la_SOURCES)
libkvutils_debug_la_LDFLAGS = $(libkvutils_la_LDFLAGS)
libkvutils_tester_SOURCES = libkvutils_tester.cpp
-diff --git a/libecasound/Makefile.am b/libecasound/Makefile.am
-index b1a26f6..660d771 100644
--- a/libecasound/Makefile.am
+++ b/libecasound/Makefile.am
-@@ -363,7 +363,7 @@ libecasound_tester_src = \
+@@ -364,7 +364,7 @@
libecasound_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src)
libecasound_debug_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src)
@@ -49,11 +43,9 @@ index b1a26f6..660d771 100644
libecasound_la_LIBADD = $(eca_libadd)
libecasound_debug_la_LDFLAGS = $(libecasound_la_LDFLAGS)
libecasound_debug_la_LIBADD = $(libecasound_la_LIBADD)
-diff --git a/libecasound/Makefile.in b/libecasound/Makefile.in
-index 79e04ed..0adc095 100644
--- a/libecasound/Makefile.in
+++ b/libecasound/Makefile.in
-@@ -737,7 +737,7 @@ libecasound_tester_src = \
+@@ -708,7 +708,7 @@
libecasound_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src)
libecasound_debug_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src)
@@ -62,4 +54,3 @@ index 79e04ed..0adc095 100644
libecasound_la_LIBADD = $(eca_libadd)
libecasound_debug_la_LDFLAGS = $(libecasound_la_LDFLAGS)
libecasound_debug_la_LIBADD = $(libecasound_la_LIBADD)
---
diff --git a/debian/patches/0006-configure-largefile-support.patch b/debian/patches/0006-configure-largefile-support.patch
index faefa71..2de1f86 100644
--- a/debian/patches/0006-configure-largefile-support.patch
+++ b/debian/patches/0006-configure-largefile-support.patch
@@ -5,9 +5,9 @@ Subject: [PATCH] clarify configure script - largefile support for 32-bit systems
---
--- a/configure
+++ b/configure
-@@ -30068,6 +30068,7 @@
+@@ -30061,6 +30061,7 @@
else
- echo "Largefile support: no"
+ echo "Effects enabled: no"
fi
+ echo "(for 32-bit systems)"
if test x$termcap_library = xtermcap ; then
--
ecasound packaging
More information about the pkg-multimedia-commits
mailing list