From: Christian Hofstaedtler Date: Fri, 30 Sep 2011 14:27:46 +0000 (+0200) Subject: Reword/reformat some text in debian/copyright X-Git-Tag: v0.10.1~1 X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=commitdiff_plain;h=ba108d8df4a1de5bf681c42b0dfd3afe084401ed Reword/reformat some text in debian/copyright --- diff --git a/debian/copyright b/debian/copyright index b823be3..9445570 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,15 +7,10 @@ Upstream Author: Michael Prokop Copyright: - grub/splash.xpm.gz and grub/grml.png: Copyright by Martin Ahammer / grml-team + grml2usb: - images/: taken from asciidoc Debian package, - Copyright 2008 by Stuart Rackham - - mbr/mbr.S: Copyright (c) 2009 Thorsten Glaser , - licensing information available in mbr/mbr.S - - This software is copyright (c) 2009++ by Michael Prokop. + This software is Copyright (c) 2006-2011 by Michael Prokop and + others. 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 @@ -31,5 +26,38 @@ Copyright: Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + + grub/splash.xpm.gz and grub/grml.png: + + Copyright by Martin Ahammer / grml-team + + + images/icons/: + + Copyright 2008 by Stuart Rackham + (Taken from AsciiDoc.) + AsciiDoc is free software and is licenced under the terms of the + GNU General Public License version 2. + + + mbr/mbr.S: + + Copyright (c) 2009 Thorsten Glaser + Provided that these terms and disclaimer and all copyright notices + are retained or reproduced in an accompanying document, permission + is granted to deal in this work without restriction, including un- + limited rights to use, publicly perform, distribute, sell, modify, + merge, give away, or sublicence. + + This work is provided "AS IS" and WITHOUT WARRANTY of any kind, to + the utmost extent permitted by applicable law, neither express nor + implied; without malicious intent or gross negligence. In no event + may a licensor, author or contributor be held liable for indirect, + direct, other damage, loss, or other issues arising in any way out + of dealing in the work, even if advised of the possibility of such + damage or existence of a defect, except proven that it results out + of said person's immediate fault when using the work as intended. + + On Debian GNU/Linux systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2'.