Merge tag 'upstream/2015.06.04.1'

[youtubedl] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 17ddb1f426ab0ac002eb727f82f464294928376c..53e4d7d3d6e0031907fd426067cd063431de3816 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,17 +4,38 @@ Upstream-Contact: https://github.com/rg3/youtube-dl
 Source: git://github.com/rg3/youtube-dl.git
 
 Files: *
-Copyright: Not applicable.
-License: Public-domain
+Copyright: none
+License: public-domain
+    youtube-dl is released into the public domain by the copyright holders.
+    .
+    This is free and unencumbered software released into the public domain.
+    .
+    Anyone is free to copy, modify, publish, use, compile, sell, or
+    distribute this software, either in source code form or as a compiled
+    binary, for any purpose, commercial or non-commercial, and by any
+    means.
+    .
+    In jurisdictions that recognize copyright laws, the author or authors
+    of this software dedicate any and all copyright interest in the
+    software to the public domain. We make this dedication for the benefit
+    of the public at large and to the detriment of our heirs and
+    successors. We intend this dedication to be an overt act of
+    relinquishment in perpetuity of all present and future rights to this
+    software under copyright law.
+    .
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+    OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+    ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+    OTHER DEALINGS IN THE SOFTWARE.
+    .
+    For more information, please refer to <http://unlicense.org/>
 
 Files: debian/*
 Copyright: © 2006, Robert S. Edmonds <edmonds@debian.org>.
-          © 2009-2012, Rogério Brito <rbrito@ime.usp.br>.
-License: GPL-2+
-
-License: Public-domain
- youtube-dl is released into the public domain by the copyright holders.
-
+          © 2009-2015, Rogério Brito <rbrito@ime.usp.br>.
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by