Merge tag 'upstream/2015.11.10'

[youtubedl] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 0039a8549b5d3b3a899db180927d42ec0cd55d44..6696aec511e5af8043f77ed3e29b4ed408651ffa 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,30 @@
-youtube-dl (2015.06.04.1-1~1.gbp139d14) UNRELEASED; urgency=medium
+youtube-dl (2015.07.21-1~1.gbp82d01c) UNRELEASED; urgency=medium
 
-  ** SNAPSHOT build @139d14b198add5b26a11ed5dca022feaa6581d98 **
+  ** SNAPSHOT build @82d01c1a88911e89e3e7ed4518d54c028f9e4792 **
 
+  * 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.
+
+ -- Rogério Brito <rbrito@ime.usp.br>  Wed, 22 Jul 2015 01:05:38 -0300
+
+youtube-dl (2015.06.04.1-1) unstable; urgency=medium
+
+  * Imported Upstream version 2015.05.15 (Closes: #784322, #783093, #785335)
+  * Imported Upstream version 2015.06.04.1
   * debian/README.source: Adapt according to changes in git-builpackage.
-  * debian/copyright: Update my copyright years.
+  * debian/copyright:
+    + Update my copyright years.
+    + Fix lintian's dep5-copyright-license-name-not-unique.
   * debian/gbp.conf: Change to new git-buildpackage syntax.
-  * Imported Upstream version 2015.05.15
-  * debian/copyright: Fix lintian's dep5-copyright-license-name-not-unique.
-  * debian/NEWS: Document that the --max-quality option is gone.
-  * Imported Upstream version 2015.06.04.1
+  * debian/NEWS:
+    + Document that the --max-quality option is gone.
+    + Update with version to be uploaded.
+  * debian/control:
+    + Add build-dependency on dh-python as per warning from dh_python2.
 
- -- Rogério Brito <rbrito@ime.usp.br>  Mon, 18 May 2015 07:49:18 -0300
+ -- Rogério Brito <rbrito@ime.usp.br>  Sat, 13 Jun 2015 17:41:32 -0300
 
 youtube-dl (2015.02.28-1) unstable; urgency=medium