fixed merge

build_scripts/Debian+Ubuntu/debian_release_howto.txt

@@ -2,15 +2,31 @@ Creation of a new Debian changelog:
    
    dch --create --package retroshare --newversion 0.6.4-1
 
+	Note: dch reads email in $DEBMAIL or $USER@$HOSTNAME, so it should be made correct in debian/changlog
+			If the email does not match the email in mentors, the package will be rejected.
+
 dget command to retrieve source package:
 
    dget -u https://launchpad.net/~retroshare/+archive/ubuntu/stable/+files/retroshare_0.6.4-1.20180313.0e6d27ad~xenial.dsc
 
    (-u means don't check PGP signature)
 
-
 When ready:
    * updload the package in a place that can be used to dget the package on mentors.debian.net.
 
    dput mentors retroshare_0.6.4-1_source.changes
 
+Checkign with lintian:
+	lintian --pedantic --profile debian retroshare_0.6.4-1_source.changes
+
+Todo
+	* make a sid binary package. 
+	* test in sid using pbuilder chroot system (pbuilder login)
+	* upload to mentors
+	* request for sponsorship
+
+Getting help: 
+	https://webchat.oftc.net/
+
+Bug creation/report
+	reportbug -B debian

build_scripts/Debian+Ubuntu/makeSourcePackage.sh

@@ -2,9 +2,8 @@
 
 ###################### PARAMETERS ####################
 gitpath="https://github.com/RetroShare/RetroShare.git"
-branch="v0.6.4-official_release"
 #branch="master"
-#branch="v0.6.3-official_release"
+branch="v0.6.4-official_release"
 #bubba3="Y"      # comment out to compile for bubba3
 ######################################################
 
@@ -45,9 +44,6 @@ while [ ${#} -gt 0 ]; do
             rev=${1}
             shift
             ;;
-#        "-debian") shift
-#            debian="true"
-#             ;;
         "-retrotor") shift
            useretrotor="true"
             ;;