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

[ghedo at users.alioth.debian.org]

Finalize changelog
Only enable joystick support on linux
Update symbols file
Refresh patches
Don't run clean if no waf is present
Update to waf 1.8.4
New upstream release
Merge tag 'upstream/0.8.0'
Imported Upstream version 0.8.0
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: 9ca2ff6b97e4721f6ec9696ee0b7de9cd0bd6e12
X-Git-Newrev: 1887329a0748ae458c5e6f435ae3cfa00d9e37dc

The following commit has been merged in the experimental-ffmpeg branch:
commit cf74558a8e4a6cfa75554dcda6f180c5a5646bd4
Merge: 9ca2ff6b97e4721f6ec9696ee0b7de9cd0bd6e12 2c4f5b22f94762c216ebe1034c3e300771d84578
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Wed Feb 18 15:19:05 2015 +0100

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

diff --combined debian/changelog
index cc696e1,be505b2..a24cbdf
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,14 +1,20 @@@
+ mpv (0.8.0-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * Update to waf 1.8.4
+   * Don't run clean if no waf is present
+   * Refresh patches
+   * Update symbols file
+   * Only enable joystick support on linux
+ 
+  -- 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
@@@ -11,12 -16,6 +22,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
@@@ -25,12 -24,6 +36,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
@@@ -44,36 -37,18 +55,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
@@@ -88,12 -63,6 +99,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