[SCM] vlc/master: Refresh patches.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fed30c5dc09e41ca2d4f9900540018585f1f4b1c
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Mon Jan 31 23:21:16 2011 +0100

    Refresh patches.

diff --git a/debian/patches/052_as-needed.patch b/debian/patches/052_as-needed.patch
index cd4beef..31ae1ae 100644
--- a/debian/patches/052_as-needed.patch
+++ b/debian/patches/052_as-needed.patch
@@ -1,11 +1,9 @@
 Description: Fix incorrect argument reordering
 Bug-Debian: http://bugs.debian.org/347650
 
-Index: vlc-debian/autotools/ltmain.sh
-===================================================================
---- vlc-debian.orig/autotools/ltmain.sh	2010-02-13 15:44:10.000000000 +0000
-+++ vlc-debian/autotools/ltmain.sh	2010-02-13 15:44:27.000000000 +0000
-@@ -4716,6 +4716,11 @@
+--- a/autotools/ltmain.sh
++++ b/autotools/ltmain.sh
+@@ -5041,6 +5041,11 @@
  	arg=$func_stripname_result
  	;;
  
@@ -17,7 +15,7 @@ Index: vlc-debian/autotools/ltmain.sh
        -Wl,*)
  	func_stripname '-Wl,' '' "$arg"
  	args=$func_stripname_result
-@@ -5070,6 +5075,15 @@
+@@ -5397,6 +5402,15 @@
  	lib=
  	found=no
  	case $deplib in
diff --git a/debian/patches/200_osdmenu_paths.patch b/debian/patches/200_osdmenu_paths.patch
index 3d10288..3af9dc6 100644
--- a/debian/patches/200_osdmenu_paths.patch
+++ b/debian/patches/200_osdmenu_paths.patch
@@ -1,20 +1,16 @@
 Description: Use the installed files for osdmenu rather than the ones in the
  current dir.
 
-Index: vlc-debian/share/osdmenu/default.cfg
-===================================================================
---- vlc-debian.orig/share/osdmenu/default.cfg	2010-02-13 15:44:12.000000000 +0000
-+++ vlc-debian/share/osdmenu/default.cfg	2010-02-13 15:44:27.000000000 +0000
+--- a/share/osdmenu/default.cfg
++++ b/share/osdmenu/default.cfg
 @@ -1,4 +1,4 @@
 -dir share/osdmenu/default
 +dir /usr/share/vlc/osdmenu/default
  action	key-play-pause (0,0)
  	unselect unselected.png
  	select   selection/play_pause.png
-Index: vlc-debian/modules/video_filter/osdmenu.c
-===================================================================
---- vlc-debian.orig/modules/video_filter/osdmenu.c	2010-02-13 15:44:12.000000000 +0000
-+++ vlc-debian/modules/video_filter/osdmenu.c	2010-02-13 15:44:27.000000000 +0000
+--- a/modules/video_filter/osdmenu.c
++++ b/modules/video_filter/osdmenu.c
 @@ -105,7 +105,7 @@
  #if defined( WIN32 ) || defined( UNDER_CE )
  #define OSD_DEFAULT_CFG "osdmenu/default.cfg"

-- 
VLC media player packaging