2009-11-16 Robert Millan <rmh.grub@aybabtu.com>

        Relicense multiboot.h, with RMS' blessing.

        * include/multiboot.h: Change to X11 license.

diff --git a/ChangeLog b/ChangeLog
index b0958fc917ccd403e29439de3eed83d41e93e7ad..2e4875916d123175ae8af9d01845b8faba6ff922 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-16  Robert Millan  <rmh.grub@aybabtu.com>
+
+       Relicense multiboot.h, with RMS' blessing.
+
+       * include/multiboot.h: Change to X11 license.
+
 2009-11-15  Robert Millan  <rmh.grub@aybabtu.com>
 
        Support --version in grub-mkisofs.

diff --git a/include/multiboot.h b/include/multiboot.h
index f6e240b7beb64eaf0c371f6c43ae056d52481b1f..9ce34f43718f9a3fd7cf97160043c0ee2dd43798 100644 (file)
--- a/include/multiboot.h
+++ b/include/multiboot.h
@@ -1,20 +1,23 @@
-/* multiboot.h - multiboot header file. */
 /*
- *  GRUB  --  GRand Unified Bootloader
+ *  multiboot.h - Multiboot header file.
  *  Copyright (C) 2003,2007,2008,2009  Free Software Foundation, Inc.
  *
- *  GRUB 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.
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to
+ *  deal in the Software without restriction, including without limitation the
+ *  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ *  sell copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
  *
- *  GRUB 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.
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL ANY
+ *  DEVELOPER OR DISTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+ *  IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #ifndef MULTIBOOT_HEADER