From 9e93ccea63f0e61fb7c5a7a4050e4ef5201e4595 Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 4 Nov 2018 15:48:33 +0100 Subject: [PATCH 1/2] fixed licenses in FeedReader --- src/openpgpsdk.pro | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/openpgpsdk.pro b/src/openpgpsdk.pro index 40bdfca..05d95af 100644 --- a/src/openpgpsdk.pro +++ b/src/openpgpsdk.pro @@ -1,3 +1,21 @@ +################################################################################ +# openpgpsdk.pro # +# Copyright (C) 2018, Retroshare team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU Affero General Public License as # +# published by the Free Software Foundation, either version 3 of the # +# License, or (at your option) any later version. # +# # +# This program 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. # +# # +# You should have received a copy of the GNU Lesser General Public License # +# along with this program. If not, see . # +################################################################################ + !include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri") TEMPLATE = lib From 222dd8364fe6ceccc8444353832c4d3a44179ca3 Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 11 Nov 2018 11:21:34 +0100 Subject: [PATCH 2/2] moved qmake files in openpgpsdk to Apache-2.0 --- src/openpgpsdk.pro | 36 +++++++++++++++++++----------------- src/use_openpgpsdk.pri | 37 ++++++++++++++++++++----------------- 2 files changed, 39 insertions(+), 34 deletions(-) diff --git a/src/openpgpsdk.pro b/src/openpgpsdk.pro index 05d95af..0be5871 100644 --- a/src/openpgpsdk.pro +++ b/src/openpgpsdk.pro @@ -1,21 +1,23 @@ -################################################################################ -# openpgpsdk.pro # -# Copyright (C) 2018, Retroshare team # +# +# Copyright (C) 2018, Retroshare team +# All rights reserved. +# Contributors: retroshare team. The Contributors have asserted +# their moral rights under the UK Copyright Design and Patents Act 1988 to +# be recorded as the authors of this copyright work. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may not +# use this file except in compliance with the License. +# +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# +# See the License for the specific language governing permissions and +# limitations under the License. # # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU Affero General Public License as # -# published by the Free Software Foundation, either version 3 of the # -# License, or (at your option) any later version. # -# # -# This program 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. # -# # -# You should have received a copy of the GNU Lesser General Public License # -# along with this program. If not, see . # -################################################################################ - !include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri") TEMPLATE = lib diff --git a/src/use_openpgpsdk.pri b/src/use_openpgpsdk.pri index 800781a..ab66fb4 100644 --- a/src/use_openpgpsdk.pri +++ b/src/use_openpgpsdk.pri @@ -1,20 +1,23 @@ -################################################################################ -# use_openpgpsdk.pri # -# Copyright (C) 2018, Retroshare team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU Lesser General Public License as # -# published by the Free Software Foundation, either version 3 of the # -# License, or (at your option) any later version. # -# # -# This program 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. # -# # -# You should have received a copy of the GNU Lesser General Public License # -# along with this program. If not, see . # -################################################################################ +# +# Copyright (C) 2018, Retroshare team +# All rights reserved. +# Contributors: retroshare team. The Contributors have asserted +# their moral rights under the UK Copyright Design and Patents Act 1988 to +# be recorded as the authors of this copyright work. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may not +# use this file except in compliance with the License. +# +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# +# See the License for the specific language governing permissions and +# limitations under the License. +# DEPENDPATH *= $$system_path($$clean_path($${PWD}/../../openpgpsdk/src)) INCLUDEPATH *= $$system_path($$clean_path($${PWD}/../../openpgpsdk/src)) LIBS *= -L$$system_path($$clean_path($${OUT_PWD}/../../openpgpsdk/src/lib/)) -lops