Merge tag 'upstream/2013.08.29'

[youtubedl] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 015e6adeb52247a2967378a7376763b88d5def2a..17ddb1f426ab0ac002eb727f82f464294928376c 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,36 +1,33 @@
-This package was debianized by Robert S. Edmonds <edmonds@debian.org> on
-Sun,  3 Sep 2006 19:43:27 -0400.
+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

 
 

-It was downloaded from http://www.arrakis.es/~rggi3/youtube-dl/
+Files: *
+Copyright: Not applicable.
+License: Public-domain

 
 

-Copyright Holder:
+Files: debian/*
+Copyright: © 2006, Robert S. Edmonds <edmonds@debian.org>.
+          © 2009-2012, Rogério Brito <rbrito@ime.usp.br>.
+License: GPL-2+

 
 

-Copyright 2006 Ricardo Garcia Gonzalez
+License: Public-domain
+ youtube-dl is released into the public domain by the copyright holders.

 
 

-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'.
+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".