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

[ghedo at users.alioth.debian.org]

Finalize changelog
Re-enable CDDA support via libcdio
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: 3cc760d9c90d8bd0fbdfb40f6533417a2c924a78
X-Git-Newrev: 172133205d5f3a03592bf4f524fe02718ac4c206

The following commit has been merged in the experimental-ffmpeg branch:
commit c2ee0061d3f876f0d2a7801592a944389c226c0f
Merge: 3cc760d9c90d8bd0fbdfb40f6533417a2c924a78 5d94cc7cf1b0c7b4ab04a7470bb41658d517893b
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Tue Oct 28 16:04:00 2014 +0100

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

diff --combined debian/changelog
index 3d17f82,cc0cd87..47caefd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,15 +1,27 @@@
+ mpv (0.6.2-2) unstable; urgency=medium
+ 
+   * Re-enable CDDA support via libcdio (Closes: #766725)
+ 
+  -- Alessandro Ghedini <ghedo at debian.org>  Sat, 25 Oct 2014 15:16:57 +0200
+ 
 +mpv (0.6.2-1+ffmpeg) experimental; urgency=medium
 +
 +  * Build against ffmpeg
 +
 + -- Alessandro Ghedini <ghedo at debian.org>  Fri, 24 Oct 2014 21:21:26 +0200
 +
  mpv (0.6.2-1) unstable; urgency=medium
  
    * New upstream release
  
   -- Alessandro Ghedini <ghedo at debian.org>  Fri, 24 Oct 2014 21:16:49 +0200
  
 +mpv (0.6.1-1+ffmpeg) experimental; urgency=medium
 +
 +  * Build against ffmpeg
 +
 + -- Alessandro Ghedini <ghedo at debian.org>  Sun, 12 Oct 2014 14:48:59 +0200
 +
  mpv (0.6.1-1) unstable; urgency=medium
  
    * New upstream release
@@@ -30,12 -24,6 +36,12 @@@
  
   -- 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 6d695de,c02bbbb..703e73a
--- a/debian/control
+++ b/debian/control
@@@ -8,14 -8,15 +8,15 @@@ 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,
+  libcdio-paranoia-dev,
   libdvdnav-dev,
   libdvdread-dev,
   libegl1-mesa-dev [linux-any],
@@@ -31,7 -32,7 +32,7 @@@
   libpulse-dev,
   libquvi-dev (>= 0.4.1-2.1),
   libsdl2-dev,
 - libswscale-dev,
 + libswscale-ffmpeg-dev,
   libva-dev,
   libvdpau-dev,
   libwayland-dev [linux-any],

-- 
mpv packaging