Merge tag 'upstream/2015.06.04.1'

[youtubedl] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 7de8c245072faf8f1836b99e551276ea4dfd8653..6ebaa54d9dc23256972e71d4611ce3904c5ad99b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,21 @@
-youtube-dl (2015.02.28-1~1.gbp0865c2) UNRELEASED; urgency=medium
+youtube-dl (2015.05.15-1~1.gbp17ef29) UNRELEASED; urgency=medium
 
-  ** SNAPSHOT build @0865c28fb29a6481cd837cf8c1ef0cd134c6ef8e **
+  ** SNAPSHOT build @17ef2938f1a30eb959e17d4d1325bd9355ca05c5 **
+
+  * debian/README.source: Adapt according to changes in git-builpackage.
+  * debian/copyright: Update my copyright years.
+  * 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.
+
+ -- Rogério Brito <rbrito@ime.usp.br>  Mon, 18 May 2015 07:49:18 -0300
+
+youtube-dl (2015.02.28-1) unstable; urgency=medium
 
   * Imported Upstream version 2015.02.28. Closes: #778765.
 
- -- Rogério Brito <rbrito@ime.usp.br>  Sun, 01 Mar 2015 02:04:16 -0300
+ -- Rogério Brito <rbrito@ime.usp.br>  Sun, 01 Mar 2015 02:12:13 -0300
 
 youtube-dl (2015.02.06-1) unstable; urgency=medium