[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.2'
Imported Upstream version 0.7.2
Enable joystick support
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: a22cf127ed05a6a5e758bfa7787ce2b945530ff7
X-Git-Newrev: fa5a87f08c4b203ff2f72844f015110e503c599b

The following commit has been merged in the experimental-ffmpeg branch:
commit bbf538460d7f03e6143ab5de103b2ffbbdb34eb8
Merge: a22cf127ed05a6a5e758bfa7787ce2b945530ff7 8d6a516bc47ad2fb8c738fd0e17d39c22eb5c7c2
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Sat Dec 20 12:36:25 2014 +0100

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

diff --combined debian/changelog
index 9f6ab0b,2b680ab..b1695ae
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,23 @@@
++mpv (0.7.2-1+ffmpeg) UNRELEASED; urgency=medium
++
++  * Build against ffmpeg
++
++ -- Alessandro Ghedini <ghedo at debian.org>  Wed, 03 Dec 2014 10:57:40 +0100
++
+ mpv (0.7.2-1) unstable; urgency=medium
+ 
+   * New upstream release
+     - Enable ytdl_hook script by default (Closes: #772472)
+   * Enable joystick support (Closes: #773234)
+ 
+  -- 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
@@@ -17,36 -19,18 +31,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
@@@ -61,12 -45,6 +75,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

-- 
mpv packaging