Use ipxe.lkrn from ipxe package

[grml-live.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 620a828..e164c98 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,14 +5,9 @@ It was downloaded from http://grml.org/
 
 Upstream Author: Michael Prokop <mika@grml.org>
 
 
 Upstream Author: Michael Prokop <mika@grml.org>
 

-Copyright: 
+Copyright:

 
 

-    Copyright 2007++ Michael Prokop <mika@grml.org>
-
-    Copyright of /usr/share/grml-live/i386_files/boot/grub/splash.xpm.gz by
-    Robin Bakels <robin@crondor.net>, which is licensed under "GPL v2 or higher"
-    and hase been taken from Debian package grub-splashimages
-    (file /boot/grub/splashimages/fiesta.xpm.gz).
+    © 2007++ by Michael Prokop <mika@grml.org>

 
 License:
 
 
 License:
 


@@ -20,12 +15,12 @@ License:
     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.
     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 package 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 package 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 package; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
     You should have received a copy of the GNU General Public License
     along with this package; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA


@@ -40,7 +35,7 @@ License information for the syslinux files shipped as
 License information for the bsd4grml files shipped as
 /usr/share/grml-live/templates/boot/addons/bsd4grml:
 
 License information for the bsd4grml files shipped as
 /usr/share/grml-live/templates/boot/addons/bsd4grml:
 

-   Downloaded from <https://eurynome.mirbsd.org/~tg/pub/bsd4grml.tgz>.
+   Downloaded from <https://dl.mirbsd.org/MirOS/current/bsd4grml-20100815.tgz>.

    Thorsten "mirabilos" Glaser <tg@mirbsd.de>
    See /usr/share/grml-live/templates/boot/addons/bsd4grml/LICENCE.TXT
    for details.
    Thorsten "mirabilos" Glaser <tg@mirbsd.de>
    See /usr/share/grml-live/templates/boot/addons/bsd4grml/LICENCE.TXT
    for details.


@@ -54,6 +49,14 @@ License information for the file hdt.c32 shipped as
    of the syslinux source package.
 
 License information for the pci.ids file shipped as
    of the syslinux source package.
 
 License information for the pci.ids file shipped as

+/usr/share/grml-live/templates/boot/addons/memtest
+
+   Downloaded from <http://www.memtest.org/>
+   Upstream Author: Samuel Demeulemeester <memtest@memtest.org>, based on
+   memtest86 by Chris Brady <cbrady@sgi.com>, and various contributors.
+   Licensed unter the GPL v2.
+
+License information for the pci.ids file shipped as

 /usr/share/grml-live/templates/boot/addons/pci.ids
 
    Downloaded from <http://pciids.sourceforge.net/>.
 /usr/share/grml-live/templates/boot/addons/pci.ids
 
    Downloaded from <http://pciids.sourceforge.net/>.


@@ -64,5 +67,5 @@ License information for the pci.ids file shipped as
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
 
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
 

-The Debian packaging is (C) 2007, Michael Prokop <mika@grml.org> and
+The Debian packaging is © 2007++, Michael Prokop <mika@grml.org> and

 is licensed under the GPL, see above.
 is licensed under the GPL, see above.