[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.3'
Imported Upstream version 0.8.3
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: 469e3ec7f9d49481e9073b6c5aedd4a7bb1c436e
X-Git-Newrev: 6944054ce558b96df35ae1dd420bc05ff35eeb81

The following commit has been merged in the experimental-ffmpeg branch:
commit cd130fa9685f34b1a421d6022b284f5017154999
Merge: 469e3ec7f9d49481e9073b6c5aedd4a7bb1c436e 4478dff32c0e4642bf4b108de384c658e5d080a7
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Tue Mar 17 15:09:29 2015 +0100

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

diff --combined debian/changelog
index 665324b,dcfab88..7186373
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,15 +1,27 @@@
+ 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
@@@ -27,12 -21,6 +33,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
@@@ -40,12 -28,6 +46,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
@@@ -54,12 -36,6 +60,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
@@@ -73,36 -49,18 +79,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
@@@ -117,12 -75,6 +123,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