[SCM] vlc/experimental: Merge branch 'master' into experimental

[sramacher at users.alioth.debian.org]

Finalize changelog
Fix bug number
Add Closes for some bugs
New upstream release
Merge tag 'upstream/2.2.0_rc2'
Imported Upstream version 2.2.0~rc2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/experimental
X-Git-Reftype: branch
X-Git-Oldrev: af0feb803a1071f519eabb920c855733fbdb543a
X-Git-Newrev: de1b13f8ee9883e65a850f05a69f1edd5d3b3150

The following commit has been merged in the experimental branch:
commit de1b13f8ee9883e65a850f05a69f1edd5d3b3150
Merge: 2ce83c70fe76929694d7f7720f40ada0b32d7553 c10616920110d5648bfa766d3c633d05f37dacc5
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Dec 21 00:48:36 2014 +0100

    Merge branch 'master' into experimental
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 04170d7,f85be02..88be8c4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,11 +1,22 @@@
- vlc (2.2.0~rc1-1+exp1) unstable; urgency=medium
++vlc (2.2.0~rc2-1+exp1) UNRELEASED; urgency=medium
 +
 +  * Regenerate plugin cache using triggers. (Closes: #755154) (LP: #1328466)
 +    - debian/vlc-nox.postinst: Run vlc-cache-gen.
 +    - debian/vlc-nox.postrm: Remove generated cache.
 +    - debian/rules: remove plugins.dat generated during the build.
 +    - debian/vlc-nox.install.in: Do not install pre-generated plugins.dat.
 +  * debian/rules: Build with -Wl,--as-needed.
 +
 + -- Sebastian Ramacher <sramacher at debian.org>  Sun, 16 Nov 2014 02:52:58 +0100
 +
+ vlc (2.2.0~rc2-1) unstable; urgency=medium
+ 
+   * New upstream release.
+     - Fix segfault in ASCII art plugin. (Closes: #768873)
+     - Fix selection of left/right channel in stereo mode. (Closes: #765830)
+ 
+  -- Sebastian Ramacher <sramacher at debian.org>  Sun, 23 Nov 2014 13:14:07 +0100
+ 
  vlc (2.2.0~rc1-1) unstable; urgency=low
  
    * New upstream release.

-- 
VLC media player packaging