[SCM] gmerlin/master: Refresh fix_typos.patch against new repackaged tarball.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Wed Dec 12 16:59:40 UTC 2012


The following commit has been merged in the master branch:
commit 9f5d8499bb5b7933d4d2fd364c136ab5d631a297
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Dec 12 16:59:12 2012 +0000

    Refresh fix_typos.patch against new repackaged tarball.

diff --git a/debian/patches/fix_typos.patch b/debian/patches/fix_typos.patch
index c317aea..b8ce86c 100644
--- a/debian/patches/fix_typos.patch
+++ b/debian/patches/fix_typos.patch
@@ -2,12 +2,11 @@ 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(-)
+ 5 files changed, 7 insertions(+), 7 deletions(-)
 
 --- gmerlin.orig/apps/kbd/kbd_config.c
 +++ gmerlin/apps/kbd/kbd_config.c
@@ -20,17 +19,6 @@ Description: fix various spelling errors reported by lintian
                            PACKAGE);
    
    ret->add_button =
---- gmerlin.orig/doc/gmerlin_play.texi
-+++ gmerlin/doc/gmerlin_play.texi
-@@ -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,
--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
 @@ -211,7 +211,7 @@ static int do_connect(bg_lcdproc_t* l)

-- 
gmerlin packaging



More information about the pkg-multimedia-commits mailing list