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

[sramacher at users.alioth.debian.org]

Finalize changelog
Remove cruft
Merge branch 'master' of ssh+git://git.debian.org/git/pkg-multimedia/vlc
fix typo
Add a NEWS entry
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 9b7d9af2e458627b333464cb27ba68403824b5a0
X-Git-Newrev: b312be3b9993c14a801a064da63183f02f7917a6

The following commit has been merged in the master branch:
commit b51f738738034bf7c1320166862d451a83f53cf2
Merge: 6f0c83d4eb1c665ee12fadf2331c23d89e8427dd 9b7d9af2e458627b333464cb27ba68403824b5a0
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Oct 19 19:05:27 2016 +0200

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

diff --combined debian/control
index ef65167,7f517b0..cdb1947
--- a/debian/control
+++ b/debian/control
@@@ -151,6 -151,7 +151,6 @@@ Depends: vlc-plugin-base (= ${binary:Ve
  Recommends: vlc-plugin-notify (= ${binary:Version}),
              vlc-plugin-samba (= ${binary:Version}),
              vlc-plugin-skins2 (= ${binary:Version}),
 -            vlc-plugin-access-extra (= ${binary:Version}),
              vlc-plugin-video-splitter (= ${binary:Version}),
              vlc-plugin-visualization (= ${binary:Version})
  Provides: mp3-decoder
@@@ -166,17 -167,9 +166,17 @@@ Description: multimedia player and stre
   VLC has support for on-the-fly transcoding of audio and video formats, either
   for broadcasting purposes or for movie format transformations. Support for
   most output methods is provided by this package, but features can be added by
 - installing additional plugins (vlc-plugin-fluidsynth, vlc-plugin-jack,
 - vlc-plugin-notify, vlc-plugin-samba, vlc-plugin-sdl, vlc-plugin-svg,
 - vlc-plugin-zvbi).
 + installing additional plugins:
 +  * vlc-plugin-fluidsynth
 +  * vlc-plugin-jack
 +  * vlc-plugin-notify
 +  * vlc-plugin-samba
 +  * vlc-plugin-sdl
 +  * vlc-plugin-svg
 +  * vlc-plugin-zvbi
 +  * vlc-plugin-access-extra
 +  * vlc-plugin-video-splitter
 +  * vlc-plugin-visualization
  
  Package: libvlc-dev
  Section: libdevel
@@@ -314,8 -307,8 +314,8 @@@ Multi-Arch: sam
  Depends: ${misc:Depends},
           ${shlibs:Depends}
  Enhances: vlc
- Breaks: vlc-plugin-rdp (<< 2.2.4-6+rpi1~)
- Replaces: vlc-plugin-rdp (<< 2.2.4-6+rpi1~)
+ Breaks: vlc-plugin-rdp (<< 2.2.4-7~)
+ Replaces: vlc-plugin-rdp (<< 2.2.4-7~)
  Description: multimedia player and streamer (extra access plugins)
   VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
   DivX, MOV, WMV, QuickTime, WebM, FLAC, MP3, Ogg/Vorbis files, DVDs, VCDs,

-- 
VLC media player packaging