From 2173aab48378a941d6a4eba1c92b4f8acc39dd84 Mon Sep 17 00:00:00 2001 From: cyril soler Date: Fri, 11 May 2018 17:02:58 +0200 Subject: [PATCH] fixed rules file again --- build_scripts/Debian+Ubuntu/debian/compat | 2 +- build_scripts/Debian+Ubuntu/debian/rules | 9 ++++++--- build_scripts/Debian+Ubuntu/makeSourcePackage.sh | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build_scripts/Debian+Ubuntu/debian/compat b/build_scripts/Debian+Ubuntu/debian/compat index 7f8f011eb..ec635144f 100644 --- a/build_scripts/Debian+Ubuntu/debian/compat +++ b/build_scripts/Debian+Ubuntu/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/build_scripts/Debian+Ubuntu/debian/rules b/build_scripts/Debian+Ubuntu/debian/rules index 0b90fecf5..f110264ae 100755 --- a/build_scripts/Debian+Ubuntu/debian/rules +++ b/build_scripts/Debian+Ubuntu/debian/rules @@ -7,7 +7,8 @@ configure-stamp: touch $@ -build: build-stamp +build: build-arch build-indep + build-stamp: configure-stamp dh_testdir # Add here commands to compile the package. @@ -20,9 +21,9 @@ build-stamp: configure-stamp cd src && $(MAKE) touch $@ -build_indep: build +build-indep: build-stamp -build_arch: build +build-arch: build-stamp clean: dh_testdir @@ -31,11 +32,13 @@ clean: # Add here commands to clean up after the build process. [ ! -f src/Makefile ] || (cd src && $(MAKE) distclean) dh_prep + dh_clean install: build dh_testdir dh_testroot dh_prep + dh_clean #dh_installdirs cd src && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install diff --git a/build_scripts/Debian+Ubuntu/makeSourcePackage.sh b/build_scripts/Debian+Ubuntu/makeSourcePackage.sh index e4d4b15a3..bb9ced05a 100755 --- a/build_scripts/Debian+Ubuntu/makeSourcePackage.sh +++ b/build_scripts/Debian+Ubuntu/makeSourcePackage.sh @@ -139,6 +139,7 @@ cp ${workdir}/src/retroshare-gui/src/gui/chat/PopupChatDialog.ui ${workdir}/src/ rm -rf ${workdir}/src/retroshare-qml-app/ rm -rf ${workdir}/src/build_scripts/ +rm ${workdir}/debian/*~ # Cloning sqlcipher # git clone https://github.com/sqlcipher/sqlcipher.git