[SCM] mpv/experimental-ffmpeg: Merge branch 'master' into experimental-ffmpeg

[ghedo at users.alioth.debian.org]

Finalize changelog
Don't install input configuration files as examples (they are now installed by the upstream build system as normal documentation)
Bump Standards-Version to 3.9.6 (no changes needed)
New upstream release
Merge tag 'upstream/0.6.1'
Imported Upstream version 0.6.1
Update changelog
Enable support for xrandr
Remove unused build deps
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/experimental-ffmpeg
X-Git-Reftype: branch
X-Git-Oldrev: 74c052ea3ca4c22847109ccd043b9d3737969090
X-Git-Newrev: a7132d728dbc7e4000732e392e6c80c7239780e2

The following commit has been merged in the experimental-ffmpeg branch:
commit 25eca3aa194fd4a5827e1eb721bedd1ce91b458a
Merge: 74c052ea3ca4c22847109ccd043b9d3737969090 40dfff488d1539fbcdd05d80ba681e21632f0f28
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Sun Oct 12 14:48:41 2014 +0200

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

diff --combined debian/changelog
index a07fa14,d552fcd..6e958bd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,17 +1,23 @@@
+ mpv (0.6.1-1) unstable; urgency=medium
+ 
+   * New upstream release
+     - Fix the autodetection of the input format in the vf_stereo3d filter
+       (Closes: #763904)
+     - Don't create 0x0 windows on X11 (Closes: #764419)
+   * Remove unused build deps
+   * Enable support for xrandr
+   * Bump Standards-Version to 3.9.6 (no changes needed)
+   * Don't install input configuration files as examples (they are now installed
+     by the upstream build system as normal documentation)
+ 
+  -- Alessandro Ghedini <ghedo at debian.org>  Sun, 12 Oct 2014 14:39:57 +0200
+ 
 +mpv (0.6.0-1+ffmpeg) experimental; urgency=medium
 +
 +  * Build against ffmpeg (Closes: #763736)
 +
 + -- Alessandro Ghedini <ghedo at debian.org>  Sat, 04 Oct 2014 17:42:04 +0200
 +
  mpv (0.6.0-1) unstable; urgency=medium
  
    * New upstream release
diff --combined debian/control
index fb607f9,5697b07..6d695de
--- a/debian/control
+++ b/debian/control
@@@ -8,12 -8,12 +8,12 @@@ Build-Depends: debhelper (>= 9)
   ladspa-sdk,
   libasound2-dev [linux-any],
   libass-dev,
 - libavcodec-dev (>= 6:10~),
 - libavdevice-dev (>= 6:10~),
 - libavfilter-dev (>= 6:10~),
 - libavformat-dev (>= 6:10~),
 - libavresample-dev (>= 6:10~),
 - libavutil-dev (>= 6:10~),
 + libavcodec-ffmpeg-dev,
 + libavdevice-ffmpeg-dev,
 + libavfilter-ffmpeg-dev,
 + libavformat-ffmpeg-dev,
 + libavresample-ffmpeg-dev,
 + libavutil-ffmpeg-dev,
   libbluray-dev,
   libbs2b-dev,
   libdvdnav-dev,
@@@ -28,25 -28,23 +28,23 @@@
   liblircclient-dev,
   liblua5.2-dev,
   libmpg123-dev,
-  libncurses5-dev,
-  libncursesw5-dev,
   libpulse-dev,
   libquvi-dev (>= 0.4.1-2.1),
   libsdl2-dev,
 - libswscale-dev,
 + libswscale-ffmpeg-dev,
   libva-dev,
   libvdpau-dev,
   libwayland-dev [linux-any],
   libx11-dev,
   libxinerama-dev,
   libxkbcommon-dev [linux-any],
+  libxrandr-dev,
   libxss-dev,
   libxv-dev,
   pkg-config,
   python,
   python-docutils,
-  yasm
- Standards-Version: 3.9.5
+ Standards-Version: 3.9.6
  Homepage: http://mpv.io/
  Vcs-Git: git://anonscm.debian.org/pkg-multimedia/mpv.git
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/mpv.git

-- 
mpv packaging