diff --git a/license.bsd b/license.bsd new file mode 100644 index 0000000..636476d --- /dev/null +++ b/license.bsd @@ -0,0 +1,24 @@ +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * 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. + * Neither the name of the copyright holder 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 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN 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. diff --git a/rpm/nemo-qml-plugin-dbus-qt5.spec b/rpm/nemo-qml-plugin-dbus-qt5.spec index fda9ee4..7e1aa39 100644 --- a/rpm/nemo-qml-plugin-dbus-qt5.spec +++ b/rpm/nemo-qml-plugin-dbus-qt5.spec @@ -68,6 +68,7 @@ sed 's/Nemo.DBus/org.nemomobile.dbus/' < src/plugin/qmldir > %{buildroot}%{_libd %{_libdir}/qt5/qml/Nemo/DBus/qmldir %{_libdir}/qt5/qml/Nemo/DBus/plugins.qmltypes %license license.lgpl +%license license.bsd # org.nemomobile.dbus legacy import %dir %{_libdir}/qt5/qml/org/nemomobile/dbus diff --git a/src/nemo-dbus/connection.cpp b/src/nemo-dbus/connection.cpp index 99d5e82..919da70 100644 --- a/src/nemo-dbus/connection.cpp +++ b/src/nemo-dbus/connection.cpp @@ -13,7 +13,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Nemo Mobile nor the names of its contributors + * * Neither the name of the copyright holder nor the names of its contributors * may be used to endorse or promote products derived from this * software without specific prior written permission. * diff --git a/src/nemo-dbus/connection.h b/src/nemo-dbus/connection.h index c3f9da4..8c74d3b 100644 --- a/src/nemo-dbus/connection.h +++ b/src/nemo-dbus/connection.h @@ -13,7 +13,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Nemo Mobile nor the names of its contributors + * * Neither the name of the copyright holder nor the names of its contributors * may be used to endorse or promote products derived from this * software without specific prior written permission. * diff --git a/src/nemo-dbus/dbus.cpp b/src/nemo-dbus/dbus.cpp index 3674cf1..a765d41 100644 --- a/src/nemo-dbus/dbus.cpp +++ b/src/nemo-dbus/dbus.cpp @@ -13,7 +13,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Nemo Mobile nor the names of its contributors + * * Neither the name of the copyright holder nor the names of its contributors * may be used to endorse or promote products derived from this * software without specific prior written permission. * diff --git a/src/nemo-dbus/dbus.h b/src/nemo-dbus/dbus.h index 5f3730d..7ea53ca 100644 --- a/src/nemo-dbus/dbus.h +++ b/src/nemo-dbus/dbus.h @@ -13,7 +13,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Nemo Mobile nor the names of its contributors + * * Neither the name of the copyright holder nor the names of its contributors * may be used to endorse or promote products derived from this * software without specific prior written permission. * diff --git a/src/nemo-dbus/global.h b/src/nemo-dbus/global.h index 0f9f02c..1a82ce6 100644 --- a/src/nemo-dbus/global.h +++ b/src/nemo-dbus/global.h @@ -13,7 +13,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Nemo Mobile nor the names of its contributors + * * Neither the name of the copyright holder nor the names of its contributors * may be used to endorse or promote products derived from this * software without specific prior written permission. * diff --git a/src/nemo-dbus/interface.cpp b/src/nemo-dbus/interface.cpp index a8c602a..7281f8c 100644 --- a/src/nemo-dbus/interface.cpp +++ b/src/nemo-dbus/interface.cpp @@ -13,7 +13,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Nemo Mobile nor the names of its contributors + * * Neither the name of the copyright holder nor the names of its contributors * may be used to endorse or promote products derived from this * software without specific prior written permission. * diff --git a/src/nemo-dbus/interface.h b/src/nemo-dbus/interface.h index f18b929..3cb1722 100644 --- a/src/nemo-dbus/interface.h +++ b/src/nemo-dbus/interface.h @@ -13,7 +13,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Nemo Mobile nor the names of its contributors + * * Neither the name of the copyright holder nor the names of its contributors * may be used to endorse or promote products derived from this * software without specific prior written permission. * diff --git a/src/nemo-dbus/logging.cpp b/src/nemo-dbus/logging.cpp index 6a460d6..ea46666 100644 --- a/src/nemo-dbus/logging.cpp +++ b/src/nemo-dbus/logging.cpp @@ -13,7 +13,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Nemo Mobile nor the names of its contributors + * * Neither the name of the copyright holder nor the names of its contributors * may be used to endorse or promote products derived from this * software without specific prior written permission. * diff --git a/src/nemo-dbus/logging.h b/src/nemo-dbus/logging.h index aca8bbd..6d49d89 100644 --- a/src/nemo-dbus/logging.h +++ b/src/nemo-dbus/logging.h @@ -13,7 +13,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Nemo Mobile nor the names of its contributors + * * Neither the name of the copyright holder nor the names of its contributors * may be used to endorse or promote products derived from this * software without specific prior written permission. * diff --git a/src/nemo-dbus/object.cpp b/src/nemo-dbus/object.cpp index 10d5de3..7c217e9 100644 --- a/src/nemo-dbus/object.cpp +++ b/src/nemo-dbus/object.cpp @@ -13,7 +13,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Nemo Mobile nor the names of its contributors + * * Neither the name of the copyright holder nor the names of its contributors * may be used to endorse or promote products derived from this * software without specific prior written permission. * diff --git a/src/nemo-dbus/object.h b/src/nemo-dbus/object.h index bfe88a5..145709c 100644 --- a/src/nemo-dbus/object.h +++ b/src/nemo-dbus/object.h @@ -13,7 +13,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Nemo Mobile nor the names of its contributors + * * Neither the name of the copyright holder nor the names of its contributors * may be used to endorse or promote products derived from this * software without specific prior written permission. * diff --git a/src/nemo-dbus/private/connectiondata.h b/src/nemo-dbus/private/connectiondata.h index b26023e..4154c19 100644 --- a/src/nemo-dbus/private/connectiondata.h +++ b/src/nemo-dbus/private/connectiondata.h @@ -13,7 +13,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Nemo Mobile nor the names of its contributors + * * Neither the name of the copyright holder nor the names of its contributors * may be used to endorse or promote products derived from this * software without specific prior written permission. * diff --git a/src/nemo-dbus/private/propertychanges.cpp b/src/nemo-dbus/private/propertychanges.cpp index f2c7e0f..7d2c7c9 100644 --- a/src/nemo-dbus/private/propertychanges.cpp +++ b/src/nemo-dbus/private/propertychanges.cpp @@ -13,7 +13,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Nemo Mobile nor the names of its contributors + * * Neither the name of the copyright holder nor the names of its contributors * may be used to endorse or promote products derived from this * software without specific prior written permission. * diff --git a/src/nemo-dbus/private/propertychanges.h b/src/nemo-dbus/private/propertychanges.h index 36a895e..5969f82 100644 --- a/src/nemo-dbus/private/propertychanges.h +++ b/src/nemo-dbus/private/propertychanges.h @@ -13,7 +13,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Nemo Mobile nor the names of its contributors + * * Neither the name of the copyright holder nor the names of its contributors * may be used to endorse or promote products derived from this * software without specific prior written permission. * diff --git a/src/nemo-dbus/response.cpp b/src/nemo-dbus/response.cpp index 713a248..8abf094 100644 --- a/src/nemo-dbus/response.cpp +++ b/src/nemo-dbus/response.cpp @@ -13,7 +13,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Nemo Mobile nor the names of its contributors + * * Neither the name of the copyright holder nor the names of its contributors * may be used to endorse or promote products derived from this * software without specific prior written permission. * diff --git a/src/nemo-dbus/response.h b/src/nemo-dbus/response.h index ceceb86..658f2d1 100644 --- a/src/nemo-dbus/response.h +++ b/src/nemo-dbus/response.h @@ -13,7 +13,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Nemo Mobile nor the names of its contributors + * * Neither the name of the copyright holder nor the names of its contributors * may be used to endorse or promote products derived from this * software without specific prior written permission. * diff --git a/src/plugin/plugin.cpp b/src/plugin/plugin.cpp index 13a7d5d..60a983c 100644 --- a/src/plugin/plugin.cpp +++ b/src/plugin/plugin.cpp @@ -1,34 +1,25 @@ -/* - * Copyright (C) 2013 Jolla Ltd. - * Contact: Robin Burchell - * - * You may use this file under the terms of the BSD license as follows: - * - * "Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * 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. - * * Neither the name of Nemo Mobile 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 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN 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." - */ +/**************************************************************************************** +** +** Copyright (C) 2013-2018 Jolla Ltd. +** All rights reserved. +** +** You may use this file under the terms of the GNU Lesser General +** Public License version 2.1 as published by the Free Software Foundation +** and appearing in the file license.lgpl included in the packaging +** of this file. +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation +** and appearing in the file license.lgpl included in the packaging +** of this file. +** +** This library 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 +** Lesser General Public License for more details. +** +****************************************************************************************/ #include