fixed bugs in control and copyright

This commit is contained in:
csoler 2018-05-19 22:03:31 +02:00
parent d7340fe400
commit f10a24dbbd
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
3 changed files with 72 additions and 46 deletions

View File

@ -11,9 +11,10 @@ Architecture: any
Conflicts: Conflicts:
Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqt5multimedia5 Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqt5multimedia5
Description: RetroShare VOIP plugin Description: RetroShare VOIP plugin
This package provides a plugin for RetroShare, a secured Friend-to-Friend communication This package provides a plugin for RetroShare, a secured Friend-to-Friend
plateform. The plugin adds voice-over-IP functionality to the private chat window. Both communication plateform. The plugin adds voice-over-IP functionality to the
friends chatting together need the plugin installed to be able to talk together. private chat window. Both friends chatting together need the plugin installed
to be able to talk together.
Package: retroshare-feedreader-plugin Package: retroshare-feedreader-plugin
Architecture: any Architecture: any
@ -35,7 +36,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring
Conflicts: retroshare-nogui Conflicts: retroshare-nogui
Description: Secure communication with friends Description: Secure communication with friends
RetroShare is a Open Source, private and secure decentralised RetroShare is a Open Source, private and secure decentralised
commmunication platform. It creates mesh of computers linked with TLS connections, commmunication platform. It creates mesh of computers linked with TLS
on top of which it provides file transfer, asynchronous email, forums, channels and chat. connections, on top of which it provides file transfer, asynchronous email,
forums, channels and chat.

View File

@ -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 <csoler@sourceforge.net> on Sat, 19 May 2018 20:15:46 +0100 Files: *
It was downloaded from:
<url://retroshare.net>
Upstream Author(s): Upstream Author(s):
Cyril Soler <csoler@users.sourceforge.net>
Cyril Soler <csoler@sourceforge.net>
Robert Fernie <retroshare@lunamutt.com> Robert Fernie <retroshare@lunamutt.com>
Copyright: Upstream-Contact: retroshare.team@gmail.com
Copyright: Copyright 2007-2018 Retroshare Team All rights reserved.
Copyright (C) 2018 Retroshare Team License: GPL-2+
This program is free software; you can redistribute it and/or modify
License: it under the terms of the GNU General Public License version 2 as
published by the Free Software Foundation.
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 This program is distributed in the hope that it will be useful,
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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License along
along with this program. If not, see <http://www.gnu.org/licenses/>. with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
On Debian systems, the complete text of the GNU General .
Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'. See /usr/share/common-licenses/GPL-2 on your Debian system.
.
The Debian packaging is: In addition to these license terms, the author grants the following
additional rights:
Cyril Soler <csoler@sourceforge.net> on Sat, 19 May 2018 20:15:46 +0100 .
If you modify this program, or any covered work, by linking or
and is licensed under the GPL version 3, see above. 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)

View File

@ -124,8 +124,13 @@ if ! test "${nodl}" = "yes"; then
# remove unised qml code, only needed on Android # remove unised qml code, only needed on Android
rm -rf ${workdir}/src/retroshare-qml-app/ rm -rf ${workdir}/src/retroshare-qml-app/
rm -rf ${workdir}/src/build_scripts/ rm -rf ${workdir}/src/build_scripts/
rm ${workdir}/debian/*~ rm -f ${workdir}/debian/*~
rm ${workdir}/debian/.*.sw? 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} cd ${workdir}
echo Setting version numbers... echo Setting version numbers...
@ -150,8 +155,15 @@ else
tar zxvf retroshare_${version_number}.orig.tar.gz tar zxvf retroshare_${version_number}.orig.tar.gz
cp -r debian/* ${workdir}/debian/ cp -r debian/* ${workdir}/debian/
rm ${workdir}/debian/*~ rm -rf ${workdir}/src/retroshare-qml-app/
rm ${workdir}/debian/.*.sw? 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 fi
# Cloning sqlcipher # Cloning sqlcipher