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

2 files changed, 11 insertions, 48 deletions

diff --git a/sane/Module_sane.mk b/sane/Module_sane.mk
index f878c2a68e8e..822778575a14 100644
--- a/sane/Module_sane.mk
+++ b/sane/Module_sane.mk
@@ -1,30 +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/.
 #
-# The Initial Developer of the Original Code is
-# 	Peter Foley <pefoley2@verizon.net>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# 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,sane))
diff --git a/sane/Package_inc.mk b/sane/Package_inc.mk
index f5816d81465e..f3a3433879a8 100644
--- a/sane/Package_inc.mk
+++ b/sane/Package_inc.mk
@@ -1,32 +1,14 @@
+# -*- 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/
-#
-# 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.
-#
-# The Initial Developer of the Original Code is
-# 	Peter Foley <pefoley2@verizon.net>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# 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.
+# 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/.
 #
 
 $(eval $(call gb_Package_Package,sane_inc,$(SRCDIR)/sane/inc))
 
 $(eval $(call gb_Package_add_file,sane_inc,inc/external/sane/sane.h,sane.h))
+
+# vim: set noet sw=4 ts=4: