[SCM] GUI front-end for Debian Live. branch, master, updated. 08faf0d678877236b2a81da93a8c822d69ad49d1

[Chris Lamb]

The following commit has been merged in the master branch:
commit afb6b63a6ba28eb9102735fc69981dd58ea37887
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Fri Apr 4 15:14:24 2008 +0100

    Move to GPL v3
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/debian/changelog b/debian/changelog
index 4022746..82285a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ live-magic (0.4) UNRELEASED; urgency=low
   * Don't include "-num" in version.
   * Update live-helper dependency to 1.0~a42.
   * Prefer cebootstrap if available and add to Recommends.
+  * Move to GPL v3.
   * Use LIVE_ not LH_ (Closes: #443124)
 
  -- Chris Lamb <chris at chris-lamb.co.uk>  Mon, 14 Jan 2008 18:36:43 +0000
diff --git a/debian/copyright b/debian/copyright
index ca7c09a..93ac3ac 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,34 +1,20 @@
-This package was debianized by Chris Lamb <chris at chris-lamb.co.uk> on
-Mon, 28 May 2007 12:37:08 +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) 2007, 2008 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 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: Chris Lamb <chris at chris-lamb.co.uk>
+Download: http://debian-live.alioth.debian.org/
+
+Files: *
+Copyright: (C) 2007, 2008 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/>.
 
 On Debian systems, the complete text of the GNU General Public License
 can be found in /usr/share/common-licenses/GPL-3 file.
-
-The Debian packaging is (C) 2007, Chris Lamb <chris at chris-lamb.co.uk> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.

-- 
GUI front-end for Debian Live.