[SCM] gmerlin-avdecoder/master: Adjust BSD-4 stripping patch to be more reliable (match against text, not whitespace).

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5ae9d411edb0032fdbe9cde6f7e1b9c769e05a02
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Dec 10 13:37:57 2010 +0100

    Adjust BSD-4 stripping patch to be more reliable (match against text, not whitespace).

diff --git a/debian/patches/strip_unused_BSD-4-licensed_code.patch b/debian/patches/strip_unused_BSD-4-licensed_code.patch
index 4c1271c..1feca4a 100644
--- a/debian/patches/strip_unused_BSD-4-licensed_code.patch
+++ b/debian/patches/strip_unused_BSD-4-licensed_code.patch
@@ -1,14 +1,9 @@
 --- a/lib/os.c
 +++ b/lib/os.c
-@@ -84,139 +84,3 @@
-     return rc;
- }
- #endif
--
--
--/* inet_aton  */
--
--#ifndef HAVE_INET_ATON 
+@@ -89,134 +89,6 @@
+ /* inet_aton  */
+ 
+ #ifndef HAVE_INET_ATON 
 -/*
 - * Copyright (c) 1983, 1990, 1993
 - *		The Regents of the University of California.  All rights reserved.
@@ -137,19 +132,15 @@
 -	return 1;
 -}
 -
--#endif
--
--
+ #endif
+ 
+ 
 --- a/lib/os_inet_aton.c
 +++ b/lib/os_inet_aton.c
-@@ -1,138 +1,3 @@
- #include <config.h>
- #include <os.h>
- #include <bgavdefs.h>
--
--/* inet_aton  */
--
--#ifndef HAVE_INET_ATON 
+@@ -5,134 +5,6 @@
+ /* inet_aton  */
+ 
+ #ifndef HAVE_INET_ATON 
 -/*
 - * Copyright (c) 1983, 1990, 1993
 - *		The Regents of the University of California.  All rights reserved.
@@ -278,6 +269,6 @@
 -	return 1;
 -}
 -
--#endif
--
--
+ #endif
+ 
+ 

-- 
gmerlin-avdecoder packaging