[SCM] gmerlin/master: gmerlin.info is generated (no need for patching)

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

The following commit has been merged in the master branch:
commit cd9f1cb6c838460b154ab46b3fc62fb9284d4a88
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Fri Jan 14 18:36:14 2011 +0100

    gmerlin.info is generated (no need for patching)

diff --git a/debian/patches/fix_typos.patch b/debian/patches/fix_typos.patch
index cc0f526..7e089a3 100644
--- a/debian/patches/fix_typos.patch
+++ b/debian/patches/fix_typos.patch
@@ -11,17 +11,6 @@ Description: fix various spelling errors reported by lintian
                            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 @@

-- 
gmerlin packaging