Merge version 2.2.6-1~deb9u1+rpi1 and 2.2.6-2 to produce 2.2.6-2+rpi1

pseudomerge to tie together broken upstream history

MKV: support WebVTT subtitles embedded

Gbp-Pq: Name 0010-MKV-support-WebVTT-subtitles-embedded.patch

desktop file: more mimetypes from iana.org

Gbp-Pq: Name 0009-desktop-file-more-mimetypes-from-iana.org.patch

desktop file: We understand gvp and ram format

And add more comments about IANA registration

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
Gbp-Pq: Name 0008-desktop-file-We-understand-gvp-and-ram-format.patch

More mimetypes reordering, comments and additions

Gbp-Pq: Name 0007-More-mimetypes-reordering-comments-and-additions.patch

vlc.desktop mimetypes: reordering and comments

Gbp-Pq: Name 0006-vlc.desktop-mimetypes-reordering-and-comments.patch

Add MIME types imported from Totem

Some of them are commented, until we know more about them.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
Gbp-Pq: Name 0005-Add-MIME-types-imported-from-Totem.patch

Add MIME types listed in the VLC browser plugin

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
Gbp-Pq: Name 0004-Add-MIME-types-listed-in-the-VLC-browser-plugin.patch

Restructure desktop MIME type list with comments

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
Gbp-Pq: Name 0003-Restructure-desktop-MIME-type-list-with-comments.patch

Move MIME types in desktop file to separate file for easier maintenance

Move list of supported MIME types from vlc.desktop.in to vlc.desktop.mimetypes,
with one mime type per line with the option of hash comments to associate
information with the MIME types.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
Gbp-Pq: Name 0002-Move-MIME-types-in-desktop-file-to-separate-file-for.patch

Revert invalid translations

Bug: https://trac.videolan.org/vlc/ticket/16598
Bug-Debian: https://bugs.debian.org/814258

Gbp-Pq: Name 0001-Revert-invalid-translations.patch

vlc (2.2.6-2) unstable; urgency=medium

  * Upload to unstable.
  * Update to ffmpeg 2.8.12.
  * debian/control:
    - Remove Build-Conflicts.
    - Bump Standards-Version.
  * debian/rules: Build with hardening=+all.

[dgit import unpatched vlc 2.2.6-2]

Import vlc_2.2.6-2.debian.tar.xz

[dgit import tarball vlc 2.2.6-2 vlc_2.2.6-2.debian.tar.xz]

Merge vlc (2.2.6-1~deb9u1+rpi1) import into refs/heads/workingbranch

generated-mimetypes

Gbp-Pq: Name generated-mimetypes.patch

fix-translation

Gbp-Pq: Name fix-translation.patch

vlc (2.2.6-1~deb9u1+rpi1) stretch-staging; urgency=medium

  * Version build-dependency on libsndio-dev so libroar-dev will not satisfy it.

[dgit import unpatched vlc 2.2.6-1~deb9u1+rpi1]

Import vlc_2.2.6-1~deb9u1+rpi1.debian.tar.xz

[dgit import tarball vlc 2.2.6-1~deb9u1+rpi1 vlc_2.2.6-1~deb9u1+rpi1.debian.tar.xz]

generated-mimetypes

Gbp-Pq: Name generated-mimetypes.patch

Import vlc_2.2.6.orig.tar.xz

[dgit import orig vlc_2.2.6.orig.tar.xz]

Import vlc_2.2.6.orig-ffmpeg-2-8-11.tar.xz

[dgit import orig vlc_2.2.6.orig-ffmpeg-2-8-11.tar.xz]

fix-translation

Gbp-Pq: Name fix-translation.patch

vlc (2.2.6-1~deb9u1) unstable; urgency=high

  * New upstream release.
    - demux: Fix heap buffer overflows (CVE-2017-8312)
  * debian/*.maintscript: Bump all versions to 2.2.6-1~z. This is necessary to
    properly handle symlink to directory conversions once 2.2.6 is available
    in jessie.
  * debian/control: Bump Breaks + Replaces to 2.2.6-1~deb9u1 where necessary
    to ensure proper upgrades from jessie.

[dgit import unpatched vlc 2.2.6-1~deb9u1]

Import vlc_2.2.6-1~deb9u1.debian.tar.xz

[dgit import tarball vlc 2.2.6-1~deb9u1 vlc_2.2.6-1~deb9u1.debian.tar.xz]

Import vlc_2.2.6.orig.tar.xz

[dgit import orig vlc_2.2.6.orig.tar.xz]

Import vlc_2.2.6.orig-ffmpeg-2-8-12.tar.xz

[dgit import orig vlc_2.2.6.orig-ffmpeg-2-8-12.tar.xz]