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

[sramacher at users.alioth.debian.org]

Remove Clément Stenac from Uploaders
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0e36ba4531066a9480df17f63ad91d5bc41cb387
X-Git-Newrev: 328ff7556a3e94836d1a0fe6738a74604cea6d1f

The following commit has been merged in the master branch:
commit 328ff7556a3e94836d1a0fe6738a74604cea6d1f
Merge: 9b12f5a8de5f77d6cc7a30503f12f779e1491372 0e36ba4531066a9480df17f63ad91d5bc41cb387
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Jun 11 11:54:13 2016 +0200

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

diff --combined debian/changelog
index 533d23c,4c5143d..71678d5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,20 @@@
 -vlc (2.2.4-2) UNRELEASED; urgency=medium
++vlc (2.2.4-3) UNRELEASED; urgency=medium
+ 
+   * debian/control:
+     - Remove Clément Stenac from Uploaders. Thanks for your job!
+ 
+  -- Mateusz Łukasik <mati75 at linuxmint.pl>  Sun, 05 Jun 2016 19:50:30 +0200
+ 
 +vlc (2.2.4-2) unstable; urgency=medium
 +
 +  * Build ffmpeg without libopenjpeg (Closes: #826827)
 +    - debian/control: Remove libopenjpeg-dev from B-D.
 +    - debian/rules: Build ffmpeg with --disable-libopenjpeg.
 +  * debian/rules: Revert workaround for zsh completion build failures on
 +    powerpc. The underlying issue seems to be fixed.
 +
 + -- Sebastian Ramacher <sramacher at debian.org>  Sat, 11 Jun 2016 11:44:37 +0200
 +
  vlc (2.2.4-1) unstable; urgency=medium
  
    * New upstream release.
diff --combined debian/control
index c74a938,360ba9e..5dc9199
--- a/debian/control
+++ b/debian/control
@@@ -2,8 -2,7 +2,7 @@@ Source: vl
  Section: video
  Priority: optional
  Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
- Uploaders: Clément Stenac <zorglub at debian.org>,
-            Loic Minier <lool at dooz.org>,
+ Uploaders: Loic Minier <lool at dooz.org>,
             Christophe Mutricy <xtophe at videolan.org>,
             Mohammed Adnène Trojette <adn+deb at diwi.org>,
             Reinhard Tartler <siretart at tauware.de>,
@@@ -127,6 -126,7 +126,6 @@@ Build-Depends: autopoint
                 libgsm1-dev,
                 liblzma-dev,
                 libmp3lame-dev,
 -               libopenjpeg-dev,
                 librtmp-dev,
                 libsnappy-dev,
                 libsoxr-dev,

-- 
VLC media player packaging