From 566776366fb5fc0c5a67237632137a965fa431e0 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 19 Feb 2018 21:49:06 +0100
Subject: [PATCH] switched version to 0.6.4

---
 build_scripts/Debian+Ubuntu/changelog         |  2 +-
 build_scripts/Debian+Ubuntu/clean.sh          | 10 ++---
 .../Debian+Ubuntu/makeSourcePackage.sh        | 38 ++++++++++++-------
 libretroshare/src/retroshare/rsversion.h      |  2 +-
 4 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/build_scripts/Debian+Ubuntu/changelog b/build_scripts/Debian+Ubuntu/changelog
index c92f9b330..588f26c45 100644
--- a/build_scripts/Debian+Ubuntu/changelog
+++ b/build_scripts/Debian+Ubuntu/changelog
@@ -1,4 +1,4 @@
-retroshare (0.6.3-1.XXXXXX~YYYYYY) YYYYYY; urgency=low
+retroshare (ZZZZZZ-1.XXXXXX~YYYYYY) YYYYYY; urgency=low
 
   9352a7c csoler Thu,  8 Feb 2018 10:34:46 +0100 Merge pull request #1168 from PhenomRetroShare/Add_ConnFilterInFriendSel
   bf8bd4b Phenom Wed,  7 Feb 2018 19:00:08 +0100 Add Only Connected in FriendSelectionWidget.
diff --git a/build_scripts/Debian+Ubuntu/clean.sh b/build_scripts/Debian+Ubuntu/clean.sh
index 4f3ce57f0..cb71980e0 100755
--- a/build_scripts/Debian+Ubuntu/clean.sh
+++ b/build_scripts/Debian+Ubuntu/clean.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 
 rm -f ./libssh-0.5.4.tar.gz.*
-rm -f ./retroshare_0.6.3-1.*_source.build
-rm -f ./retroshare_0.6.3-1.*_source.changes
-rm -f ./retroshare_0.6.3-1.*.tar.gz
-rm -f ./retroshare_0.6.3-1.*.diff.gz
-rm -f ./retroshare_0.6.3-1.*.dsc
+rm -f ./retroshare_0.?.?-1.*_source.build
+rm -f ./retroshare_0.?.?-1.*_source.changes
+rm -f ./retroshare_0.?.?-1.*.tar.gz
+rm -f ./retroshare_0.?.?-1.*.diff.gz
+rm -f ./retroshare_0.?.?-1.*.dsc
 rm -f *.upload
 
 rm -f *~
diff --git a/build_scripts/Debian+Ubuntu/makeSourcePackage.sh b/build_scripts/Debian+Ubuntu/makeSourcePackage.sh
index 5364ec75e..4ab7e2aaa 100755
--- a/build_scripts/Debian+Ubuntu/makeSourcePackage.sh
+++ b/build_scripts/Debian+Ubuntu/makeSourcePackage.sh
@@ -1,14 +1,23 @@
 #!/bin/sh
 
 ###################### PARAMETERS ####################
-version="0.6.3"
 gitpath="https://github.com/RetroShare/RetroShare.git"
-workdir=retroshare-${version}
 branch="master"
 #branch="v0.6.3-official_release"
 #bubba3="Y"		# comment out to compile for bubba3
 ######################################################
 
+RS_MAJOR_VERSION=`fgrep RS_MAJOR_VERSION ../../libretroshare/src/retroshare/rsversion.h | cut -d\\  -f3- | sed -e s\/\ \/\/g | cut -c1`
+RS_MINOR_VERSION=`fgrep RS_MINOR_VERSION ../../libretroshare/src/retroshare/rsversion.h | cut -d\\  -f3- | sed -e s\/\ \/\/g | cut -c1`
+RS_BUILD_NUMBER=`fgrep RS_BUILD_NUMBER ../../libretroshare/src/retroshare/rsversion.h | grep -v BUILD_NUMBER_ADD | cut -d\\  -f3- | sed -e s\/\ \/\/g | cut -c1`
+
+#  echo "RS_MAJOR_VERSION="${RS_MAJOR_VERSION}
+#  echo "RS_MINOR_VERSION="${RS_MINOR_VERSION}
+#  echo "RS_BUILD_NUMBER="${RS_BUILD_NUMBER}
+
+version_number="${RS_MAJOR_VERSION}"'.'"${RS_MINOR_VERSION}"'.'"${RS_BUILD_NUMBER}"
+workdir=retroshare-${version_number}
+
 echo This script is going to build the debian source package for RetroShare, from the Git repository.
 
 if test -d "${workdir}" ;  then
@@ -75,22 +84,25 @@ echo Attempting to get revision number...
 ccount=`git rev-list --count --all`
 ccount=`expr $ccount + 8613 - 8267`
 
-echo "  "Using PGP key id   : ${gpgkey}
-echo "  "Using distributions: ${dist}
-echo "  "Commit count       : ${ccount}
-echo "  "Date               : ${date}
-echo "  "Time               : ${time}
-echo "  "Hash               : ${hhsh}
-echo "  "Using branch       : ${branch}
-echo "  "Using revision     : ${rev}
+echo "  Workdir            :"${workdir}
+echo "  Version            :"${version_number}
+echo "  Using revision     :"${rev}
+echo "  Commit count       :"${ccount}
+echo "  Hash               :"${hhsh}
+echo "  Date               :"${date}
+echo "  Time               :"${time}
+echo "  Using branch       :"${branch}
+echo "  Using distributions:"${dist}
+echo "  Using PGP key id   :"${gpgkey}
 
 if test ${useretrotor} = "true"; then
 	echo "  "Specific flags     : retrotor
 fi
 
 echo Done.
-version="${version}"."${rev}"
-echo Got version number ${version}. 
+version="${version_number}"."${rev}"
+echo Got version number ${version} 
+echo
 echo Please check that the changelog is up to date. 
 echo Hit ENTER if this is correct. Otherwise hit Ctrl+C 
 read tmp
@@ -136,7 +148,7 @@ echo Cleaning...
 echo Calling debuild...
 for i in ${dist}; do
     echo copying changelog for ${i}
-    sed -e s/XXXXXX/"${rev}"/g -e s/YYYYYY/"${i}"/g ../changelog > debian/changelog
+    sed -e s/XXXXXX/"${rev}"/g -e s/YYYYYY/"${i}"/g -e s/ZZZZZZ/"${version_number}"/g ../changelog > debian/changelog
 
 	 if test ${useretrotor} = "true"; then
 	 	cp ../rules.retrotor debian/rules
diff --git a/libretroshare/src/retroshare/rsversion.h b/libretroshare/src/retroshare/rsversion.h
index 09d437d85..d194024d7 100644
--- a/libretroshare/src/retroshare/rsversion.h
+++ b/libretroshare/src/retroshare/rsversion.h
@@ -1,6 +1,6 @@
 #define RS_MAJOR_VERSION     0
 #define RS_MINOR_VERSION     6
-#define RS_BUILD_NUMBER      3
+#define RS_BUILD_NUMBER      4
 #define RS_BUILD_NUMBER_ADD  "" // <-- do we need this?
 // The revision number should be the 4 first bytes of the git revision hash, which is obtained using:
 //    git log --pretty="%H" | head -1 | cut -c1-8