[SCM] mpv/experimental-ffmpeg: Merge branch 'master' into experimental-ffmpeg
ghedo at users.alioth.debian.org
ghedo at users.alioth.debian.org
Sat May 30 13:15:28 UTC 2015
Finalize changelog
New upstream release
Merge tag 'upstream/0.9.2'
Imported Upstream version 0.9.2
Bump versioned Build-Depends on libav
Stop recording the build date
Add xdg-utils to Recommends
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: 6e67a557c185514473111cc6d7480c75b1417792
X-Git-Newrev: 7f58d8e202085f595789c4c9c3f713407b5e68a7
The following commit has been merged in the experimental-ffmpeg branch:
commit e89b434276da7d4a2934fe2b5c91fe0842f45207
Merge: 6e67a557c185514473111cc6d7480c75b1417792 e2c2232bd6cc1322e1be85937c68f54ebf64e7c6
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date: Sat May 30 15:09:58 2015 +0200
Merge branch 'master' into experimental-ffmpeg
Conflicts:
debian/changelog
debian/control
diff --combined debian/changelog
index 1ac70a2,91632ca..0e85a6e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,22 @@@
+ mpv (0.9.2-1) unstable; urgency=medium
+
+ [ Alessandro Ghedini ]
+ * New upstream release
+ * Add xdg-utils to Recommends
+ xdg-screensaver is used to disable the screen saver.
+ * Bump versioned Build-Depends on libav
+
+ [ Jérémy Bobbio ]
+ * Stop recording the build date (Closes: #784267)
+
+ -- Alessandro Ghedini <ghedo at debian.org> Sat, 30 May 2015 15:05:54 +0200
+
+mpv (0.9.1-1+ffmpeg) experimental; urgency=medium
+
+ * Build against ffmpeg
+
+ -- Alessandro Ghedini <ghedo at debian.org> Sun, 03 May 2015 12:55:20 +0200
+
mpv (0.9.1-1) unstable; urgency=medium
* New upstream release
@@@ -11,12 -18,6 +24,12 @@@
-- 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
@@@ -29,36 -30,18 +42,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
@@@ -70,12 -53,6 +83,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
@@@ -83,12 -60,6 +96,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
@@@ -97,12 -68,6 +110,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
@@@ -116,36 -81,18 +129,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
@@@ -160,12 -107,6 +173,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 f85a439,a8889f0..a354f36
--- a/debian/control
+++ b/debian/control
@@@ -8,12 -8,12 +8,12 @@@ Build-Depends: debhelper (>= 9)
ladspa-sdk,
libasound2-dev [linux-any],
libass-dev (>= 0.12.1~),
- libavcodec-dev (>= 6:11~),
- libavdevice-dev (>= 6:11~),
- libavfilter-dev (>= 6:11~),
- libavformat-dev (>= 6:11~),
- libavresample-dev (>= 6:11~),
- 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,
@@@ -29,7 -29,7 +29,7 @@@
liblua5.2-dev,
libpulse-dev,
libsdl2-dev,
- libswscale-dev,
+ libswscale-ffmpeg-dev,
libva-dev,
libvdpau-dev,
libwayland-dev [linux-any],
@@@ -50,7 -50,7 +50,7 @@@ Vcs-Browser: http://anonscm.debian.org/
Package: mpv
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
- Recommends: youtube-dl (>= 2014.11.26)
+ Recommends: xdg-utils, youtube-dl (>= 2014.11.26)
Multi-Arch: foreign
Description: video player based on MPlayer/mplayer2
mpv is a movie player based on MPlayer and mplayer2. It supports a wide
--
mpv packaging
More information about the pkg-multimedia-commits
mailing list