Merge branch 'master' into flexbisonflexbison

19 files changed, 71 insertions, 204 deletions

diff --git a/src/python/Attendee.py b/src/python/Attendee.py
index ed6fde46..349433f1 100644
--- a/src/python/Attendee.py
+++ b/src/python/Attendee.py
@@ -3,31 +3,19 @@
 # FILE: Property.py
 # CREATOR: eric
 #
-# (C) COPYRIGHT 2001, Eric Busboom <eric@civicknowledge.com>
-# (C) COPYRIGHT 2001, Patrick Lewis <plewis@inetarena.com>
+# SPDX-FileCopyrightText: 2001, Eric Busboom <eric@civicknowledge.com>
+# SPDX-FileCopyrightText: 2001, Patrick Lewis <plewis@inetarena.com>
 #
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of either:
+# SPDX-License-Identifier: LGPL-2.1-only OR MPL-2.0
 #
-#   The LGPL as published by the Free Software Foundation, version
-#   2.1, available at: https://www.gnu.org/licenses/lgpl-2.1.txt
 #
-# Or:
 #
-#   The Mozilla Public License Version 2.0. You may obtain a copy of
-#   the License at https://www.mozilla.org/MPL/
 
 
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of either:
+# SPDX-License-Identifier: LGPL-2.1-only OR MPL-2.0
 #
-#    The LGPL as published by the Free Software Foundation, version
-#    2.1, available at: https://www.gnu.org/licenses/lgpl-2.1.html
 #
-#  Or:
 #
-#    The Mozilla Public License Version 2.0. You may obtain a copy of
-#    the License at https://www.mozilla.org/MPL/
 #======================================================================
 
 from LibicalWrap import *
diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
index a5a593c3..24b9ba71 100644
--- a/src/python/CMakeLists.txt
+++ b/src/python/CMakeLists.txt
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: Allen Winter <winter@kde.org>
+# SPDX-License-Identifier: LGPL-2.1-only OR MPL-2.0
+
 include_directories(
   ${CMAKE_SOURCE_DIR}/src
   ${CMAKE_SOURCE_DIR}/src/libical
@@ -21,4 +24,3 @@ set_target_properties(LibicalWrap PROPERTIES
 install(TARGETS LibicalWrap DESTINATION lib)
 
 ########### install files ###############
-
diff --git a/src/python/ChangeLog b/src/python/ChangeLog
index 1912df17..4cc5e099 100644
--- a/src/python/ChangeLog
+++ b/src/python/ChangeLog
@@ -3,19 +3,19 @@
 	* Component.py Added Calendar class. 
 
 	* Componeny.py Changed all component constructor so they cannot
- 	take string arguments. Now, only NewComponent() can turn an iCal
- 	string into a component.
+	take string arguments. Now, only NewComponent() can turn an iCal
+	string into a component.
 
 	
 2001-04-02  Eric Busboom  <eric@civicknowledge.com>
 
 	* Component.py removed arguments from the Event constructor, since
- 	I presume that the Component derived classes will always be
- 	constructed with no arguments.
+	I presume that the Component derived classes will always be
+	constructed with no arguments.
 
 	* Property.py Split out Attendee, Organizer, Time, Duration and
- 	Period into their own files. Moved remaining classes to Derived
- 	Properties.pm
+	Period into their own files. Moved remaining classes to Derived
+	Properties.pm
 
 	
 2001-03-13  Eric Busboom  <eric@civicknowledge.com>
@@ -42,10 +42,10 @@
 2001-03-05  Eric Busboom  <eric@civicknowledge.com>
 
 	* Property.py Added a lot of exception code to signal failure to
- 	create a Property.
+	create a Property.
 
 	* DerivedProperties.py Added derived property classes for RDATE
- 	and TRIGGER, two properties that can have one of two value types. 
+	and TRIGGER, two properties that can have one of two value types.
 
 
 2001-03-04  Eric Busboom  <eric@civicknowledge.com>
@@ -53,7 +53,7 @@
 	* Property.pm Added Property.ConstructorFailedError exception
 
 	* Component.pm fixed bug in Collection.__setslice__. "," used
- 	instead of ":"
+	instead of ":"
 
 2001-03-04  Patrick Lewis <plewis@inetarena.com>
 	
@@ -80,23 +80,23 @@
 	* Property Added __del__ 
 
 	* Component Component.properties() now caches properties that it
- 	constructs, so two calls to properties() to that get the same
- 	icalproperty will also get the same Property.
+	constructs, so two calls to properties() to that get the same
+	icalproperty will also get the same Property.
 
 	* Property Added Property.__cmp__ to test equality of properties
- 	based on ical string values
+	based on ical string values
 
 2001-02-27  Eric Busboom  <eric@civicknowledge.com>
 
 	* Property Added Property.ref() to set/get the reference to the
- 	Property's internal icalproperty
+	Property's internal icalproperty
 
 	* Property Property._update_value now changes the icalproperty
- 	value if a reference has been set.
+	value if a reference has been set.
 
 	* Component re-instituted Component.properties(). The routine now
- 	adds a 'ref' key to the dict that holds the python pointer
- 	string. The C hex value of the pointer is in the 'pid' key
+	adds a 'ref' key to the dict that holds the python pointer
+	string. The C hex value of the pointer is in the 'pid' key
 	
 
 2001-02-27  Patrick Lewis  <plewis@inetarena.com>
@@ -117,10 +117,10 @@
 	* Libical.py Added test routine for time, time_test()
 
 	* Libical.py Remove end of line chars ('\r\n" ) from
- 	Property._str__. Caller should add these lines itself
+	Property._str__. Caller should add these lines itself
 
 	* Liical.py CHanges Time._update_values to set time VALUE type
- 	based on use of is_date, rather than length of string.
+	based on use of is_date, rather than length of string.
 
 	* Libical.py Removed call to _update_value in TIme::timezone
 	
diff --git a/src/python/Collection.py b/src/python/Collection.py
index 15ae8b7e..1e911dc9 100644
--- a/src/python/Collection.py
+++ b/src/python/Collection.py
@@ -3,19 +3,13 @@
 # FILE: Collection.py
 # CREATOR: eric
 #
-# (C) COPYRIGHT 2001, Eric Busboom <eric@civicknowledge.com>
-# (C) COPYRIGHT 2001, Patrick Lewis <plewis@inetarena.com>
+# SPDX-FileCopyrightText: 2001, Eric Busboom <eric@civicknowledge.com>
+# SPDX-FileCopyrightText: 2001, Patrick Lewis <plewis@inetarena.com>
 #
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of either:
+# SPDX-License-Identifier: LGPL-2.1-only OR MPL-2.0
 #
-#   The LGPL as published by the Free Software Foundation, version
-#   2.1, available at: https://www.gnu.org/licenses/lgpl-2.1.txt
 #
-# Or:
 #
-#   The Mozilla Public License Version 2.0. You may obtain a copy of
-#   the License at https://www.mozilla.org/MPL/
 #======================================================================
 
 from types import *
diff --git a/src/python/Component.py b/src/python/Component.py
index 598e4977..91043905 100644
--- a/src/python/Component.py
+++ b/src/python/Component.py
@@ -3,30 +3,10 @@
 # FILE: Component.py
 # CREATOR: eric
 #
-# (C) COPYRIGHT 2001, Eric Busboom <eric@civicknowledge.com>
-# (C) COPYRIGHT 2001, Patrick Lewis <plewis@inetarena.com>
+# SPDX-FileCopyrightText: 2001, Eric Busboom <eric@civicknowledge.com>
+# SPDX-FileCopyrightText: 2001, Patrick Lewis <plewis@inetarena.com>
 #
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of either:
-#
-#   The LGPL as published by the Free Software Foundation, version
-#   2.1, available at: https://www.gnu.org/licenses/lgpl-2.1.txt
-#
-# Or:
-#
-#   The Mozilla Public License Version 2.0. You may obtain a copy of
-#   the License at https://www.mozilla.org/MPL/
-
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of either:
-#
-#   The LGPL as published by the Free Software Foundation, version
-#   2.1, available at: https://www.gnu.org/licenses/lgpl-2.1.html
-#
-# Or:
-#
-#   The Mozilla Public License Version 2.0. You may obtain a copy of
-#   the License at https://www.mozilla.org/MPL/
+# SPDX-License-Identifier: LGPL-2.1-only OR MPL-2.0
 #======================================================================
 
 from LibicalWrap import *
diff --git a/src/python/DerivedProperties.py b/src/python/DerivedProperties.py
index 3a64f96f..879163d5 100644
--- a/src/python/DerivedProperties.py
+++ b/src/python/DerivedProperties.py
@@ -3,19 +3,13 @@
 # FILE: DerivedProperties.py
 # CREATOR: eric
 #
-# (C) COPYRIGHT 2001, Eric Busboom <eric@civicknowledge.com>
-# (C) COPYRIGHT 2001, Patrick Lewis <plewis@inetarena.com>
+# SPDX-FileCopyrightText: 2001, Eric Busboom <eric@civicknowledge.com>
+# SPDX-FileCopyrightText: 2001, Patrick Lewis <plewis@inetarena.com>
 #
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of either:
+# SPDX-License-Identifier: LGPL-2.1-only OR MPL-2.0
 #
-#   The LGPL as published by the Free Software Foundation, version
-#   2.1, available at: https://www.gnu.org/licenses/lgpl-2.1.txt
 #
-# Or:
 #
-#   The Mozilla Public License Version 2.0. You may obtain a copy of
-#   the License at https://www.mozilla.org/MPL/
 #======================================================================
 
 from Property import Property
diff --git a/src/python/Duration.py b/src/python/Duration.py
index 8997f59d..95260e03 100644
--- a/src/python/Duration.py
+++ b/src/python/Duration.py
@@ -3,19 +3,13 @@
 # FILE: Duration.py
 # CREATOR: eric
 #
-# (C) COPYRIGHT 2001, Eric Busboom <eric@civicknowledge.com>
-# (C) COPYRIGHT 2001, Patrick Lewis <plewis@inetarena.com>
+# SPDX-FileCopyrightText: 2001, Eric Busboom <eric@civicknowledge.com>
+# SPDX-FileCopyrightText: 2001, Patrick Lewis <plewis@inetarena.com>
 #
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of either:
+# SPDX-License-Identifier: LGPL-2.1-only OR MPL-2.0
 #
-#   The LGPL as published by the Free Software Foundation, version
-#   2.1, available at: https://www.gnu.org/licenses/lgpl-2.1.txt
 #
-# Or:
 #
-#   The Mozilla Public License Version 2.0. You may obtain a copy of
-#   the License at https://www.mozilla.org/MPL/
 #===============================================================
 
 from LibicalWrap import *
diff --git a/src/python/Error.py b/src/python/Error.py
index 47fa0e7a..9104344b 100644
--- a/src/python/Error.py
+++ b/src/python/Error.py
@@ -2,31 +2,19 @@
 # FILE: Error.py
 # CREATOR: eric
 #
-# (C) COPYRIGHT 2001, Eric Busboom <eric@civicknowledge.com>
-# (C) COPYRIGHT 2001, Patrick Lewis <plewis@inetarena.com>
+# SPDX-FileCopyrightText: 2001, Eric Busboom <eric@civicknowledge.com>
+# SPDX-FileCopyrightText: 2001, Patrick Lewis <plewis@inetarena.com>
 #
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of either:
+# SPDX-License-Identifier: LGPL-2.1-only OR MPL-2.0
 #
-#   The LGPL as published by the Free Software Foundation, version
-#   2.1, available at: https://www.gnu.org/licenses/lgpl-2.1.txt
 #
-# Or:
 #
-#   The Mozilla Public License Version 2.0. You may obtain a copy of
-#   the License at https://www.mozilla.org/MPL/
 
 
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of either:
+# SPDX-License-Identifier: LGPL-2.1-only OR MPL-2.0
 #
-#    The LGPL as published by the Free Software Foundation, version
-#    2.1, available at: https://www.gnu.org/licenses/lgpl-2.1.html
 #
-#  Or:
 #
-#    The Mozilla Public License Version 2.0. You may obtain a copy of
-#    the License at https://www.mozilla.org/MPL/
 #===========================================================
 
 class LibicalError(Exception):
diff --git a/src/python/Gauge.py b/src/python/Gauge.py
index 44954006..abfa1c77 100644
--- a/src/python/Gauge.py
+++ b/src/python/Gauge.py
@@ -3,19 +3,13 @@
 # FILE: Gauge.py
 # CREATOR: mtearle
 #
-# (C) COPYRIGHT 2001, Eric Busboom <eric@civicknowledge.com>
-# (C) COPYRIGHT 2001, Patrick Lewis <plewis@inetarena.com>
+# SPDX-FileCopyrightText: 2001, Eric Busboom <eric@civicknowledge.com>
+# SPDX-FileCopyrightText: 2001, Patrick Lewis <plewis@inetarena.com>
 #
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of either:
+# SPDX-License-Identifier: LGPL-2.1-only OR MPL-2.0
 #
-#   The LGPL as published by the Free Software Foundation, version
-#   2.1, available at: https://www.gnu.org/licenses/lgpl-2.1.txt
 #
-# Or:
 #
-#   The Mozilla Public License Version 2.0. You may obtain a copy of
-#   the License at https://www.mozilla.org/MPL/
 #======================================================================
 
 from LibicalWrap import *
diff --git a/src/python/Libical.py b/src/python/Libical.py
index 20a2b975..ff4d7e18 100644
--- a/src/python/Libical.py
+++ b/src/python/Libical.py
@@ -3,19 +3,13 @@
 # FILE: Libical.py
 # CREATOR: eric
 #
-# (C) COPYRIGHT 2001, Eric Busboom <eric@civicknowledge.com>
-# (C) COPYRIGHT 2001, Patrick Lewis <plewis@inetarena.com>
+# SPDX-FileCopyrightText: 2001, Eric Busboom <eric@civicknowledge.com>
+# SPDX-FileCopyrightText: 2001, Patrick Lewis <plewis@inetarena.com>
 #
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of either:
+# SPDX-License-Identifier: LGPL-2.1-only OR MPL-2.0
 #
-#   The LGPL as published by the Free Software Foundation, version
-#   2.1, available at: https://www.gnu.org/licenses/lgpl-2.1.txt
 #
-# Or:
 #
-#   The Mozilla Public License Version 2.0. You may obtain a copy of
-#   the License at https://www.mozilla.org/MPL/
 #======================================================================
 
 from LibicalWrap import ICAL_PACKAGE, ICAL_VERSION
diff --git a/src/python/LibicalWrap.i b/src/python/LibicalWrap.i
index 070a6d5b..a0970428 100644
--- a/src/python/LibicalWrap.i
+++ b/src/python/LibicalWrap.i
@@ -2,17 +2,9 @@
 /*======================================================================
   FILE: ical.i
 
-  (C) COPYRIGHT 1999 Eric Busboom <eric@civicknowledge.com>
+  SPDX-FileCopyrightText: 1999 Eric Busboom <eric@civicknowledge.com>
 
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.0 (the "License"); you may not use this file except in
-  compliance with the License. You may obtain a copy of the License at
-  https://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.
+  SPDX-License-Identifier: LGPL-2.1-only OR MPL-2.0
 
   The original author is Eric Busboom
 
diff --git a/src/python/LibicalWrap_icaltime.i b/src/python/LibicalWrap_icaltime.i
index f82a7706..ada94293 100644
--- a/src/python/LibicalWrap_icaltime.i
+++ b/src/python/LibicalWrap_icaltime.i
@@ -2,17 +2,9 @@
 /*======================================================================
   FILE: LibicalWrap_icaltime.i
 
-  (C) COPYRIGHT 2010 Glenn Washburn
+  SPDX-FileCopyrightText: 2010 Glenn Washburn
 
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.0 (the "License"); you may not use this file except in
-  compliance with the License. You may obtain a copy of the License at
-  https://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.
+  SPDX-License-Identifier: LGPL-2.1-only OR MPL-2.0
 
   The original author is Glenn Washburn (crass@berlios.de)
 
@@ -193,4 +185,3 @@ _swig_set_properties(icaltimetype, icaltimetype_props)
 %}
 
 // TODO: Add icaltime_span_* to icaltime_spantype
-
diff --git a/src/python/LibicalWrap_icaltimezone.i b/src/python/LibicalWrap_icaltimezone.i
index 320369cd..68f25219 100644
--- a/src/python/LibicalWrap_icaltimezone.i
+++ b/src/python/LibicalWrap_icaltimezone.i
@@ -2,17 +2,9 @@
 /*======================================================================
   FILE: LibicalWrap_icaltimezone.i
 
-  (C) COPYRIGHT 2010 Glenn Washburn
+  SPDX-FileCopyrightText: 2010 Glenn Washburn
 
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.0 (the "License"); you may not use this file except in
-  compliance with the License. You may obtain a copy of the License at
-  https://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.
+  SPDX-License-Identifier: LGPL-2.1-only OR MPL-2.0
 
   The original author is Glenn Washburn (crass@berlios.de)
 
diff --git a/src/python/Period.py b/src/python/Period.py
index 60c2f304..c5ed6b20 100644
--- a/src/python/Period.py
+++ b/src/python/Period.py
@@ -3,19 +3,13 @@
 # FILE: Period.py
 # CREATOR: eric
 #
-# (C) COPYRIGHT 2001, Eric Busboom <eric@civicknowledge.com>
-# (C) COPYRIGHT 2001, Patrick Lewis <plewis@inetarena.com>
+# SPDX-FileCopyrightText: 2001, Eric Busboom <eric@civicknowledge.com>
+# SPDX-FileCopyrightText: 2001, Patrick Lewis <plewis@inetarena.com>
 #
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of either:
+# SPDX-License-Identifier: LGPL-2.1-only OR MPL-2.0
 #
-#   The LGPL as published by the Free Software Foundation, version
-#   2.1, available at: https://www.gnu.org/licenses/lgpl-2.1.txt
 #
-# Or:
 #
-#   The Mozilla Public License Version 2.0. You may obtain a copy of
-#   the License at https://www.mozilla.org/MPL/
 #===========================================================
 
 from LibicalWrap import *
diff --git a/src/python/Property.py b/src/python/Property.py
index 430b37aa..4d060e14 100644
--- a/src/python/Property.py
+++ b/src/python/Property.py
@@ -3,19 +3,13 @@
 # FILE: Property.py
 # CREATOR: eric
 #
-# (C) COPYRIGHT 2001, Eric Busboom <eric@civicknowledge.com>
-# (C) COPYRIGHT 2001, Patrick Lewis <plewis@inetarena.com>
+# SPDX-FileCopyrightText: 2001, Eric Busboom <eric@civicknowledge.com>
+# SPDX-FileCopyrightText: 2001, Patrick Lewis <plewis@inetarena.com>
 #
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of either:
+# SPDX-License-Identifier: LGPL-2.1-only OR MPL-2.0
 #
-#   The LGPL as published by the Free Software Foundation, version
-#   2.1, available at: https://www.gnu.org/licenses/lgpl-2.1.txt
 #
-# Or:
 #
-#   The Mozilla Public License Version 2.0. You may obtain a copy of
-#   the License at https://www.mozilla.org/MPL/
 #======================================================================
 
 from LibicalWrap import *
diff --git a/src/python/Store.py b/src/python/Store.py
index 8c6662a2..de47289a 100644
--- a/src/python/Store.py
+++ b/src/python/Store.py
@@ -3,19 +3,13 @@
 # FILE: Store.py
 # CREATOR: eric
 #
-# (C) COPYRIGHT 2001, Eric Busboom <eric@civicknowledge.com>
-# (C) COPYRIGHT 2001, Patrick Lewis <plewis@inetarena.com>
+# SPDX-FileCopyrightText: 2001, Eric Busboom <eric@civicknowledge.com>
+# SPDX-FileCopyrightText: 2001, Patrick Lewis <plewis@inetarena.com>
 #
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of either:
+# SPDX-License-Identifier: LGPL-2.1-only OR MPL-2.0
 #
-#   The LGPL as published by the Free Software Foundation, version
-#   2.1, available at: https://www.gnu.org/licenses/lgpl-2.1.txt
 #
-# Or:
 #
-#   The Mozilla Public License Version 2.0. You may obtain a copy of
-#   the License at https://www.mozilla.org/MPL/
 #======================================================================
 
 from LibicalWrap import *
diff --git a/src/python/Time.py b/src/python/Time.py
index f94770ce..1d20b8bd 100644
--- a/src/python/Time.py
+++ b/src/python/Time.py
@@ -3,19 +3,13 @@
 # FILE: Time.py
 # CREATOR: eric
 #
-# (C) COPYRIGHT 2001, Eric Busboom <eric@civicknowledge.com>
-# (C) COPYRIGHT 2001, Patrick Lewis <plewis@inetarena.com>
+# SPDX-FileCopyrightText: 2001, Eric Busboom <eric@civicknowledge.com>
+# SPDX-FileCopyrightText: 2001, Patrick Lewis <plewis@inetarena.com>
 #
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of either:
+# SPDX-License-Identifier: LGPL-2.1-only OR MPL-2.0
 #
-#   The LGPL as published by the Free Software Foundation, version
-#   2.1, available at: https://www.gnu.org/licenses/lgpl-2.1.txt
 #
-# Or:
 #
-#   The Mozilla Public License Version 2.0. You may obtain a copy of
-#   the License at https://www.mozilla.org/MPL/
 #======================================================================
 
 from LibicalWrap import *
diff --git a/src/python/__init__.py b/src/python/__init__.py
index 0f399441..1fdaee4b 100644
--- a/src/python/__init__.py
+++ b/src/python/__init__.py
@@ -3,19 +3,13 @@
 # FILE: __init__.py
 # CREATOR: glenn
 #
-# (C) COPYRIGHT 2001, Eric Busboom <eric@civicknowledge.com>
-# (C) COPYRIGHT 2001, Patrick Lewis <plewis@inetarena.com>
+# SPDX-FileCopyrightText: 2001, Eric Busboom <eric@civicknowledge.com>
+# SPDX-FileCopyrightText: 2001, Patrick Lewis <plewis@inetarena.com>
 #
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of either:
+# SPDX-License-Identifier: LGPL-2.1-only OR MPL-2.0
 #
-#   The LGPL as published by the Free Software Foundation, version
-#   2.1, available at: https://www.gnu.org/licenses/lgpl-2.1.txt
 #
-# Or:
 #
-#   The Mozilla Public License Version 2.0. You may obtain a copy of
-#   the License at https://www.mozilla.org/MPL/
 #======================================================================
 
 from Libical import *
diff --git a/src/python/test.py b/src/python/test.py
index 2de1fe61..cb4e83ad 100644
--- a/src/python/test.py
+++ b/src/python/test.py
@@ -3,19 +3,13 @@
 # FILE: test.py
 # CREATOR: eric
 #
-# (C) COPYRIGHT 2001, Eric Busboom <eric@civicknowledge.com>
-# (C) COPYRIGHT 2001, Patrick Lewis <plewis@inetarena.com>
+# SPDX-FileCopyrightText: 2001, Eric Busboom <eric@civicknowledge.com>
+# SPDX-FileCopyrightText: 2001, Patrick Lewis <plewis@inetarena.com>
 #
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of either:
+# SPDX-License-Identifier: LGPL-2.1-only OR MPL-2.0
 #
-#   The LGPL as published by the Free Software Foundation, version
-#   2.1, available at: https://www.gnu.org/licenses/lgpl-2.1.txt
 #
-# Or:
 #
-#   The Mozilla Public License Version 2.0. You may obtain a copy of
-#   the License at https://www.mozilla.org/MPL/
 #======================================================================
 
 import LibicalWrap