Move to MPLv2 license headers, with ESC decision and author's permission.

2 files changed, 9 insertions, 44 deletions

diff --git a/Mesa/Module_Mesa.mk b/Mesa/Module_Mesa.mk
index fc70e5918b67..61cf8855f3d2 100644
--- a/Mesa/Module_Mesa.mk
+++ b/Mesa/Module_Mesa.mk
@@ -1,28 +1,11 @@
 #
-#  Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License or as specified alternatively below. You may obtain a copy of
-#  the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-#  Major Contributor(s):
-#  Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer)
-#
-#  All Rights Reserved.
-#
-#  For minor contributions see the git repository.
-#
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-#  the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-#  in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-#  instead of those above.
 
 $(eval $(call gb_Module_Module,Mesa))
 
diff --git a/Mesa/Package_inc.mk b/Mesa/Package_inc.mk
index 73fe9603cf3a..b5cca090b1fd 100644
--- a/Mesa/Package_inc.mk
+++ b/Mesa/Package_inc.mk
@@ -1,28 +1,11 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+# This file is part of the LibreOffice project.
 #
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License or as specified alternatively below. You may obtain a copy of
-#  the License at http://www.mozilla.org/MPL/
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-#
-#  Major Contributor(s):
-#  Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer)
-#
-#  All Rights Reserved.
-#
-#  For minor contributions see the git repository.
-#
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-#  the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-#  in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-#  instead of those above.
 
 $(eval $(call gb_Package_Package,Mesa_inc,$(SRCDIR)/Mesa/inc))
 
@@ -37,5 +20,4 @@ $(eval $(call gb_Package_add_file,Mesa_inc,inc/GL/glx_mangle.h,glx_mangle.h))
 $(eval $(call gb_Package_add_file,Mesa_inc,inc/GL/vms_x_fix.h,vms_x_fix.h))
 $(eval $(call gb_Package_add_file,Mesa_inc,inc/GL/wglext.h,wglext.h))
 
-
 # vim: set noet sw=4: