[SCM] mplayer/master: * Team upload. * New upstream release. - Fix FTBFS with ffmpeg 2.9 (Closes: #803844) - Refresh patches.

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

The following commit has been merged in the master branch:
commit f761ee0fa3bbcfe4a1b25c8903a1cbc09e15e3e5
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Fri Apr 15 17:54:03 2016 +0200

      * Team upload.
      * New upstream release.
        - Fix FTBFS with ffmpeg 2.9 (Closes: #803844)
        - Refresh patches.

diff --git a/debian/changelog b/debian/changelog
index d7ac360..2371708 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mplayer (2:1.3.0-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release.
+    - Fix FTBFS with ffmpeg 2.9 (Closes: #803844)
+    - Refresh patches.
+
+ -- Mateusz Łukasik <mati75 at linuxmint.pl>  Fri, 15 Apr 2016 12:03:01 +0200
+
 mplayer (2:1.2.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/0001_version.patch b/debian/patches/0001_version.patch
index bd7ecb8..303a056 100644
--- a/debian/patches/0001_version.patch
+++ b/debian/patches/0001_version.patch
@@ -10,5 +10,5 @@ Forwarded: not-needed
 --- a/VERSION
 +++ b/VERSION
 @@ -1 +1 @@
--1.2.1
-+1.2.1 (Debian), built with gcc
+-1.3.0
++1.3.0 (Debian), built with gcc
diff --git a/debian/patches/0002_mplayer_debug_printf.patch b/debian/patches/0002_mplayer_debug_printf.patch
index 90dd3e7..76cdb40 100644
--- a/debian/patches/0002_mplayer_debug_printf.patch
+++ b/debian/patches/0002_mplayer_debug_printf.patch
@@ -4,14 +4,15 @@ Forwarded: not-needed
 
 --- a/mplayer.c
 +++ b/mplayer.c
-@@ -841,6 +841,10 @@
+@@ -845,7 +845,10 @@ static void exit_sighandler(int x)
+         case SIGSEGV:
              mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_Exit_SIGSEGV_SIGFPE);
          default:
-             mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_Exit_SIGCRASH);
-+            mp_msg(MSGT_CPLAYER,MSGL_FATAL,
-+                   " [ This binary of MPlayer in Debian is currently compiled with\n"
-+                   "   '--enable-debug'; the debugging symbols are in the package\n"
-+                   "   'mplayer-dbg'.]\n");
+-            mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_Exit_SIGCRASH);
++            mp_msg(MSGT_CPLAYER, MSGL_FATAL,
++                  " [ This binary of MPlayer in Debian is currently compiled with\n"
++                  "   '--enable-debug'; the debugging symbols are in the package\n"
++                  "   'mplayer-dbg'.]\n");
  #ifdef CONFIG_CRASH_DEBUG
              if (crash_debug) {
                  int gdb_pid;
diff --git a/debian/patches/series b/debian/patches/series
index e255f04..ef209dd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 0001_version.patch
 0002_mplayer_debug_printf.patch
-0200_Hurd_PATH_MAX.patch
+#0200_Hurd_PATH_MAX.patch
 0201_PATH_MAX_HURD.patch

-- 
mplayer packaging