[SCM] debian-live/live-helper branch, master, updated. 1.0_a37-2-66-g48c44d1

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 48c44d129ce7599b0514831bcaa46cbf8c8528c1
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Feb 26 19:27:13 2008 +0100

    Rewriting copyright in machine-interpretable format.

diff --git a/debian/copyright b/debian/copyright
index 8e4f20c..df8093a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,82 +1,63 @@
-This package was debianized by Daniel Baumann <daniel at debian.org> on
-Mon, 12 Mar 2007 00:00:00 +0100.
-
-It was downloaded from:
-
-	<http://debian-live.alioth.debian.org/>
-
-Upstream contact:
-
-	Debian Live <debian-live-devel at lists.alioth.debian.org>
-
-License:
-
-	Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-
-	This program 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 3 of the License, or
-	(at your option) any later version.
-
-	This program 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
-can be found in /usr/share/common-licenses/GPL-3 file.
-
-License (contrib/graph-helpers/*):
-
-	Copyright (C) 2007 Chris Lamb <chris at chris-lamb.co.uk>
-
-	This program 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 3 of the License, or
-	(at your option) any later version.
-
-	This program 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/>.
+Author: Daniel Baumann <daniel at debian.org>
+Download: http://debian-live.alioth.debian.org/
+
+Files: *
+Copyright: (C) 2006-2008 Daniel Baumann <daniel at debian.org>
+License: GPL-3+
+ This program 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 3 of the License, or (at your option) any later
+ version.
+ .
+ This program 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/>.
+
+Files: contrib/graph-helpers
+Copyright: (C) 2007 Chris Lamb <chris at chris-lamb.co.uk>
+License: GPL-3+
+ This program 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 3 of the License, or (at your option) any later
+ version.
+ .
+ This program 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/>.
+
+Files: contrib/grub-splash, contrib/syslinux-splash
+License: other
+ The splash for Debian Live was done by Daniel Baumann <daniel at debian.org> based
+ on the original work of Mark Riedesel.
+ .
+ The contribution of Daniel is hereby placed in the public domain (no rights
+ reserved).
+ .
+ ---------------
+ http://dugnet.com/klown/pics/klowner_debboot.png
+ by Mark Riedesel, license same as open use logo
+ .
+ To create klowner.rle:
+ .
+ 1. convert klowner.png klowner.bmp
+ 2. bmptoppm < klowner.bmp | ppmtolss16 #FBFDFA=7 > klowner.rle
+    (FBFDFA is the color used for the inside of the "n" in Debian.)
+ ---------------
+ .
+ Debian Open Use Logo License
+ .
+ Copyright (c) 1999 Software in the Public Interest
+ This logo or a modified version may be used by anyone to refer to the Debian
+ project, but does not indicate endorsement by the project.
+ .
+ Note: we would appreciate that you make the image a link to
+ http://www.debian.org/ if you use it on a web page.
 
 On Debian systems, the complete text of the GNU General Public License
 can be found in /usr/share/common-licenses/GPL-3 file.
-
-License (contrib/grub-splash/*, contrib/syslinux-splash/*):
-
-	The splash for Debian Live was done by Daniel Baumann
-	<daniel at debian.org> based on the original work of Mark Riedesel.
-
-	The contribution of Daniel is hereby placed in the public domain (no
-	rights reserved).
-
-	---------------
-	http://dugnet.com/klown/pics/klowner_debboot.png
-	by Mark Riedesel, license same as open use logo
-
-	To create klowner.rle:
-
-	  1. convert klowner.png klowner.bmp
-	  2. bmptoppm < klowner.bmp | ppmtolss16 #FBFDFA=7 > klowner.rle
-
-	     (FBFDFA is the color used for the inside of the "n" in Debian.)
-	---------------
-
-	Debian Open Use Logo License
-
-	Copyright (c) 1999 Software in the Public Interest
-	This logo or a modified version may be used by anyone to refer to the
-	Debian project, but does not indicate endorsement by the project.
-
-	Note: we would appreciate that you make the image a link to
-	http://www.debian.org/ if you use it on a web page.
-
-The Debian packaging is (C) 2006-2007, Daniel Baumann <daniel at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.

-- 
debian-live/live-helper