[SCM] mpv/experimental-ffmpeg: Merge branch 'master' into experimental-ffmpeg
ghedo at users.alioth.debian.org
ghedo at users.alioth.debian.org
Mon Apr 27 12:47:11 UTC 2015
FInalize changelog
Update symbols file
Refresh patches
Cleanup rules file
Joystick support was dropped upstream
LIRC support was dropped upstream
libmpg123 support was dropped upstream
Bump required libass version
New upstream release
Merge tag 'upstream/0.9.0'
Imported Upstream version 0.9.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: 6944054ce558b96df35ae1dd420bc05ff35eeb81
X-Git-Newrev: 8fdb4e774b5a9d8dc7170ec0907cc1e2d1f253ab
The following commit has been merged in the experimental-ffmpeg branch:
commit 99ca223b5e538f9dc7c2fc9fc9c8116ec353e9d1
Merge: 6944054ce558b96df35ae1dd420bc05ff35eeb81 a43613f72b92ec3b7d8e569813c358f724bc9efb
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date: Mon Apr 27 10:36:07 2015 +0200
Merge branch 'master' into experimental-ffmpeg
Conflicts:
debian/changelog
debian/control
diff --combined debian/changelog
index 325b9f5,de49b5f..2cfc75a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,33 -1,27 +1,45 @@@
+ mpv (0.9.0-1) unstable; urgency=medium
+
+ * New upstream release
+ * Bump required libass version
+ * libmpg123 support was dropped upstream
+ * LIRC support was dropped upstream
+ * Joystick support was dropped upstream
+ * Refresh patches
+ * Update symbols file
+
+ -- 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
@@@ -39,12 -33,6 +51,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
@@@ -52,12 -40,6 +64,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
@@@ -66,12 -48,6 +78,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
@@@ -85,36 -61,18 +97,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
@@@ -129,12 -87,6 +141,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
diff --combined debian/control
index 05b84b8,f610bd8..f85a439
--- a/debian/control
+++ b/debian/control
@@@ -7,13 -7,13 +7,13 @@@ Uploaders: Alessandro Ghedini <ghedo at de
Build-Depends: debhelper (>= 9),
ladspa-sdk,
libasound2-dev [linux-any],
- libass-dev,
+ libass-dev (>= 0.12.1~),
- libavcodec-dev (>= 6:10~),
- libavdevice-dev (>= 6:10~),
- libavfilter-dev (>= 6:10~),
- libavformat-dev (>= 6:10~),
- libavresample-dev (>= 6:10~),
- libavutil-dev (>= 6:10~),
+ libavcodec-ffmpeg-dev,
+ libavdevice-ffmpeg-dev,
+ libavfilter-ffmpeg-dev,
+ libavformat-ffmpeg-dev,
+ libavresample-ffmpeg-dev,
+ libavutil-ffmpeg-dev,
libbluray-dev,
libbs2b-dev,
libcdio-paranoia-dev,
@@@ -26,12 -26,10 +26,10 @@@
libjack-dev,
libjpeg-dev,
liblcms2-dev (>= 2.6~),
- liblircclient-dev,
liblua5.2-dev,
- libmpg123-dev,
libpulse-dev,
libsdl2-dev,
- libswscale-dev,
+ libswscale-ffmpeg-dev,
libva-dev,
libvdpau-dev,
libwayland-dev [linux-any],
--
mpv packaging
More information about the pkg-multimedia-commits
mailing list