From f10a24dbbd84cd1696f86ebdd78ab6ba1ef34cfa Mon Sep 17 00:00:00 2001 From: csoler Date: Sat, 19 May 2018 22:03:31 +0200 Subject: [PATCH] fixed bugs in control and copyright --- build_scripts/Debian/debian/control | 12 ++-- build_scripts/Debian/debian/copyright | 86 +++++++++++++---------- build_scripts/Debian/makeSourcePackage.sh | 20 ++++-- 3 files changed, 72 insertions(+), 46 deletions(-) diff --git a/build_scripts/Debian/debian/control b/build_scripts/Debian/debian/control index ccf757edb..78c1ad740 100644 --- a/build_scripts/Debian/debian/control +++ b/build_scripts/Debian/debian/control @@ -11,9 +11,10 @@ Architecture: any Conflicts: Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqt5multimedia5 Description: RetroShare VOIP plugin - This package provides a plugin for RetroShare, a secured Friend-to-Friend communication - plateform. The plugin adds voice-over-IP functionality to the private chat window. Both - friends chatting together need the plugin installed to be able to talk together. + This package provides a plugin for RetroShare, a secured Friend-to-Friend + communication plateform. The plugin adds voice-over-IP functionality to the + private chat window. Both friends chatting together need the plugin installed + to be able to talk together. Package: retroshare-feedreader-plugin Architecture: any @@ -35,7 +36,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring Conflicts: retroshare-nogui Description: Secure communication with friends RetroShare is a Open Source, private and secure decentralised - commmunication platform. It creates mesh of computers linked with TLS connections, - on top of which it provides file transfer, asynchronous email, forums, channels and chat. + commmunication platform. It creates mesh of computers linked with TLS + connections, on top of which it provides file transfer, asynchronous email, + forums, channels and chat. diff --git a/build_scripts/Debian/debian/copyright b/build_scripts/Debian/debian/copyright index 86b489954..4b89afc5e 100644 --- a/build_scripts/Debian/debian/copyright +++ b/build_scripts/Debian/debian/copyright @@ -1,42 +1,54 @@ -This package was debianized by: +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: retroshare +Source: https://github.com/retroshare/retroshare - Cyril Soler on Sat, 19 May 2018 20:15:46 +0100 +Files: * -It was downloaded from: +Upstream Author(s): + Cyril Soler + Robert Fernie - - -Upstream Author(s): - - Cyril Soler - Robert Fernie - -Copyright: - - Copyright (C) 2018 Retroshare Team - -License: - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This package 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -On Debian systems, the complete text of the GNU General -Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'. - -The Debian packaging is: - - Cyril Soler on Sat, 19 May 2018 20:15:46 +0100 - -and is licensed under the GPL version 3, see above. +Upstream-Contact: retroshare.team@gmail.com +Copyright: Copyright 2007-2018 Retroshare Team All rights reserved. +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + . + 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 General Public License for more details. + . + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + . + See /usr/share/common-licenses/GPL-2 on your Debian system. + . + In addition to these license terms, the author grants the following + additional rights: + . + If you modify this program, or any covered work, by linking or + combining it with the OpenSSL project's OpenSSL library (or a + modified version of that library), containing parts covered by the + terms of the OpenSSL or SSLeay licenses, the author + grants you additional permission to convey the resulting work. + Corresponding Source for a non-source form of such a combination + shall include the source code for the parts of OpenSSL used as well + as that of the covered work. + . + You may at your option choose to remove this additional permission from + the work, or from any part of it. + . + It is possible to build this program in a way that it loads OpenSSL + libraries at run-time. If doing so, the following notices are required + by the OpenSSL and SSLeay licenses: + . + This product includes software developed by the OpenSSL Project + for use in the OpenSSL Toolkit. (http://www.openssl.org/) + . + This product includes cryptographic software written by Eric Young + (eay@cryptsoft.com) diff --git a/build_scripts/Debian/makeSourcePackage.sh b/build_scripts/Debian/makeSourcePackage.sh index 87508924a..273030f48 100755 --- a/build_scripts/Debian/makeSourcePackage.sh +++ b/build_scripts/Debian/makeSourcePackage.sh @@ -124,8 +124,13 @@ if ! test "${nodl}" = "yes"; then # remove unised qml code, only needed on Android rm -rf ${workdir}/src/retroshare-qml-app/ rm -rf ${workdir}/src/build_scripts/ - rm ${workdir}/debian/*~ - rm ${workdir}/debian/.*.sw? + rm -f ${workdir}/debian/*~ + rm -f ${workdir}/debian/.*.sw? + rm -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/images.sh + rm -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble/src/images.sh + rm -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble/public/images.sh + rm -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble/"history"/images.sh + rm -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble/private/images.sh cd ${workdir} echo Setting version numbers... @@ -150,8 +155,15 @@ else tar zxvf retroshare_${version_number}.orig.tar.gz cp -r debian/* ${workdir}/debian/ - rm ${workdir}/debian/*~ - rm ${workdir}/debian/.*.sw? + rm -rf ${workdir}/src/retroshare-qml-app/ + rm -rf ${workdir}/src/build_scripts/ + rm -f ${workdir}/debian/*~ + rm -f ${workdir}/debian/.*.sw? + rm -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/images.sh + rm -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble/src/images.sh + rm -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble/public/images.sh + rm -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble/"history"/images.sh + rm -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble/private/images.sh fi # Cloning sqlcipher