Merge commit 'upstream/2011.09.14'

[youtubedl] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 015e6adeb52247a2967378a7376763b88d5def2a..b00b3fbcefcc803d82577f90295083d299b3215e 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,36 +1,30 @@
 This package was debianized by Robert S. Edmonds <edmonds@debian.org> on
 Sun,  3 Sep 2006 19:43:27 -0400.
 
-It was downloaded from http://www.arrakis.es/~rggi3/youtube-dl/
+The current maintainer is Rogério Brito <rbrito@ime.usp.br>.
 
-Copyright Holder:
+It was downloaded from:
 
-Copyright 2006 Ricardo Garcia Gonzalez
+http://bitbucket.org/rg3/youtube-dl/raw/2010.04.04/youtube-dl
+
+Authors:
+
+    * Ricardo Garcia Gonzalez: program core, YouTube.com InfoExtractor,
+      metacafe.com InfoExtractor and YouTube playlist InfoExtractor.
+    * Danny Colligan: YouTube search InfoExtractor, ideas and patches.
+    * Many other people contributing patches, code, ideas and kind messages.
+      Too many to be listed here. You know who you are. Thank you very much. 
+
+Copyright © 2006-2010 Ricardo Garcia Gonzalez
 
 License:
 
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-# 
-# 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 OR COPYRIGHT HOLDERS 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.
-# 
-# Except as contained in this notice, the name(s) of the above copyright
-# holders shall not be used in advertising or otherwise to promote the
-# sale, use or other dealings in this Software without prior written
-# authorization.
-
-The Debian packaging is (C) 2006, Robert S. Edmonds <edmonds@debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+    The program is in the Public Domain.
+
+    The packaging is licensed under the GNU GPL License:
+
+        Copyright © 2006, Robert S. Edmonds <edmonds@debian.org>.
+       Copyright © 2009-2010, Rogério Brito <rbrito@ime.usp.br>.
+
+For the text of the GPL License in a Debian system, please see
+`/usr/share/common-licenses/GPL-2'.