From eef82aa5f097a84869492b2ec367ad141dd0238f Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 2 Jan 2018 11:06:51 +0100 Subject: [PATCH] finally fixed appImage scripts --- build_scripts/AppImage/retrotor.yml | 3 ++- build_scripts/Debian+Ubuntu/makeSourcePackage.sh | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build_scripts/AppImage/retrotor.yml b/build_scripts/AppImage/retrotor.yml index feb77967a..e7eba009a 100644 --- a/build_scripts/AppImage/retrotor.yml +++ b/build_scripts/AppImage/retrotor.yml @@ -6,10 +6,11 @@ ingredients: sources: - deb http://archive.ubuntu.com/ubuntu trusty main restricted universe multiverse - deb http://archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse + - deb http://deb.torproject.org/torproject.org/ trusty main ppas: - retroshare/testing packages: - - libqt4-svg + - libqt5svg5 - tor - retrotor diff --git a/build_scripts/Debian+Ubuntu/makeSourcePackage.sh b/build_scripts/Debian+Ubuntu/makeSourcePackage.sh index e61fd378d..8d4033e13 100755 --- a/build_scripts/Debian+Ubuntu/makeSourcePackage.sh +++ b/build_scripts/Debian+Ubuntu/makeSourcePackage.sh @@ -59,8 +59,8 @@ while [ ${#} -gt 0 ]; do done if test "${useretrotor}" = "true"; then - if ! test "${dist}" = "xenial"; then - echo ERROR: retro-tor can only be packaged for xenial for now. + if ! test "${dist}" = "trusty"; then + echo ERROR: retro-tor can only be packaged for trusty for now. exit 1; fi gitpath="https://github.com/csoler/RetroShare.git" @@ -140,7 +140,7 @@ for i in ${dist}; do if test ${useretrotor} = "true"; then cp ../rules.retrotor debian/rules - cp ../control.xenial_retrotor debian/control + cp ../control.trusty_retrotor debian/control elif test -f ../control."${i}" ; then echo \/\!\\ Using specific control file for distribution "${i}" cp ../control."${i}" debian/control