Merging casper 1.216.

[live-boot-grml.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 0394d46..3babe1c 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,27 +1,49 @@
-Author: Daniel Baumann <daniel@debian.org>
-Download: http://debian-live.alioth.debian.org/
+Upstream-Contact: Debian Live Project <debian-live@lists.debian.org>
+Upstream-Homepage: http://live.debian.net/
 
-live-initramfs is a fork of casper <http://packages.ubuntu.com/casper/>. casper
-was originally written by Tollef Fog Heen <tfheen@canonical.com> and Matt
-Zimmerman <mdz@canonical.com>.
+live-initramfs is a fork of casper <http://packages.ubuntu.com/casper/>.
+casper was originally written by Tollef Fog Heen <tfheen@canonical.com>
+and Matt Zimmerman <mdz@canonical.com>.
 
 Files: *
 Copyright:
- (C) 2007-2008 Daniel Baumann <daniel@debian.org>
+ (C) 2007-2010 Daniel Baumann <daniel@debian.org>
  (C) 2005-2008 Canonical Ltd. <http://www.cannonical.com/>
  (C) 2006-2007 Marco Amadori <marco.amadori@gmail.com>
+ (C) 2008 Dell Inc. <http://www.dell.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 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.
+ 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/>.
+ 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.
 
-On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL-3 file.
+Files: bin/live-set-selections
+Copyright: Joey Hess <joeyh@debian.org>
+License: GPL-2+
+ 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 Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-2 file.