Merge tag 'upstream/2015.07.21'

[youtubedl] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 2e30acf286667fd74aa7f046282daf597779d62a..b65689d9c404babbd9e24ec57d471c7032ebcbae 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,19 @@
-youtube-dl (2015.05.15-1~1.gbp7df434) UNRELEASED; urgency=medium
-
-  ** SNAPSHOT build @7df4343e553a9942a290e5e1dffe931261ab844e **
+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/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