Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-24 23:19:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

switched version to 0.6.4

Browse Source
This commit is contained in:
csoler 2018-02-19 21:49:06 +01:00
parent afc43d0ff7
commit 566776366f
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
4 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_scripts/Debian+Ubuntu/changelog
View File

@ -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 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. bf8bd4b Phenom Wed, 7 Feb 2018 19:00:08 +0100 Add Only Connected in FriendSelectionWidget.

10
build_scripts/Debian+Ubuntu/clean.sh
View File

@ -1,11 +1,11 @@
#!/bin/sh #!/bin/sh
rm -f ./libssh-0.5.4.tar.gz.* rm -f ./libssh-0.5.4.tar.gz.*
rm -f ./retroshare_0.6.3-1.*_source.build rm -f ./retroshare_0.?.?-1.*_source.build
rm -f ./retroshare_0.6.3-1.*_source.changes rm -f ./retroshare_0.?.?-1.*_source.changes
rm -f ./retroshare_0.6.3-1.*.tar.gz rm -f ./retroshare_0.?.?-1.*.tar.gz
rm -f ./retroshare_0.6.3-1.*.diff.gz rm -f ./retroshare_0.?.?-1.*.diff.gz
rm -f ./retroshare_0.6.3-1.*.dsc rm -f ./retroshare_0.?.?-1.*.dsc
rm -f *.upload rm -f *.upload
rm -f *~ rm -f *~

38
build_scripts/Debian+Ubuntu/makeSourcePackage.sh
View File

@ -1,14 +1,23 @@
#!/bin/sh #!/bin/sh
###################### PARAMETERS #################### ###################### PARAMETERS ####################
version="0.6.3"
gitpath="https://github.com/RetroShare/RetroShare.git" gitpath="https://github.com/RetroShare/RetroShare.git"
workdir=retroshare-${version}
branch="master" branch="master"
#branch="v0.6.3-official_release" #branch="v0.6.3-official_release"
#bubba3="Y" # comment out to compile for bubba3 #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. echo This script is going to build the debian source package for RetroShare, from the Git repository.
if test -d "${workdir}" ; then if test -d "${workdir}" ; then
@ -75,22 +84,25 @@ echo Attempting to get revision number...
ccount=`git rev-list --count --all` ccount=`git rev-list --count --all`
ccount=`expr $ccount + 8613 - 8267` ccount=`expr $ccount + 8613 - 8267`
echo " "Using PGP key id : ${gpgkey} echo " Workdir :"${workdir}
echo " "Using distributions: ${dist} echo " Version :"${version_number}
echo " "Commit count : ${ccount} echo " Using revision :"${rev}
echo " "Date : ${date} echo " Commit count :"${ccount}
echo " "Time : ${time} echo " Hash :"${hhsh}
echo " "Hash : ${hhsh} echo " Date :"${date}
echo " "Using branch : ${branch} echo " Time :"${time}
echo " "Using revision : ${rev} echo " Using branch :"${branch}
echo " Using distributions:"${dist}
echo " Using PGP key id :"${gpgkey}
if test ${useretrotor} = "true"; then if test ${useretrotor} = "true"; then
echo " "Specific flags : retrotor echo " "Specific flags : retrotor
fi fi
echo Done. echo Done.
version="${version}"."${rev}" version="${version_number}"."${rev}"
echo Got version number ${version}. echo Got version number ${version}
echo
echo Please check that the changelog is up to date. echo Please check that the changelog is up to date.
echo Hit ENTER if this is correct. Otherwise hit Ctrl+C echo Hit ENTER if this is correct. Otherwise hit Ctrl+C
read tmp read tmp
@ -136,7 +148,7 @@ echo Cleaning...
echo Calling debuild... echo Calling debuild...
for i in ${dist}; do for i in ${dist}; do
echo copying changelog for ${i} 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 if test ${useretrotor} = "true"; then
cp ../rules.retrotor debian/rules cp ../rules.retrotor debian/rules

2
libretroshare/src/retroshare/rsversion.h
View File

@ -1,6 +1,6 @@
#define RS_MAJOR_VERSION 0 #define RS_MAJOR_VERSION 0
#define RS_MINOR_VERSION 6 #define RS_MINOR_VERSION 6
#define RS_BUILD_NUMBER 3 #define RS_BUILD_NUMBER 4
#define RS_BUILD_NUMBER_ADD "" // <-- do we need this? #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: // 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 // git log --pretty="%H" | head -1 | cut -c1-8