[SCM] vlc/master: Finalize changelog

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 39c37ae162fce74c41726a5363494332d15c58b0
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Fri Aug 21 08:23:40 2015 +0200

    Finalize changelog

diff --git a/debian/changelog b/debian/changelog
index e540bb8..6721565 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vlc (2.2.1-3) unstable; urgency=high
+
+  * debian/patches/demux-mp4-correctly-match-release-function.patch: Apply
+    upstream patch to fix CVE-2015-5949. (Closes: #796255)
+
+ -- Sebastian Ramacher <sramacher at debian.org>  Fri, 21 Aug 2015 08:22:53 +0200
+
 vlc (2.2.1-2) unstable; urgency=medium
 
   * debian/rules:
@@ -7,7 +14,7 @@ vlc (2.2.1-2) unstable; urgency=medium
   * debian/control:
     - Switch Build-Depends from Qt4 to Qt5.
     - Remove obsolete Breaks+Replaces.
-    - Drop libdvbpsi5-dev from Build-Depenss.
+    - Drop libdvbpsi5-dev from Build-Depends.
     - Add libcairo2-dev to Build-Depends for svgdec plugin.
   * debian/vlc.install.in: Install svgdec plugin.
 

-- 
VLC media player packaging