Merge tag 'upstream/2015.11.27.1'

[youtubedl] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 6696aec511e5af8043f77ed3e29b4ed408651ffa..46628e6079c9b5b4588d29fcbd728238260bfe2c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,15 @@
-youtube-dl (2015.07.21-1~1.gbp82d01c) UNRELEASED; urgency=medium
-
-  ** SNAPSHOT build @82d01c1a88911e89e3e7ed4518d54c028f9e4792 **
+youtube-dl (2015.11.10-1) unstable; urgency=medium
 
   * Imported Upstream version 2015.07.21 (Closes: #735012, #736151)
-  * debian/control: Drop really ancient Recommends to have ffprobe.
-  * debian/control: Prefer ffmpeg to libav-tools in Recommends.
-  * debian/control: Prefer mplayer to mplayer2 in Recommends.
+  * Imported Upstream version 2015.11.10 (Closes: #796035, #804724, #801491).
+  * debian/control:
+    + Drop really ancient Recommends to have ffprobe.
+    + Prefer ffmpeg to libav-tools in Recommends.
+    + Prefer mplayer to mplayer2 in Recommends. (Closes: #796227).
+      Note: I'm still leaving mplayer2 to ease the life of backporters.
+    + Prefer mpv to mplayer in Recommends.
 
- -- Rogério Brito <rbrito@ime.usp.br>  Wed, 22 Jul 2015 01:05:38 -0300
+ -- Rogério Brito <rbrito@ime.usp.br>  Wed, 11 Nov 2015 12:23:08 -0200
 
 youtube-dl (2015.06.04.1-1) unstable; urgency=medium