[SCM] dvd95/master: Refresh patches.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 833a51e6e72f9e49edf8d2deb18a92b144c1affd
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Jun 7 00:31:29 2013 +0100

    Refresh patches.

diff --git a/debian/patches/03_configure_no_ffmpeg_mplayer_mencoder.patch b/debian/patches/03_configure_no_ffmpeg_mplayer_mencoder.patch
index bb4261e..be29109 100644
--- a/debian/patches/03_configure_no_ffmpeg_mplayer_mencoder.patch
+++ b/debian/patches/03_configure_no_ffmpeg_mplayer_mencoder.patch
@@ -3,40 +3,33 @@ Description: Skip ffmpeg, mplayer and ffmpeg checks,
 Author: Alessio Treglia <quadrispro at ubuntu.com>
 Forwarded: not-needed
 ---
- configure |   11 -----------
- 1 file changed, 11 deletions(-)
+ configure.in |   12 ------------
+ 1 file changed, 12 deletions(-)
 
---- dvd95-1.6p0+git20100528.ef7c.orig/configure
-+++ dvd95-1.6p0+git20100528.ef7c/configure
-@@ -14385,10 +14385,6 @@ $as_echo "no" >&6; }
- fi
+--- dvd95.orig/configure.in
++++ dvd95/configure.in
+@@ -298,24 +298,12 @@ fi
  
+ dnl **************************************************************
  
+-AC_PATH_PROG(MPLAYER_PROG, mplayer)
 -if test x"$MPLAYER_PROG" = x; then
--  as_fn_error "Unable to find mplayer in the PATH. You need mplayer to use DVD95. Find it on http://www.mplayerhq.hu" "$LINENO" 5
+-  AC_MSG_ERROR(Unable to find mplayer in the PATH. You need mplayer to use DVD95. Find it on http://www.mplayerhq.hu)
 -fi
--
- 
- # Extract the first word of "mencoder", so it can be a program name with args.
- set dummy mencoder; ac_word=$2
-@@ -14430,10 +14426,6 @@ $as_echo "no" >&6; }
- fi
  
+ dnl **************************************************************
  
+-AC_PATH_PROG(MENCODER_PROG, mencoder)
 -if test x"$MENCODER_PROG" = x; then
--  as_fn_error "Unable to find mencoder in the PATH. You need mencoder to use DVD95. Find it on http://www.mplayerhq.hu" "$LINENO" 5
+-  AC_MSG_ERROR(Unable to find mencoder in the PATH. You need mencoder to use DVD95. Find it on http://www.mplayerhq.hu)
 -fi
--
- 
- # Extract the first word of "ffmpeg", so it can be a program name with args.
- set dummy ffmpeg; ac_word=$2
-@@ -14475,9 +14467,6 @@ $as_echo "no" >&6; }
- fi
  
+ dnl **************************************************************
  
+-AC_PATH_PROG(FFMPEG_PROG, ffmpeg)
 -if test x"$FFMPEG_PROG" = x; then
--  as_fn_error "Unable to find ffmpeg in the PATH. You need ffmpeg to use DVD95. Find it on http://www.ffmpeg.org/" "$LINENO" 5
+-  AC_MSG_ERROR(Unable to find ffmpeg in the PATH. You need ffmpeg to use DVD95. Find it on http://www.ffmpeg.org/)
 -fi
  
  
- ac_config_files="$ac_config_files Makefile src/Makefile dvdauthor/Makefile po/Makefile.in"
+ AC_OUTPUT([
diff --git a/debian/patches/05_binutils_gold.patch b/debian/patches/05_binutils_gold.patch
index 33ddbce..621df6f 100644
--- a/debian/patches/05_binutils_gold.patch
+++ b/debian/patches/05_binutils_gold.patch
@@ -1,8 +1,13 @@
 Description: Fix FTBFS with ld --no-add-needed in natty toolchain
 Author: Bhavani Shankar <bhavi at ubuntu.com>
 
---- dvd95-1.6p0+git20100528.ef7c.orig/src/Makefile.am
-+++ dvd95-1.6p0+git20100528.ef7c/src/Makefile.am
+---
+ src/Makefile.am |    2 +-
+ src/Makefile.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- dvd95.orig/src/Makefile.am
++++ dvd95/src/Makefile.am
 @@ -36,6 +36,6 @@ dvd95_SOURCES = \
  	badsect.c badsect.h \
  	globals.h proto.h const.h vapcontext.h
@@ -11,9 +16,9 @@ Author: Bhavani Shankar <bhavi at ubuntu.com>
 +dvd95_LDADD = @PACKAGE_LIBS@ $(LIBAUTHOR_LIBS) $(INTLLIBS) $(LIBDVDREAD_LIBS) -lm -lxml2
  
  
---- dvd95-1.6p0+git20100528.ef7c.orig/src/Makefile.in
-+++ dvd95-1.6p0+git20100528.ef7c/src/Makefile.in
-@@ -263,7 +263,7 @@ dvd95_SOURCES = \
+--- dvd95.orig/src/Makefile.in
++++ dvd95/src/Makefile.in
+@@ -274,7 +274,7 @@ dvd95_SOURCES = \
  	badsect.c badsect.h \
  	globals.h proto.h const.h vapcontext.h
  

-- 
dvd95 packaging