From ddf98a52ca7611bf7d0a397ed5da06195e9fa202 Mon Sep 17 00:00:00 2001 From: csoler Date: Thu, 17 May 2018 22:43:49 +0200 Subject: [PATCH] fixed compilation in debian/rules --- build_scripts/Debian/debian/rules | 4 ++-- build_scripts/Debian/makeSourcePackage.sh | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/build_scripts/Debian/debian/rules b/build_scripts/Debian/debian/rules index 1068923eb..cb95b1d68 100755 --- a/build_scripts/Debian/debian/rules +++ b/build_scripts/Debian/debian/rules @@ -5,7 +5,7 @@ export DH_VERBOSE = 1 DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/default.mk -export DEB_BUILD_MAINT_PTIONS = hardening=+all +#export DEB_BUILD_MAINT_PTIONS = hardening=+all export QT_SELECT = qt5 MY_BUILDDIR = _build @@ -17,7 +17,7 @@ MY_BUILDDIR = _build # We call mkdir here because of #800738. override_dh_auto_configure: @mkdir -p $(MY_BUILDDIR) - dh_auto_configure -- ../src + dh_auto_configure -- CONFIG="release retroshare_plugins rs_autologin" PREFIX=/usr LIB_DIR=/usr/lib ../src # Upstream ships with a 'history' directory containing ancient code. # We are not interested in installing this. diff --git a/build_scripts/Debian/makeSourcePackage.sh b/build_scripts/Debian/makeSourcePackage.sh index c62914cf5..87508924a 100755 --- a/build_scripts/Debian/makeSourcePackage.sh +++ b/build_scripts/Debian/makeSourcePackage.sh @@ -125,6 +125,7 @@ if ! test "${nodl}" = "yes"; then rm -rf ${workdir}/src/retroshare-qml-app/ rm -rf ${workdir}/src/build_scripts/ rm ${workdir}/debian/*~ + rm ${workdir}/debian/.*.sw? cd ${workdir} echo Setting version numbers... @@ -147,6 +148,10 @@ if ! test "${nodl}" = "yes"; then cd - else tar zxvf retroshare_${version_number}.orig.tar.gz + + cp -r debian/* ${workdir}/debian/ + rm ${workdir}/debian/*~ + rm ${workdir}/debian/.*.sw? fi # Cloning sqlcipher