[SCM] mpv/master: New upstream release. (Closes: #815692)

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

The following commit has been merged in the master branch:
commit 4ff5cb606a6da9f0a95e6268e473255b96dcc757
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Mon Mar 14 20:29:28 2016 +0100

    New upstream release. (Closes: #815692)

diff --git a/debian/changelog b/debian/changelog
index 4664a69..6a02bd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mpv (0.16.0-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release. (Closes: #815692)
+  * debian/patches:
+    - Refresh 01_desktop-path.patch.
+    - Remove 05_fix-typo.patch -- included upstream.
+
+ -- Mateusz Łukasik <mati75 at linuxmint.pl>  Sun, 13 Mar 2016 23:32:02 +0100
+
 mpv (0.14.0-1) unstable; urgency=medium
 
   * New upstream release (Closes: #806183)
diff --git a/debian/patches/01_desktop-path.patch b/debian/patches/01_desktop-path.patch
index e4aa0bb..fe95c88 100644
--- a/debian/patches/01_desktop-path.patch
+++ b/debian/patches/01_desktop-path.patch
@@ -3,11 +3,11 @@ Origin: vendor
 Debian-Bug: http://bugs.debian.org/728149
 Forwarded: not-needed
 Author: Alessandro Ghedini <ghedo at debian.org>
-Last-Update: 2015-04-27
+Last-Update: 2016-03-13
 
 --- a/etc/mpv.desktop
 +++ b/etc/mpv.desktop
-@@ -23,8 +23,8 @@
+@@ -23,8 +23,8 @@ Comment[ru]=Воспроизвести Ñ
  Comment[zh-CN]=播放电影和歌曲
  Comment[zh-TW]=播放電影和歌曲
  Icon=mpv
@@ -17,4 +17,4 @@ Last-Update: 2015-04-27
 +Exec=/usr/bin/mpv --profile=pseudo-gui -- %U
  Terminal=false
  Categories=AudioVideo;Audio;Video;Player;TV;
- MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/ogg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/ogg;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;video/webm;audio/x-flac;audio/x-vorbis+ogg;video/x-ogm+ogg;audio/x-shorten;audio/x-ape;audio/x-wavpack;audio/x-tta;audio/AMR;audio/ac3;video/mp2t;audio/flac;
+ MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/ogg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/ogg;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;video/webm;audio/x-flac;audio/x-vorbis+ogg;video/x-ogm+ogg;audio/x-shorten;audio/x-ape;audio/x-wavpack;audio/x-tta;audio/AMR;audio/ac3;video/mp2t;audio/flac;audio/mp4;
diff --git a/debian/patches/05_fix-typo.patch b/debian/patches/05_fix-typo.patch
deleted file mode 100644
index 8f59461..0000000
--- a/debian/patches/05_fix-typo.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix typo
-Origin: vendor
-Author: Alessandro Ghedini <ghedo at debian.org>
-Last-Update: 2015-12-27
-Applied-Upstream: commit:https://github.com/mpv-player/mpv/commit/1f62f38106e9de88b277e5e8df359d31f544ed08
-
---- a/video/out/wayland_common.c
-+++ b/video/out/wayland_common.c
-@@ -1135,7 +1135,7 @@
- 
-         if (poll(&fd, 1, 0) > 0) {
-             if (fd.revents & POLLERR) {
--                MP_ERR(wl, "error occured on the drag&drop fd\n");
-+                MP_ERR(wl, "error occurred on the drag&drop fd\n");
-                 close(wl->input.dnd_fd);
-                 wl->input.dnd_fd = -1;
-             }
diff --git a/debian/patches/series b/debian/patches/series
index 97e9f36..fbbd070 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
 02_fix-config-path.patch
 03_waf.patch
 04_waf-pie.patch
-05_fix-typo.patch

-- 
mpv packaging