[SCM] vlc/master: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-multimedia/vlc

[sramacher at users.alioth.debian.org]

Finalize changelog
Fix remaining versions
Update changelog
Bump versions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4ab2b5cbe7a245cccdd6e5837cf7422aafb8268d
X-Git-Newrev: 6c72eab055f918d9b0f03a172c9c6059f770c748

The following commit has been merged in the master branch:
commit 6c72eab055f918d9b0f03a172c9c6059f770c748
Merge: c4998c0ffc1ffb4ca29aa130770d5b382d3ab953 4ab2b5cbe7a245cccdd6e5837cf7422aafb8268d
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Oct 12 19:36:06 2016 +0200

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-multimedia/vlc

diff --combined debian/changelog
index cd3b3c0,c7c39f4..67e6f4b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
- vlc (2.2.4-6) UNRELEASED; urgency=medium
++vlc (2.2.4-7) UNRELEASED; urgency=medium
 +
 +  * 
 +
 + -- Sebastian Ramacher <sramacher at debian.org>  Wed, 12 Oct 2016 01:31:14 +0200
 +
+ vlc (2.2.4-6) unstable; urgency=medium
+ 
+   * debian/*.maintscript: Bump all versions to fix symlink-to-directory
+     conversions. (Closes: #814646)
+ 
+  -- Sebastian Ramacher <sramacher at debian.org>  Fri, 23 Sep 2016 21:08:42 +0200
+ 
  vlc (2.2.4-5) unstable; urgency=medium
  
    * Update ffmpeg to 2.8.8.

-- 
VLC media player packaging