[SCM] gmerlin/master: fix various typos reported by lintian

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

The following commit has been merged in the master branch:
commit 3e511f573907dcf18b7ae84fe76d2419a65df9f6
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Tue Jan 11 10:53:59 2011 +0100

    fix various typos reported by lintian

diff --git a/debian/patches/fix_typos.patch b/debian/patches/fix_typos.patch
new file mode 100644
index 0000000..cc0f526
--- /dev/null
+++ b/debian/patches/fix_typos.patch
@@ -0,0 +1,97 @@
+Author: IOhannes m zmölnig
+Description: fix various spelling errors reported by lintian
+--- gmerlin.orig/apps/kbd/kbd_config.c
++++ gmerlin/apps/kbd/kbd_config.c
+@@ -616,7 +616,7 @@
+   ret->kbd_button = gtk_check_button_new_with_label(TR("Daemon running"));
+ 
+   bg_gtk_tooltips_set_tip(ret->kbd_button,
+-                          TRS("Switch deamon on and off. If you want to start the daemon with each start of X, add \"gmerlin_kbd\" to your startup programs"),
++                          TRS("Switch daemon on and off. If you want to start the daemon with each start of X, add \"gmerlin_kbd\" to your startup programs"),
+                           PACKAGE);
+   
+   ret->add_button =
+--- gmerlin.orig/doc/gmerlin.info
++++ gmerlin/doc/gmerlin.info
+@@ -1798,7 +1798,7 @@
+                     smaller enable random ports (recommended for RTSP
+                     aware firewalls). Values larger than 1024 define
+                     the base port. 2 consecutive ports are used for
+-                    each A/V stream, these must be accessable through
++                    each A/V stream, these must be accessible through
+                     the firewall. Odd values are rounded to the next
+                     even value.
+               ftp_anonymous=[1|0] (default: 1)
+--- gmerlin.orig/doc/gmerlin_play.texi
++++ gmerlin/doc/gmerlin_play.texi
+@@ -188,7 +188,7 @@
+ Port base for RTP over UDP. Values of 1024 or smaller enable random
+ ports (recommended for RTSP aware firewalls). Values larger than 1024
+ define the base port. 2 consecutive ports are used for each A/V stream,
+-these must be accessable through the firewall. Odd values are rounded to
++these must be accessible through the firewall. Odd values are rounded to
+ the next even value.
+ @*@*
+ @item @b{ftp_anonymous}=[1|0] (default: 1)@*@*
+--- gmerlin.orig/lib/lcdproc.c
++++ gmerlin/lib/lcdproc.c
+@@ -208,7 +208,7 @@
+ 
+   if(!bg_host_address_set(addr, l->hostname_cfg, l->port_cfg, SOCK_STREAM))
+     {
+-    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Could not resolve adress for: %s",
++    bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Could not resolve address for: %s",
+            l->hostname_cfg);
+     goto fail;
+     }
+--- gmerlin.orig/plugins/videofilters/fv_tctweak.c
++++ gmerlin/plugins/videofilters/fv_tctweak.c
+@@ -303,7 +303,7 @@
+           }
+         else
+           {
+-          fprintf(stderr, "Non continous timecode: ");
++          fprintf(stderr, "Non continuous timecode: ");
+           gavl_timecode_dump(&vp->format.timecode_format, tc);
+           fprintf(stderr, " != ");
+           gavl_timecode_dump(&vp->format.timecode_format, frame->timecode);
+--- gmerlin.orig/po/de.po
++++ gmerlin/po/de.po
+@@ -5214,7 +5214,7 @@
+ 
+ #: apps/kbd/kbd_config.c:619
+ msgid ""
+-"Switch deamon on and off. If you want to start the daemon with each start of "
++"Switch daemon on and off. If you want to start the daemon with each start of "
+ "X, add \"gmerlin_kbd\" to your startup programs"
+ msgstr ""
+ "Schalte den Dämon ein und aus. Wenn Du den Dämon bei jedem Start von X "
+@@ -6435,7 +6435,7 @@
+ 
+ #: lib/lcdproc.c:211
+ #, c-format
+-msgid "Could not resolve adress for: %s"
++msgid "Could not resolve address for: %s"
+ msgstr "Konnte Adresse nicht auflösen für %s"
+ 
+ #: lib/lcdproc.c:218
+--- gmerlin.orig/po/gmerlin.pot
++++ gmerlin/po/gmerlin.pot
+@@ -4932,7 +4932,7 @@
+ 
+ #: apps/kbd/kbd_config.c:619
+ msgid ""
+-"Switch deamon on and off. If you want to start the daemon with each start of "
++"Switch daemon on and off. If you want to start the daemon with each start of "
+ "X, add \"gmerlin_kbd\" to your startup programs"
+ msgstr ""
+ 
+@@ -6066,7 +6066,7 @@
+ 
+ #: lib/lcdproc.c:211
+ #, c-format
+-msgid "Could not resolve adress for: %s"
++msgid "Could not resolve address for: %s"
+ msgstr ""
+ 
+ #: lib/lcdproc.c:218
diff --git a/debian/patches/series b/debian/patches/series
index 51a7150..d6ccf4c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ fix_manpages.patch
 replace_bg_sem_h.patch
 png_set_gray.patch
 function_param_type.patch
+fix_typos.patch

-- 
gmerlin packaging