Merge tag 'upstream/2014.11.23'

[youtubedl] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 528451a668718986479b9ed9536459e668b755c4..17ddb1f426ab0ac002eb727f82f464294928376c 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,30 +1,33 @@
-This package was debianized by Robert S. Edmonds <edmonds@debian.org> on
-Sun,  3 Sep 2006 19:43:27 -0400.
-
-The current maintainer is Rogério Brito <rbrito@ime.usp.br>.
-
-It was downloaded from:
-
-http://bitbucket.org/rg3/youtube-dl/raw/2009.08.08/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-2009 Ricardo Garcia Gonzalez
-
-License:
-
-    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, 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'.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: youtube-dl
+Upstream-Contact: https://github.com/rg3/youtube-dl
+Source: git://github.com/rg3/youtube-dl.git
+
+Files: *
+Copyright: Not applicable.
+License: Public-domain
+
+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.
+
+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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".