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

[ghedo at users.alioth.debian.org]

Finalize changelog
New upstream release
Merge tag 'upstream/0.7.3'
Imported Upstream version 0.7.3
Bump version of youtube-dl in Recommends
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: fa5a87f08c4b203ff2f72844f015110e503c599b
X-Git-Newrev: 9ca2ff6b97e4721f6ec9696ee0b7de9cd0bd6e12

The following commit has been merged in the experimental-ffmpeg branch:
commit 2065a65bbf9081a87e730647a3ae8022143e1141
Merge: fa5a87f08c4b203ff2f72844f015110e503c599b 7c9fd73157aaceaeb8cc0555e885a6b473975326
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Thu Jan 29 09:59:53 2015 +0100

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

diff --combined debian/changelog
index e1f89e0,304c1d1..c493bb4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+ mpv (0.7.3-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * Bump version of youtube-dl in Recommends
+ 
+  -- Alessandro Ghedini <ghedo at debian.org>  Wed, 28 Jan 2015 17:18:43 +0100
+ 
 +mpv (0.7.2-1+ffmpeg) experimental; urgency=medium
 +
 +  * Build against ffmpeg
 +
 + -- Alessandro Ghedini <ghedo at debian.org>  Sat, 20 Dec 2014 12:40:25 +0100
 +
  mpv (0.7.2-1) unstable; urgency=medium
  
    * New upstream release
@@@ -12,12 -13,6 +19,12 @@@
  
   -- Alessandro Ghedini <ghedo at debian.org>  Sat, 20 Dec 2014 12:31:39 +0100
  
 +mpv (0.7.1-1+ffmpeg) experimental; urgency=medium
 +
 +  * Build against ffmpeg
 +
 + -- Alessandro Ghedini <ghedo at debian.org>  Wed, 03 Dec 2014 10:57:40 +0100
 +
  mpv (0.7.1-1) unstable; urgency=medium
  
    * New upstream release
@@@ -31,36 -26,18 +38,36 @@@
  
   -- Alessandro Ghedini <ghedo at debian.org>  Wed, 03 Dec 2014 10:43:28 +0100
  
 +mpv (0.6.2-2+ffmpeg) experimental; urgency=medium
 +
 +  * Build against ffmpeg
 +
 + -- Alessandro Ghedini <ghedo at debian.org>  Tue, 28 Oct 2014 16:04:11 +0100
 +
  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
@@@ -75,12 -52,6 +82,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 1c0151b,0d90d7d..05b84b8
--- 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,
   libcdio-paranoia-dev,
@@@ -31,7 -31,7 +31,7 @@@
   libmpg123-dev,
   libpulse-dev,
   libsdl2-dev,
 - libswscale-dev,
 + libswscale-ffmpeg-dev,
   libva-dev,
   libvdpau-dev,
   libwayland-dev [linux-any],
@@@ -52,7 -52,7 +52,7 @@@ Vcs-Browser: http://anonscm.debian.org/
  Package: mpv
  Architecture: any
  Depends: ${shlibs:Depends}, ${misc:Depends}
- Recommends: youtube-dl (>= 2014.11.09)
+ Recommends: youtube-dl (>= 2014.11.26)
  Multi-Arch: foreign
  Description: video player based on MPlayer/mplayer2
   mpv is a movie player based on MPlayer and mplayer2. It supports a wide
@@@ -86,7 -86,7 +86,7 @@@ Package: libmpv
  Section: libs
  Architecture: any
  Depends: ${shlibs:Depends}, ${misc:Depends}
- Recommends: youtube-dl (>= 2014.11.09)
+ Recommends: youtube-dl (>= 2014.11.26)
  Pre-Depends: ${misc:Pre-Depends}
  Multi-Arch: same
  Description: video player based on MPlayer/mplayer2 (client library)

-- 
mpv packaging