[SCM] mpg123/master: Add patch to correct some misspellings.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sat Mar 31 11:15:12 UTC 2012


The following commit has been merged in the master branch:
commit 97cb68048c3e9941de2a265c3c1f7e661f05958c
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Mar 31 13:10:15 2012 +0200

    Add patch to correct some misspellings.

diff --git a/debian/patches/0003-spelling_errors.patch b/debian/patches/0003-spelling_errors.patch
new file mode 100644
index 0000000..6660686
--- /dev/null
+++ b/debian/patches/0003-spelling_errors.patch
@@ -0,0 +1,99 @@
+Description: Correct misspellings.
+Author: Alessio Treglia <alessio at debian.org>
+Forwarded: https://sourceforge.net/support/tracker.php?aid=3513583
+---
+ man1/mpg123.1          |    2 +-
+ src/control_generic.c  |    2 +-
+ src/genre.c            |    2 +-
+ src/libmpg123/format.c |    2 +-
+ src/libmpg123/id3.c    |    4 ++--
+ src/mpg123.c           |    2 +-
+ src/wav.c              |    2 +-
+ 7 files changed, 8 insertions(+), 8 deletions(-)
+
+--- mpg123.orig/src/control_generic.c
++++ mpg123/src/control_generic.c
+@@ -510,7 +510,7 @@ int control_generic (mpg123_handle *fr)
+ 					generic_sendmsg("H SEQ <bass> <mid> <treble>: simple eq setting...");
+ 					generic_sendmsg("H PITCH <[+|-]value>: adjust playback speed (+0.01 is 1 %% faster)");
+ 					generic_sendmsg("H SILENCE: be silent during playback (meaning silence in text form)");
+-					generic_sendmsg("H STATE: Print auxilliary state info in several lines (just try it to see what info is there).");
++					generic_sendmsg("H STATE: Print auxiliary state info in several lines (just try it to see what info is there).");
+ 					generic_sendmsg("H TAG/T: Print all available (ID3) tag info, for ID3v2 that gives output of all collected text fields, using the ID3v2.3/4 4-character names.");
+ 					generic_sendmsg("H    The output is multiple lines, begin marked by \"@T {\", end by \"@T }\".");
+ 					generic_sendmsg("H    ID3v1 data is like in the @I info lines (see below), just with \"@T\" in front.");
+--- mpg123.orig/src/genre.c
++++ mpg123/src/genre.c
+@@ -75,7 +75,7 @@ char *genre_table[] =
+ 	"Native American",
+ 	"Cabaret",
+ 	"New Wave",
+-	"Psychadelic",
++	"Psychedelic",
+ 	"Rave",
+ 	"Showtunes",
+ 	"Trailer",
+--- mpg123.orig/src/mpg123.c
++++ mpg123/src/mpg123.c
+@@ -1272,7 +1272,7 @@ static void long_usage(int err)
+ 	fprintf(o,"        --reopen           force close/open on audiodevice\n");
+ 	#ifdef OPT_MULTI
+ 	fprintf(o,"        --cpu <string>     set cpu optimization\n");
+-	fprintf(o,"        --test-cpu         list optmizations possible with cpu and exit\n");
++	fprintf(o,"        --test-cpu         list optimizations possible with cpu and exit\n");
+ 	fprintf(o,"        --list-cpu         list builtin optimizations and exit\n");
+ 	#endif
+ 	#ifdef OPT_3DNOW
+--- mpg123.orig/src/libmpg123/format.c
++++ mpg123/src/libmpg123/format.c
+@@ -428,7 +428,7 @@ off_t bytes_to_samples(mpg123_handle *fr
+ 
+ #ifndef NO_32BIT
+ /* Remove every fourth byte, facilitating conversion from 32 bit to 24 bit integers.
+-   This has to be aware of endianess, of course. */
++   This has to be aware of endianness, of course. */
+ static void chop_fourth_byte(struct outbuffer *buf)
+ {
+ 	unsigned char *wpos = buf->data;
+--- mpg123.orig/src/libmpg123/id3.c
++++ mpg123/src/libmpg123/id3.c
+@@ -866,7 +866,7 @@ static void convert_latin1(mpg123_string
+ 	 1: big endian
+ 
+ 	This modifies source and len to indicate the data _after_ the BOM(s).
+-	Note on nasty data: The last encountered BOM determines the endianess.
++	Note on nasty data: The last encountered BOM determines the endianness.
+ 	I have seen data with multiple BOMS, namely from "the" id3v2 program.
+ 	Not nice, but what should I do?
+ */
+@@ -913,7 +913,7 @@ static void convert_utf16bom(mpg123_stri
+ 	debug1("convert_utf16 with length %lu", (unsigned long)l);
+ 
+ 	bom_endian = check_bom(&s, &l);
+-	debug1("UTF16 endianess check: %i", bom_endian);
++	debug1("UTF16 endianness check: %i", bom_endian);
+ 
+ 	if(bom_endian == -1) /* little-endian */
+ 	{
+--- mpg123.orig/src/wav.c
++++ mpg123/src/wav.c
+@@ -97,7 +97,7 @@ static int testEndian(void)
+   if(a == b)
+       ret = 1;
+   else if(a != c) {
+-      error3("Strange endianess?? %08lx %08lx %08lx\n",a,b,c);
++      error3("Strange endianness?? %08lx %08lx %08lx\n",a,b,c);
+       ret = -1;
+   }
+   return ret;
+--- mpg123.orig/man1/mpg123.1
++++ mpg123/man1/mpg123.1
+@@ -227,7 +227,7 @@ Force stereo output
+ .TP
+ \fB\-r \fIrate\fR, \fB\-\^\-rate \fIrate
+ Set sample rate (default: automatic).  You may want to
+-change this if you need a constant bitrate independed of
++change this if you need a constant bitrate independent of
+ the mpeg stream rate. mpg123 automagically converts the
+ rate. You should then combine this with \-\-stereo or \-\-mono.
+ .TP
diff --git a/debian/patches/series b/debian/patches/series
index 7d929a3..49e061c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-disable_not_public_funcs.patch
 0002-hardening.patch
+0003-spelling_errors.patch

-- 
mpg123 packaging



More information about the pkg-multimedia-commits mailing list