Merge pull request #6442 from EOSIO/merge/1.5.0-to-develop

Merge 1.5.0 to develop

CMakeLists.txt

@@ -34,9 +34,9 @@ set( CMAKE_CXX_EXTENSIONS ON )
 set( CXX_STANDARD_REQUIRED ON)
 
 set(VERSION_MAJOR 1)
-set(VERSION_MINOR 5)
+set(VERSION_MINOR 6)
 set(VERSION_PATCH 0)
-set(VERSION_SUFFIX rc1)
+set(VERSION_SUFFIX develop)
 
 if(VERSION_SUFFIX)
     set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_SUFFIX}")

Docker/README.md

@@ -20,10 +20,10 @@ cd eos/Docker
 docker build . -t eosio/eos
 ```
 
-The above will build off the most recent commit to the master branch by default. If you would like to target a specific branch/tag, you may use a build argument. For example, if you wished to generate a docker image based off of the v1.5.0-rc1 tag, you could do the following:
+The above will build off the most recent commit to the master branch by default. If you would like to target a specific branch/tag, you may use a build argument. For example, if you wished to generate a docker image based off of the v1.6.0 tag, you could do the following:
 
 ```bash
-docker build -t eosio/eos:v1.5.0-rc1 --build-arg branch=v1.5.0-rc1 .
+docker build -t eosio/eos:v1.6.0 --build-arg branch=v1.6.0 .
 ```
 
 By default, the symbol in eosio.system is set to SYS. You can override this using the symbol argument while building the docker image.

README.md

@@ -39,31 +39,31 @@ $ brew remove eosio
 ```
 #### Ubuntu 18.04 Debian Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v1.5.0-rc1/eosio_1.5.0-rc1-1-ubuntu-18.04_amd64.deb
-$ sudo apt install ./eosio_1.5.0-rc1-1-ubuntu-18.04_amd64.deb
+$ wget https://github.com/eosio/eos/releases/download/v1.6.0/eosio_1.6.0-develop-ubuntu-18.04_amd64.deb
+$ sudo apt install ./eosio_1.6.0-develop-ubuntu-18.04_amd64.deb
 ```
 #### Ubuntu 16.04 Debian Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v1.5.0-rc1/eosio_1.5.0-rc1-1-ubuntu-16.04_amd64.deb
-$ sudo apt install ./eosio_1.5.0-rc1-1-ubuntu-16.04_amd64.deb
+$ wget https://github.com/eosio/eos/releases/download/v1.6.0/eosio_1.6.0-develop-ubuntu-16.04_amd64.deb
+$ sudo apt install ./eosio_1.6.0-develop-ubuntu-16.04_amd64.deb
 ```
 #### Debian Package Uninstall
 ```sh
 $ sudo apt remove eosio
 ```
 #### Centos RPM Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v1.5.0-rc1/eosio-1.5.0-rc1-1.el7.x86_64.rpm
-$ sudo yum install ./eosio-1.5.0-rc1-1.el7.x86_64.rpm
+$ wget https://github.com/eosio/eos/releases/download/v1.6.0/eosio-1.6.0-develop.el7.x86_64.rpm
+$ sudo yum install ./eosio-1.6.0-develop.el7.x86_64.rpm
 ```
 #### Centos RPM Package Uninstall
 ```sh
 $ sudo yum remove eosio.cdt
 ```
 #### Fedora RPM Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v1.5.0-rc1/eosio-1.5.0-rc1-1.fc27.x86_64.rpm
-$ sudo yum install ./eosio-1.5.0-rc1-1.fc27.x86_64.rpm
+$ wget https://github.com/eosio/eos/releases/download/v1.6.0/eosio-1.6.0-develop.fc27.x86_64.rpm
+$ sudo yum install ./eosio-1.6.0-develop.fc27.x86_64.rpm
 ```
 #### Fedora RPM Package Uninstall
 ```sh

scripts/generate_deb.sh

@@ -1,18 +1,25 @@
 #! /bin/bash
 
-NAME="${PROJECT}_${VERSION}-1_amd64"
 PREFIX="usr"
 SPREFIX=${PREFIX}
 SUBPREFIX="opt/${PROJECT}/${VERSION}"
 SSUBPREFIX="opt\/${PROJECT}\/${VERSION}"
+RELEASE="${VERSION_SUFFIX}"
+
+# default release to "1" if there is no suffix
+if [[ -z $RELEASE ]]; then
+  RELEASE="1"
+fi
+
+NAME="${PROJECT}_${VERSION_NO_SUFFIX}-${RELEASE}_amd64"
 
 DEPS_STR=""
 for dep in "${DEPS[@]}"; do
    DEPS_STR="${DEPS_STR} Depends: ${dep}"
 done
 mkdir -p ${PROJECT}/DEBIAN
 echo "Package: ${PROJECT} 
-Version: ${VERSION}
+Version: ${VERSION_NO_SUFFIX}-${RELEASE}
 Section: devel
 Priority: optional
 Depends: libbz2-dev (>= 1.0), libssl-dev (>= 1.0), libgmp3-dev, build-essential, libicu-dev, zlib1g-dev