From 0de93fc353eb5295dfd06b7bad95ce8e38bda65f Mon Sep 17 00:00:00 2001
From: csoler <retroshare.project@gmail.com>
Date: Thu, 30 Apr 2015 20:03:38 +0000
Subject: [PATCH] fixed bugs in packaging scripts

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8195 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 build_scripts/Debian+Ubuntu/debian/rules         | 12 ++++++------
 build_scripts/Debian+Ubuntu/makeSourcePackage.sh | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build_scripts/Debian+Ubuntu/debian/rules b/build_scripts/Debian+Ubuntu/debian/rules
index 74da7bd51..361c10e20 100755
--- a/build_scripts/Debian+Ubuntu/debian/rules
+++ b/build_scripts/Debian+Ubuntu/debian/rules
@@ -45,12 +45,12 @@ install: build
 	install -D -m 755 src/retroshare-nogui/src/retroshare-nogui       $(CURDIR)/debian/retroshare06-nogui/usr/bin/RetroShare06-nogui
 	install -D -m 755 src/retroshare-nogui/src/retroshare-nogui       $(CURDIR)/debian/retroshare06/usr/bin/RetroShare06-nogui
 	install -D -m 755 src/retroshare-gui/src/RetroShare               $(CURDIR)/debian/retroshare06/usr/bin/RetroShare06
-	install -D -m src/libresapi/src/webfiles/JSXTransformer.js     	$(CURDIR)/debian/retroshare06/usr/share/RetroShare06/webui/JSXTransformer.js   
-	install -D -m src/libresapi/src/webfiles/RsApi.js     				$(CURDIR)/debian/retroshare06/usr/share/RetroShare06/webui/RsApi.js     		 
-	install -D -m src/libresapi/src/webfiles/RsXHRConnection.js    	$(CURDIR)/debian/retroshare06/usr/share/RetroShare06/webui/RsXHRConnection.js  
-	install -D -m src/libresapi/src/webfiles/green-black.css     		$(CURDIR)/debian/retroshare06/usr/share/RetroShare06/webui/green-black.css     
-	install -D -m src/libresapi/src/webfiles/gui.jsx     					$(CURDIR)/debian/retroshare06/usr/share/RetroShare06/webui/gui.jsx     			 
-	install -D -m src/libresapi/src/webfiles/index.html     				$(CURDIR)/debian/retroshare06/usr/share/RetroShare06/webui/index.html     		 
+	install -D -m 644 src/libresapi/src/webfiles/JSXTransformer.js    $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/webui/JSXTransformer.js   
+	install -D -m 644 src/libresapi/src/webfiles/RsApi.js     			$(CURDIR)/debian/retroshare06/usr/share/RetroShare06/webui/RsApi.js     		 
+	install -D -m 644 src/libresapi/src/webfiles/RsXHRConnection.js   $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/webui/RsXHRConnection.js  
+	install -D -m 644 src/libresapi/src/webfiles/green-black.css     	$(CURDIR)/debian/retroshare06/usr/share/RetroShare06/webui/green-black.css     
+	install -D -m 644 src/libresapi/src/webfiles/gui.jsx     			$(CURDIR)/debian/retroshare06/usr/share/RetroShare06/webui/gui.jsx     			 
+	install -D -m 644 src/libresapi/src/webfiles/index.html     		$(CURDIR)/debian/retroshare06/usr/share/RetroShare06/webui/index.html     		 
 	install -D -m src/libresapi/src/webfiles/react.js     				$(CURDIR)/debian/retroshare06/usr/share/RetroShare06/webui/react.js     		 
 
 # Add here commands to install the package into debian/your_appname
diff --git a/build_scripts/Debian+Ubuntu/makeSourcePackage.sh b/build_scripts/Debian+Ubuntu/makeSourcePackage.sh
index b025d9aae..5f80d4d61 100755
--- a/build_scripts/Debian+Ubuntu/makeSourcePackage.sh
+++ b/build_scripts/Debian+Ubuntu/makeSourcePackage.sh
@@ -46,7 +46,7 @@ while [ ${#} -gt 0 ]; do
 done
 
 if test "${dist}" = "" ; then
-	dist="precise trusty utopic"
+	dist="precise trusty utopic vivid"
 fi
 
 echo "  "Using PGP key id   : ${gpgkey}
@@ -94,20 +94,20 @@ cp ${workdir}/src/retroshare-gui/src/gui/chat/PopupChatDialog.ui ${workdir}/src/
 #   LIBSSH_LOCATION=https://git.libssh.org/projects/libssh.git/snapshot/libssh-${LIBSSH_VERSION}.tar.gz
 #   
 #   [ -f libssh-${LIBSSH_VERSION}.tar.gz ] || wget --no-check-certificate -O libssh-${LIBSSH_VERSION}.tar.gz $LIBSSH_LOCATION 
-#   cd ${workdir}
 #   tar zxvf ../libssh-${LIBSSH_VERSION}.tar.gz
 
 # Cloning sqlcipher
 # git clone https://github.com/sqlcipher/sqlcipher.git
 
 # cleaning up protobof generated files
-rm -f src/retroshare-nogui/src/rpc/proto/gencc/*.pb.h
-rm -f src/retroshare-nogui/src/rpc/proto/gencc/*.pb.cc
+# rm -f src/retroshare-nogui/src/rpc/proto/gencc/*.pb.h
+# rm -f src/retroshare-nogui/src/rpc/proto/gencc/*.pb.cc
 
+cd ${workdir}
 echo Setting version numbers...
 
 # setup version numbers
-sed -e "s%RS_REVISION_NUMBER.*%RS_REVISION_NUMBER   ${svnrev}%" src/libretroshare/src/retroshare/rsversion.in >src/libretroshare/src/retroshare/rsversion.h
+sed -e "s%RS_REVISION_NUMBER.*%RS_REVISION_NUMBER   ${svnrev}%" src/libretroshare/src/retroshare/rsversion.in > src/libretroshare/src/retroshare/rsversion.h
 
 # Various cleaning
 echo Cleaning...