From 7d8b7077ef55da4d1a629ef479966974aac12e38 Mon Sep 17 00:00:00 2001 From: Slava Monich Date: Wed, 19 Jan 2022 13:59:50 +0200 Subject: [PATCH] [license] Unified and freshened up licenses. JB#55991 --- LICENSE | 3 ++- debian/copyright | 3 ++- include/mce_battery.h | 8 ++++++-- include/mce_charger.h | 8 ++++++-- include/mce_display.h | 10 +++++----- include/mce_log.h | 10 +++++----- include/mce_tklock.h | 10 +++++----- include/mce_types.h | 10 +++++----- src/mce_battery.c | 8 ++++++-- src/mce_charger.c | 8 ++++++-- src/mce_display.c | 10 +++++----- src/mce_log_p.h | 10 +++++----- src/mce_proxy.c | 4 ++-- src/mce_proxy.h | 8 ++++---- src/mce_tklock.c | 10 +++++----- src/mce_types_p.h | 8 ++++---- 16 files changed, 73 insertions(+), 55 deletions(-) diff --git a/LICENSE b/LICENSE index 15359ad..b5b9b8c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,5 @@ -Copyright (C) 2016-2021 Jolla Ltd. +Copyright (C) 2016-2022 Jolla Ltd. +Copyright (C) 2016-2022 Slava Monich You may use this file under the terms of BSD license as follows: diff --git a/debian/copyright b/debian/copyright index 15359ad..b5b9b8c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,5 @@ -Copyright (C) 2016-2021 Jolla Ltd. +Copyright (C) 2016-2022 Jolla Ltd. +Copyright (C) 2016-2022 Slava Monich You may use this file under the terms of BSD license as follows: diff --git a/include/mce_battery.h b/include/mce_battery.h index f3cd3f8..e2ec595 100644 --- a/include/mce_battery.h +++ b/include/mce_battery.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2019 Jolla Ltd. - * Copyright (C) 2019 Slava Monich + * Copyright (C) 2019-2022 Jolla Ltd. + * Copyright (C) 2019-2022 Slava Monich * * You may use this file under the terms of BSD license as follows: * @@ -28,6 +28,10 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation + * are those of the authors and should not be interpreted as representing + * any official policies, either expressed or implied. */ #ifndef MCE_BATTERY_H diff --git a/include/mce_charger.h b/include/mce_charger.h index fba952d..1ca0a6f 100644 --- a/include/mce_charger.h +++ b/include/mce_charger.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2019 Jolla Ltd. - * Copyright (C) 2019 Slava Monich + * Copyright (C) 2019-2022 Jolla Ltd. + * Copyright (C) 2019-2022 Slava Monich * * You may use this file under the terms of BSD license as follows: * @@ -28,6 +28,10 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation + * are those of the authors and should not be interpreted as representing + * any official policies, either expressed or implied. */ #ifndef MCE_CHARGER_H diff --git a/include/mce_display.h b/include/mce_display.h index 7a8c496..f5dc24e 100644 --- a/include/mce_display.h +++ b/include/mce_display.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2016-2017 Jolla Ltd. - * Contact: Slava Monich + * Copyright (C) 2016-2022 Jolla Ltd. + * Copyright (C) 2016-2022 Slava Monich * * You may use this file under the terms of BSD license as follows: * @@ -13,9 +13,9 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Jolla Ltd nor the names of its contributors may - * be used to endorse or promote products derived from this software - * without specific prior written permission. + * 3. Neither the names of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE diff --git a/include/mce_log.h b/include/mce_log.h index d4351c9..bcad793 100644 --- a/include/mce_log.h +++ b/include/mce_log.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2016 Jolla Ltd. - * Contact: Slava Monich + * Copyright (C) 2016-2022 Jolla Ltd. + * Copyright (C) 2016-2022 Slava Monich * * You may use this file under the terms of BSD license as follows: * @@ -13,9 +13,9 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Jolla Ltd nor the names of its contributors may - * be used to endorse or promote products derived from this software - * without specific prior written permission. + * 3. Neither the names of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE diff --git a/include/mce_tklock.h b/include/mce_tklock.h index c5aad6e..7018626 100644 --- a/include/mce_tklock.h +++ b/include/mce_tklock.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2016-2017 Jolla Ltd. - * Contact: Slava Monich + * Copyright (C) 2016-2022 Jolla Ltd. + * Copyright (C) 2016-2022 Slava Monich * * You may use this file under the terms of BSD license as follows: * @@ -13,9 +13,9 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Jolla Ltd nor the names of its contributors may - * be used to endorse or promote products derived from this software - * without specific prior written permission. + * 3. Neither the names of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE diff --git a/include/mce_types.h b/include/mce_types.h index 5515a4f..5725947 100644 --- a/include/mce_types.h +++ b/include/mce_types.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2016 Jolla Ltd. - * Contact: Slava Monich + * Copyright (C) 2016-2022 Jolla Ltd. + * Copyright (C) 2016-2022 Slava Monich * * You may use this file under the terms of BSD license as follows: * @@ -13,9 +13,9 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Jolla Ltd nor the names of its contributors may - * be used to endorse or promote products derived from this software - * without specific prior written permission. + * 3. Neither the names of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE diff --git a/src/mce_battery.c b/src/mce_battery.c index 011773b..eada639 100644 --- a/src/mce_battery.c +++ b/src/mce_battery.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2019 Jolla Ltd. - * Copyright (C) 2019 Slava Monich + * Copyright (C) 2019-2022 Jolla Ltd. + * Copyright (C) 2019-2022 Slava Monich * * You may use this file under the terms of BSD license as follows: * @@ -28,6 +28,10 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation + * are those of the authors and should not be interpreted as representing + * any official policies, either expressed or implied. */ #include "mce_battery.h" diff --git a/src/mce_charger.c b/src/mce_charger.c index 963c591..8cb39b2 100644 --- a/src/mce_charger.c +++ b/src/mce_charger.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2019 Jolla Ltd. - * Copyright (C) 2019 Slava Monich + * Copyright (C) 2019-2022 Jolla Ltd. + * Copyright (C) 2019-2022 Slava Monich * * You may use this file under the terms of BSD license as follows: * @@ -28,6 +28,10 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation + * are those of the authors and should not be interpreted as representing + * any official policies, either expressed or implied. */ #include "mce_charger.h" diff --git a/src/mce_display.c b/src/mce_display.c index f54cc05..7a7924a 100644 --- a/src/mce_display.c +++ b/src/mce_display.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2016 Jolla Ltd. - * Contact: Slava Monich + * Copyright (C) 2016-2022 Jolla Ltd. + * Copyright (C) 2016-2022 Slava Monich * * You may use this file under the terms of BSD license as follows: * @@ -13,9 +13,9 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Jolla Ltd nor the names of its contributors may - * be used to endorse or promote products derived from this software - * without specific prior written permission. + * 3. Neither the names of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE diff --git a/src/mce_log_p.h b/src/mce_log_p.h index 4f688fc..ea4efd3 100644 --- a/src/mce_log_p.h +++ b/src/mce_log_p.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2016 Jolla Ltd. - * Contact: Slava Monich + * Copyright (C) 2016-2022 Jolla Ltd. + * Copyright (C) 2016-2022 Slava Monich * * You may use this file under the terms of BSD license as follows: * @@ -13,9 +13,9 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Jolla Ltd nor the names of its contributors may - * be used to endorse or promote products derived from this software - * without specific prior written permission. + * 3. Neither the names of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE diff --git a/src/mce_proxy.c b/src/mce_proxy.c index 21dc043..e3c39b4 100644 --- a/src/mce_proxy.c +++ b/src/mce_proxy.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2016-2020 Jolla Ltd. - * Copyright (C) 2016-2020 Slava Monich + * Copyright (C) 2016-2022 Jolla Ltd. + * Copyright (C) 2016-2022 Slava Monich * * You may use this file under the terms of BSD license as follows: * diff --git a/src/mce_proxy.h b/src/mce_proxy.h index f8f0ee9..55bb3c8 100644 --- a/src/mce_proxy.h +++ b/src/mce_proxy.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2016-2020 Jolla Ltd. - * Copyright (C) 2016-2020 Slava Monich + * Copyright (C) 2016-2022 Jolla Ltd. + * Copyright (C) 2016-2022 Slava Monich * * You may use this file under the terms of BSD license as follows: * @@ -14,8 +14,8 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the names of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE diff --git a/src/mce_tklock.c b/src/mce_tklock.c index 7bce653..dac4bca 100644 --- a/src/mce_tklock.c +++ b/src/mce_tklock.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2016-2017 Jolla Ltd. - * Contact: Slava Monich + * Copyright (C) 2016-2022 Jolla Ltd. + * Copyright (C) 2016-2022 Slava Monich * * You may use this file under the terms of BSD license as follows: * @@ -13,9 +13,9 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Jolla Ltd nor the names of its contributors may - * be used to endorse or promote products derived from this software - * without specific prior written permission. + * 3. Neither the names of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE diff --git a/src/mce_types_p.h b/src/mce_types_p.h index 5945069..1df72af 100644 --- a/src/mce_types_p.h +++ b/src/mce_types_p.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2020 Jolla Ltd. - * Copyright (C) 2020 Slava Monich + * Copyright (C) 2020-2022 Jolla Ltd. + * Copyright (C) 2020-2022 Slava Monich * * You may use this file under the terms of BSD license as follows: * @@ -14,8 +14,8 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the names of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE