[SCM] gmerlin/master: Refresh patches.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 326baa7f064972adf179faa643bed453d6a86250
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jun 11 13:13:45 2012 +0200

    Refresh patches.
    
    Git-Dch: Ignore

diff --git a/debian/patches/fix_typos.patch b/debian/patches/fix_typos.patch
index 7e089a3..c317aea 100644
--- a/debian/patches/fix_typos.patch
+++ b/debian/patches/fix_typos.patch
@@ -1,8 +1,17 @@
 Author: IOhannes m zmölnig
 Description: fix various spelling errors reported by lintian
+---
+ apps/kbd/kbd_config.c             |    2 +-
+ doc/gmerlin_play.texi             |    2 +-
+ lib/lcdproc.c                     |    2 +-
+ plugins/videofilters/fv_tctweak.c |    2 +-
+ po/de.po                          |    4 ++--
+ po/gmerlin.pot                    |    4 ++--
+ 6 files changed, 8 insertions(+), 8 deletions(-)
+
 --- gmerlin.orig/apps/kbd/kbd_config.c
 +++ gmerlin/apps/kbd/kbd_config.c
-@@ -616,7 +616,7 @@
+@@ -616,7 +616,7 @@ static window_t * create_window()
    ret->kbd_button = gtk_check_button_new_with_label(TR("Daemon running"));
  
    bg_gtk_tooltips_set_tip(ret->kbd_button,
@@ -13,7 +22,7 @@ Description: fix various spelling errors reported by lintian
    ret->add_button =
 --- gmerlin.orig/doc/gmerlin_play.texi
 +++ gmerlin/doc/gmerlin_play.texi
-@@ -188,7 +188,7 @@
+@@ -181,7 +181,7 @@ Port base for RTP@*@*
  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,
@@ -24,7 +33,7 @@ Description: fix various spelling errors reported by lintian
  @item @b{ftp_anonymous}=[1|0] (default: 1)@*@*
 --- gmerlin.orig/lib/lcdproc.c
 +++ gmerlin/lib/lcdproc.c
-@@ -208,7 +208,7 @@
+@@ -211,7 +211,7 @@ static int do_connect(bg_lcdproc_t* l)
  
    if(!bg_host_address_set(addr, l->hostname_cfg, l->port_cfg, SOCK_STREAM))
      {
@@ -35,7 +44,7 @@ Description: fix various spelling errors reported by lintian
      }
 --- gmerlin.orig/plugins/videofilters/fv_tctweak.c
 +++ gmerlin/plugins/videofilters/fv_tctweak.c
-@@ -303,7 +303,7 @@
+@@ -303,7 +303,7 @@ static int read_video_tctweak(void * pri
            }
          else
            {
@@ -46,7 +55,7 @@ Description: fix various spelling errors reported by lintian
            gavl_timecode_dump(&vp->format.timecode_format, frame->timecode);
 --- gmerlin.orig/po/de.po
 +++ gmerlin/po/de.po
-@@ -5214,7 +5214,7 @@
+@@ -5386,7 +5386,7 @@ msgstr "Dämon läuft"
  
  #: apps/kbd/kbd_config.c:619
  msgid ""
@@ -55,18 +64,18 @@ Description: fix various spelling errors reported by lintian
  "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 @@
+@@ -6803,7 +6803,7 @@ msgstr "Befehl \"%s\" vom Server nicht v
  
- #: lib/lcdproc.c:211
+ #: lib/lcdproc.c:214
  #, 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
+ #: lib/lcdproc.c:221
 --- gmerlin.orig/po/gmerlin.pot
 +++ gmerlin/po/gmerlin.pot
-@@ -4932,7 +4932,7 @@
+@@ -5076,7 +5076,7 @@ msgstr ""
  
  #: apps/kbd/kbd_config.c:619
  msgid ""
@@ -75,12 +84,12 @@ Description: fix various spelling errors reported by lintian
  "X, add \"gmerlin_kbd\" to your startup programs"
  msgstr ""
  
-@@ -6066,7 +6066,7 @@
+@@ -6401,7 +6401,7 @@ msgstr ""
  
- #: lib/lcdproc.c:211
+ #: lib/lcdproc.c:214
  #, c-format
 -msgid "Could not resolve adress for: %s"
 +msgid "Could not resolve address for: %s"
  msgstr ""
  
- #: lib/lcdproc.c:218
+ #: lib/lcdproc.c:221

-- 
gmerlin packaging