[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.8.2'
Imported Upstream version 0.8.2
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: 1887329a0748ae458c5e6f435ae3cfa00d9e37dc
X-Git-Newrev: 469e3ec7f9d49481e9073b6c5aedd4a7bb1c436e

The following commit has been merged in the experimental-ffmpeg branch:
commit 5f2d5e09b543f5e28ce8b52245a67d3d7359ad23
Merge: 1887329a0748ae458c5e6f435ae3cfa00d9e37dc 374779d17ae0f8868c0c5e87299a4f8d57afa3d5
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Sun Mar 1 13:10:06 2015 +0100

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

diff --combined debian/changelog
index 3f70f4e,279764a..c34c6c1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ 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
@@@ -15,12 -15,6 +21,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
@@@ -28,12 -22,6 +34,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
@@@ -42,12 -30,6 +48,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
@@@ -61,36 -43,18 +67,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
@@@ -105,12 -69,6 +111,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