Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-24 06:59:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed dependencies

Browse Source
This commit is contained in:
csoler 2017-12-31 18:15:19 +01:00
parent da5253059a
commit 6feb1bc0ec
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
build_scripts/Debian+Ubuntu/makeSourcePackage.sh
View File

@ -36,7 +36,7 @@ while [ ${#} -gt 0 ]; do
shift shift
;; ;;
"-retrotor") shift "-retrotor") shift
useretrotor="true" useretrotor="true"
;; ;;
"-distribution") shift "-distribution") shift
dist=${1} dist=${1}
@ -58,6 +58,11 @@ while [ ${#} -gt 0 ]; do
esac esac
done done
if test "${useretrotor}" = "true"; then
gitpath="https://github.com/csoler/RetroShare.git"
branch="v0.6-TorOnly"
fi
if test "${dist}" = "" ; then if test "${dist}" = "" ; then
dist="precise trusty xenial zesty artful" dist="precise trusty xenial zesty artful"
fi fi
@ -91,7 +96,7 @@ echo Extracting base archive...
mkdir -p ${workdir}/src mkdir -p ${workdir}/src
echo Checking out latest snapshot... echo Checking out latest snapshot...
cd ${workdir}/src cd ${workdir}/src
git clone --depth 1 https://github.com/RetroShare/RetroShare.git --single-branch --branch $branch . git clone --depth 1 ${gitpath} --single-branch --branch $branch .
# if ! test "$hhsh" = "" ; then # if ! test "$hhsh" = "" ; then
# echo Checking out revision $hhsh # echo Checking out revision $hhsh
@ -131,15 +136,14 @@ for i in ${dist}; do
if test ${useretrotor} = "true"; then if test ${useretrotor} = "true"; then
cp ../rules.retrotor debian/rules cp ../rules.retrotor debian/rules
fi cp ../control.trusty_retrotor debian/control
elif test -f ../control."${i}" ; then
if test -f ../control."${i}" ; then
echo \/\!\\ Using specific control file for distribution "${i}" echo \/\!\\ Using specific control file for distribution "${i}"
cp ../control."${i}" debian/control cp ../control."${i}" debian/control
else else
echo Using standard control file control."${i}" for distribution "${i}" echo Using standard control file control."${i}" for distribution "${i}"
cp ../debian/control debian/control cp ../debian/control debian/control
fi fi
debuild -S -k${gpgkey} debuild -S -k${gpgkey}
done done

2
build_scripts/Debian+Ubuntu/rules.retrotor
View File

@ -3,7 +3,7 @@
configure: configure-stamp configure: configure-stamp
configure-stamp: configure-stamp:
dh_testdir dh_testdir
cd src && qmake "CONFIG-=debug" "CONFIG+=release" "CONFIG+=rs_autologin" PREFIX=/usr LIB_DIR=/usr/lib RetroShare.pro cd src && qmake "CONFIG-=debug" "CONFIG+=release retrotor" "CONFIG+=rs_autologin" PREFIX=/usr LIB_DIR=/usr/lib RetroShare.pro
touch $@ touch $@