[SCM] vlc/experimental: Merge branch 'master' into experimental

[sramacher at users.alioth.debian.org]

Update copyright years
Finalize changelog
Update changelog
Update versions in maintscript
Refreshed
Remove patches from upstream
New upstream release
Merge tag 'upstream/2.2.5'
New upstream version 2.2.5
Finalize changelog
Update to ffmpeg 2.8.11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/experimental
X-Git-Reftype: branch
X-Git-Oldrev: d37ff0f02a6da1b947c334f4703b21322eff239c
X-Git-Newrev: b4d805250529d1ff085f20c3243b699c58c6e2e8

The following commit has been merged in the experimental branch:
commit 5ad90a8039a15b77add10a349f64619acc9f903f
Merge: d37ff0f02a6da1b947c334f4703b21322eff239c 97d9dc2eca1c0f42c879fde19472598e70b8919b
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Thu Mar 23 16:22:54 2017 +0100

    Merge branch 'master' into experimental

diff --combined debian/changelog
index eb6d244,4b7488b..728fa32
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,15 +1,22 @@@
- vlc (2.2.4-15) UNRELEASED; urgency=medium
++vlc (2.2.5-2) UNRELEASED; urgency=medium
 +
 +  * debian/{control,rules,vlc-plugin-video-output.install}: Disable OpenGL
 +    ES 1 support, mesa has dropped it. (Closes: #855117)
 +
 + -- Mateusz Łukasik <mati75 at linuxmint.pl>  Tue, 14 Feb 2017 20:03:56 +0100
 +
+ vlc (2.2.5-1) unstable; urgency=medium
+ 
+   * New upstream releases. (Closes: #850529)
+   * debian/patches:
+     - fix-translation.patch: Refreshed.
+     - Removed patches taken from upstream included in 2.2.5.
+   * debian/*.maintscript: Bump all versions to 2.2.5-1~z. This is necessary to
+     properly handle symlink to directory conversions once 2.2.5 is available
+     in stretch.
+ 
+  -- Sebastian Ramacher <sramacher at debian.org>  Sun, 19 Mar 2017 21:50:23 +0100
+ 
  vlc (2.2.4-14) unstable; urgency=medium
  
    [ Mateusz Łukasik ]

-- 
VLC media player packaging