[SCM] mplayer/master: Refresh patches and drop the ones applied by upsteam.

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

The following commit has been merged in the master branch:
commit 296c062e440a9b4347d14a8ec8f379ff4c9a3cfd
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
Date:   Mon Oct 19 03:00:50 2015 -0400

    Refresh patches and drop the ones applied by upsteam.

diff --git a/debian/patches/0001_version.patch b/debian/patches/0001_version.patch
index 8786392..c167c94 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.1.1+svn37434
-+svn r37434 (Debian), built with gcc
+-1.2
++1.2 (Debian), built with gcc
diff --git a/debian/patches/0100_Fix_FTBFS_kfreebsd.patch b/debian/patches/0100_Fix_FTBFS_kfreebsd.patch
deleted file mode 100644
index 5ecc339..0000000
--- a/debian/patches/0100_Fix_FTBFS_kfreebsd.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix FTBFS in kfreebsd.
- Needed for:
- - u_char
- - u_long
- - u_short
-Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
-Forwarded: yes
-Last-Update: 2015-09-15
-
---- a/stream/tvi_bsdbt848.c
-+++ b/stream/tvi_bsdbt848.c
-@@ -27,6 +27,8 @@
-  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#define _BSD_SOURCE
-+
- #include "config.h"
- 
- #define RINGSIZE 8
diff --git a/debian/patches/series b/debian/patches/series
index a57a1ca..b44748d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 0001_version.patch
 0002_mplayer_debug_printf.patch
-0100_Fix_FTBFS_kfreebsd.patch
 50_Hurd_PATH_MAX.patch
 0101_PATH_MAX_HURD.patch

-- 
mplayer packaging