[SCM] debian-live/live-initramfs branch, master, updated. 1.118-1-3-ged7f445

[Daniel Baumann]

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

    Rewriting copyright in machine-interpretable format.

diff --git a/debian/copyright b/debian/copyright
index e5c0890..0394d46 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,40 +1,27 @@
-This package was debianized by Daniel Baumann <daniel at debian.org> on
-Mon, 30 Apr 2007 00:00:00 +0200.
-
-It was downloaded from:
-
-	<http://debian-live.alioth.debian.org/>
-
-Upstream contact:
-
-	Debian Live <debian-live-devel at lists.alioth.debian.org>
-
-License:
-
-	live-initramfs is a fork of casper <http://packages.ubuntu.com/casper/>.
-	casper was originally written by Tollef Fog Heen <tfheen at canonical.com>
-	and Matt Zimmerman <mdz at canonical.com>.
-
-	Copyright (C) 2005-2007 Canonical Ltd. <http://www.cannonical.com/>
-	Copyright (C) 2006-2007 Marco Amadori <marco.amadori at gmail.com>
-	Copyright (C) 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 2 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, write to the Free Software
-	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+Author: Daniel Baumann <daniel at debian.org>
+Download: http://debian-live.alioth.debian.org/
+
+live-initramfs is a fork of casper <http://packages.ubuntu.com/casper/>. casper
+was originally written by Tollef Fog Heen <tfheen at canonical.com> and Matt
+Zimmerman <mdz at canonical.com>.
+
+Files: *
+Copyright:
+ (C) 2007-2008 Daniel Baumann <daniel at debian.org>
+ (C) 2005-2008 Canonical Ltd. <http://www.cannonical.com/>
+ (C) 2006-2007 Marco Amadori <marco.amadori at gmail.com>
+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/>.
 
 On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL-2 file.
-
-The Debian packaging is (C) 2007, Daniel Baumann <daniel at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.
+can be found in /usr/share/common-licenses/GPL-3 file.

-- 
debian-live/live-initramfs