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

[ghedo at users.alioth.debian.org]

Finalize changelog
Update 02_fix-config-path.patch
New upstream release
Merge tag 'upstream/0.9.1'
Imported Upstream version 0.9.1
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: 8fdb4e774b5a9d8dc7170ec0907cc1e2d1f253ab
X-Git-Newrev: 6e67a557c185514473111cc6d7480c75b1417792

The following commit has been merged in the experimental-ffmpeg branch:
commit 0e2f7558dd4aa8b113d93b2f11c35edced5a50de
Merge: 8fdb4e774b5a9d8dc7170ec0907cc1e2d1f253ab 5ec0e1a2fa6cc7453a00bcbba956611aa74f9640
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Sun May 3 12:54:43 2015 +0200

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

diff --combined debian/changelog
index c7e2176,c02b673..87a0974
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+ mpv (0.9.1-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * Update 02_fix-config-path.patch
+ 
+  -- Alessandro Ghedini <ghedo at debian.org>  Sun, 03 May 2015 12:51:14 +0200
+ 
 +mpv (0.9.0-1+ffmpeg) experimental; urgency=medium
 +
 +  * Build against ffmpeg
 +
 + -- Alessandro Ghedini <ghedo at debian.org>  Mon, 27 Apr 2015 10:36:14 +0200
 +
  mpv (0.9.0-1) unstable; urgency=medium
  
    * New upstream release
@@@ -16,36 -17,18 +23,36 @@@
  
   -- Alessandro Ghedini <ghedo at debian.org>  Mon, 27 Apr 2015 10:24:25 +0200
  
 +mpv (0.8.3-1+ffmpeg) experimental; urgency=medium
 +
 +  * Build against ffmpeg
 +
 + -- Alessandro Ghedini <ghedo at debian.org>  Tue, 17 Mar 2015 15:09:51 +0100
 +
  mpv (0.8.3-1) unstable; urgency=medium
  
    * New upstream release
  
   -- Alessandro Ghedini <ghedo at debian.org>  Tue, 17 Mar 2015 14:53:12 +0100
  
 +mpv (0.8.2-1+ffmpeg) experimental; urgency=medium
 +
 +  * Build against ffmpeg
 +
 + -- Alessandro Ghedini <ghedo at debian.org>  Sun, 01 Mar 2015 13:13:48 +0100
 +
  mpv (0.8.2-1) unstable; urgency=medium
  
    * New upstream release
  
   -- Alessandro Ghedini <ghedo at debian.org>  Sun, 01 Mar 2015 13:05:37 +0100
  
 +mpv (0.8.0-1+ffmpeg) experimental; urgency=medium
 +
 +  * Build against ffmpeg
 +
 + -- Alessandro Ghedini <ghedo at debian.org>  Wed, 18 Feb 2015 15:19:25 +0100
 +
  mpv (0.8.0-1) unstable; urgency=medium
  
    * New upstream release
@@@ -57,12 -40,6 +64,12 @@@
  
   -- Alessandro Ghedini <ghedo at debian.org>  Wed, 18 Feb 2015 15:12:55 +0100
  
 +mpv (0.7.3-1+ffmpeg) experimental; urgency=medium
 +
 +  * Build against ffmpeg
 +
 + -- Alessandro Ghedini <ghedo at debian.org>  Thu, 29 Jan 2015 10:00:08 +0100
 +
  mpv (0.7.3-1) unstable; urgency=medium
  
    * New upstream release
@@@ -70,12 -47,6 +77,12 @@@
  
   -- 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
@@@ -84,12 -55,6 +91,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
@@@ -103,36 -68,18 +110,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
@@@ -147,12 -94,6 +154,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