Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

more license fixes and updated version in Debian control files

Browse Source
This commit is contained in:
csoler 2018-12-27 15:47:58 +01:00
parent bc3a71d3f5
commit d9683459d6
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
5 changed files with 78 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_scripts/Debian/debian/changelog
View File

@ -1,4 +1,4 @@
retroshare (0.6.4-1) UNRELEASED; urgency=medium
retroshare (0.6.5-1) UNRELEASED; urgency=medium
* Initial release for Debian. (Closes: #659069)

28
build_scripts/Debian/debian/control
View File

@ -6,20 +6,20 @@ Build-Depends: debhelper (>= 10), libglib2.0-dev, libupnp-dev, libssl-dev, libx
Standards-Version: 4.1.4
Homepage: http://retroshare.sourceforge.net
Package: retroshare-voip-plugin
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqt5multimedia5
Description: VOIP plugin for the Retroshare communication platform
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
Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare
Description: FeedReader plugin for the Retroshare communication platform
Plugin for Retroshare, adding a RSS feed reader tab to retroshare.
# Package: retroshare-voip-plugin
# Architecture: any
# Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqt5multimedia5
# Description: VOIP plugin for the Retroshare communication platform
# 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
# Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare
# Description: FeedReader plugin for the Retroshare communication platform
# Plugin for Retroshare, adding a RSS feed reader tab to retroshare.
Package: retroshare-nogui
Architecture: any

88
build_scripts/Debian/makeSourcePackage.sh
View File

@ -1,15 +1,15 @@
#!/bin/sh
###################### PARAMETERS ####################
gitpath="https://github.com/RetroShare/RetroShare.git"
gitpath="https://github.com/csoler/RetroShare.git"
#branch="master"
branch="v0.6.4-official_release"
branch="v0.6.5-DebianPackaging"
#bubba3="Y" # comment out to compile for bubba3
######################################################
RS_MAJOR_VERSION=`fgrep RS_MAJOR_VERSION ../../libretroshare/src/retroshare/rsversion.h | cut -d\\ -f3- | sed -e s\/\ \/\/g | cut -c1`
RS_MINOR_VERSION=`fgrep RS_MINOR_VERSION ../../libretroshare/src/retroshare/rsversion.h | cut -d\\ -f3- | sed -e s\/\ \/\/g | cut -c1`
RS_BUILD_NUMBER=`fgrep RS_BUILD_NUMBER ../../libretroshare/src/retroshare/rsversion.h | grep -v BUILD_NUMBER_ADD | cut -d\\ -f3- | sed -e s\/\ \/\/g | cut -c1`
RS_MAJOR_VERSION=0
RS_MINOR_VERSION=6
RS_BUILD_NUMBER=5
# echo "RS_MAJOR_VERSION="${RS_MAJOR_VERSION}
# echo "RS_MINOR_VERSION="${RS_MINOR_VERSION}
@ -22,7 +22,7 @@ echo This script is going to build the debian source package for RetroShare, fro
if test -d "${workdir}" ; then
echo Removing the ${workdir} directory...
rm -rf ${workdir}
rm -i -rf ${workdir}
fi
# Parse options
@ -33,7 +33,7 @@ gpgkey="0932399B"
date=`git log --pretty=format:"%ai" | head -1 | cut -d\ -f1 | sed -e s/-//g`
time=`git log --pretty=format:"%aD" | head -1 | cut -d\ -f5 | sed -e s/://g`
hhsh=`git log --pretty=format:"%H" | head -1 | cut -c1-8`
hhsh=`git log --pretty=format:"%H" | head -1 | cut -c1-8`
rev=${date}.${hhsh}
useretrotor="false"
@ -68,13 +68,44 @@ while [ ${#} -gt 0 ]; do
esac
done
removeIrrelevantFiles() {
echo Removing irrelevant files in directory ${workdir}...
# remove unised qml code, only needed on Android
rm -i -rf ${workdir}/src/retroshare-qml-app/
rm -i -rf ${workdir}/src/librssimulator/
rm -i -rf ${workdir}/src/libretroshare/tests/
rm -i -rf ${workdir}/src/libretroshare/unfinished/
rm -i -rf ${workdir}/src/libretroshare/unused/
rm -i -rf ${workdir}/src/retroshare-android-notify-service/
rm -i -rf ${workdir}/src/retroshare-android-service/
rm -i -rf ${workdir}/src/libretroshare/src/unused/
rm -i -rf ${workdir}/src/supportlibs/
rm -i -rf ${workdir}/src/retroshare-service/
rm -i -rf ${workdir}/src/plugins/
rm -i -rf ${workdir}/src/unittests/
rm -i -rf ${workdir}/src/tests/
rm -i -rf ${workdir}/src/build_scripts/
rm -i -rf ${workdir}/src/libbitdht/src/tests/
rm -i -rf ${workdir}/src/libbitdht/src/example/
rm -i -f ${workdir}/debian/*~
rm -i -f ${workdir}/debian/.*.sw?
rm -i -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/images.sh
rm -i -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble/src/images.sh
rm -i -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble/public/images.sh
rm -i -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble/"history"/images.sh
rm -i -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble/private/images.sh
}
echo Attempting to get revision number...
ccount=`git rev-list --count --all`
ccount=`expr $ccount + 8613 - 8267`
gitrev=`git describe | cut -d- -f2-3`
echo " Workdir :"${workdir}
echo " Version :"${version_number}
echo " Using revision :"${rev}
echo " Git Revision :"${gitrev}
echo " Commit count :"${ccount}
echo " Hash :"${hhsh}
echo " Date :"${date}
@ -121,36 +152,18 @@ if ! test "${nodl}" = "yes"; then
# VOIP tweak
cp ${workdir}/src/retroshare-gui/src/gui/chat/PopupChatDialog.ui ${workdir}/src/plugins/VOIP/gui/PopupChatDialog.ui
# remove unised qml code, only needed on Android
rm -rf ${workdir}/src/retroshare-qml-app/
rm -rf ${workdir}/src/librssimulator/
rm -rf ${workdir}/src/libretroshare/tests/
rm -rf ${workdir}/src/libretroshare/unfinished/
rm -rf ${workdir}/src/libretroshare/unused/
rm -rf ${workdir}/src/retroshare-android-notify-service/
rm -rf ${workdir}/src/retroshare-android-service/
rm -rf ${workdir}/src/libretroshare/src/unused/
rm -rf ${workdir}/src/pegmarkdown/
rm -rf ${workdir}/src/unittests/
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
removeIrrelevantFiles
cd ${workdir}
echo Setting version numbers...
# setup version numbers
sed -e "s%RS_REVISION_NUMBER.*%RS_REVISION_NUMBER 0x${hhsh}%" src/libretroshare/src/retroshare/rsversion.in > src/libretroshare/src/retroshare/rsversion.h
# sed -e "s%RS_REVISION_NUMBER.*%RS_REVISION_NUMBER 0x${hhsh}%" src/libretroshare/src/retroshare/rsversion.in > src/libretroshare/src/retroshare/rsversion.h
# Various cleaning
echo Cleaning...
\rm -rf src/.git
\rm -i -rf src/.git
if test "${makeorig}" = "yes" ; then
echo making orig archive
@ -164,24 +177,7 @@ else
tar zxvf retroshare_${version_number}.orig.tar.gz
cp -r debian/* ${workdir}/debian/
rm -rf ${workdir}/src/retroshare-qml-app/
rm -rf ${workdir}/src/librssimulator/
rm -rf ${workdir}/src/libretroshare/tests/
rm -rf ${workdir}/src/libretroshare/unfinished/
rm -rf ${workdir}/src/libretroshare/unused/
rm -rf ${workdir}/src/retroshare-android-notify-service/
rm -rf ${workdir}/src/retroshare-android-service/
rm -rf ${workdir}/src/libretroshare/src/unused/
rm -rf ${workdir}/src/pegmarkdown/
rm -rf ${workdir}/src/unittests/
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
removeIrrelevantFiles
fi
# Cloning sqlcipher

45
libbitdht/src/udp/udpproxylayer.h
View File

@ -1,31 +1,26 @@
/*******************************************************************************
* libbitdht/src/udp/udpproxylayer.h *
* *
* Copyright 2004 by Robert Fernie <bitdht@lunamutt.com> *
* *
* 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 Affero General Public License for more details. *
* *
* You should have received a copy of the GNU Affero General Public License *
* along with this program. If not, see <https://www.gnu.org/licenses/>. *
* *
*******************************************************************************/
#ifndef BITDHT_UDP_LAYER_H
#define BITDHT_UDP_LAYER_H
/*
* udp/udplayer.h
*
* BitDHT: An Flexible DHT library.
*
* Copyright 2004-2010 by Robert Fernie
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License Version 3 as published by the Free Software Foundation.
*
* 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
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA.
*
* Please report all bugs and problems to "bitdht@lunamutt.com".
*
*/
#include "util/bdthreads.h"
#include "util/bdnet.h"

7
libresapi/src/webui-src/app/_reset.scss
View File

@ -1,8 +1,3 @@
/* http://meyerweb.com/eric/tools/css/reset/
v2.0 | 20110126
License: none (public domain)
*/
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
@ -45,4 +40,4 @@ q:before, q:after {
table {
border-collapse: collapse;
border-spacing: 0;
}
}