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

[sramacher at users.alioth.debian.org]

Finalize changelog
Also apply patch for CVE-2017-9300
Refresh
Fix CVE-2017-10699
Finalize changelog
Build with hardening=+all
Bump ffmpeg version
Update to ffmpeg 2.8.12
Merge tag 'upstream/2.2.6'
New upstream version 2.2.6
Update changelog
Bump Standards-Version
Drop Build-Conflicts
Finalize changelog
New upstream release
Merge tag 'upstream/2.2.6'
New upstream version 2.2.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 5ec7716f0688eecc39765984acef02d18977d02f
X-Git-Newrev: 6f730fe8dafa761b54464c34ec77c28349c8fd1a

The following commit has been merged in the master branch:
commit e1cd119837b231c63836f540b5dfafffbfdc53ab
Merge: 82db579e982297fa8657f0ecbaac6ebec255c770 5ec7716f0688eecc39765984acef02d18977d02f
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Aug 5 16:17:18 2017 +0200

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

diff --combined debian/control
index 746ab2b,b9c6add..c47204c
--- a/debian/control
+++ b/debian/control
@@@ -131,9 -131,7 +131,7 @@@ Build-Depends: autopoint
                 libwebp-dev,
                 libxvidcore-dev,
                 yasm
- Build-Conflicts: libqt5x11extras5-dev (>= 5.8),
-                  qtbase5-dev (>= 5.8)
- Standards-Version: 3.9.8
+ Standards-Version: 4.0.0
  Homepage: https://www.videolan.org/vlc/
  Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/vlc.git
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/vlc.git
@@@ -148,7 -146,7 +146,7 @@@ Depends: vlc-bin (= ${binary:Version})
           vlc-l10n (= ${source:Version}),
           ${misc:Depends}
  Recommends: vlc-plugin-notify (= ${binary:Version}),
 -            vlc-plugin-samba (= ${binary:Version}),
 +            vlc-plugin-samba (= ${binary:Version}) [linux-any kfreebsd-any],
              vlc-plugin-skins2 (= ${binary:Version}),
              vlc-plugin-video-splitter (= ${binary:Version}),
              vlc-plugin-visualization (= ${binary:Version})

-- 
VLC media player packaging