[SCM] mplayer2/master: Refresh

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a98541d50cc8310f40375d68fbf9cb71f949b478
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Mar 22 15:31:13 2011 +0100

    Refresh

diff --git a/debian/patches/use-system-paths.patch b/debian/patches/use-system-paths.patch
index 18da256..7fc0142 100644
--- a/debian/patches/use-system-paths.patch
+++ b/debian/patches/use-system-paths.patch
@@ -1,13 +1,15 @@
 Description: Configure mplayer to use system paths
 Author: Reinhard Tartler <siretart at tauware.de>
 Forwarded: not-needed
+---
+ mplayer_options |    2 ++
+ 1 file changed, 2 insertions(+)
 
---- mplayer2-2.0-rc1.orig/mplayer_options
-+++ mplayer2-2.0-rc1/mplayer_options
+--- mplayer2.orig/mplayer_options
++++ mplayer2/mplayer_options
 @@ -4,3 +4,5 @@
  # are ignored. The options do not need quoting, so you can have for example
  # --extra-libs=-lfoo -lbar
  # (and NOT --extra-libs='-lfoo -lbar').
 +--prefix=/usr
 +--confdir=/etc/mplayer
-

-- 
mplayer2 packaging