diff --git a/.gitignore b/.gitignore index 34231f2da2796a4f1371961664b38b08c1b3209d..c6f437de300dd684dd0b86ba455441989004c096 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # Prerequisites build/* +build_stretch/* test/build *.d *.txt.user diff --git a/CMakeLists.txt b/CMakeLists.txt index a0fc9339a426671eea4e2512b7acf2e513eb6f05..1b31d8631e1ed21a9b618af2c0470d82194dc191 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,7 @@ SET( CPACK_GENERATOR "DEB") SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_VERSION_MAJOR 2) SET( CPACK_PACKAGE_VERSION_MINOR 4) -SET( CPACK_PACKAGE_VERSION_PATCH 7) +SET( CPACK_PACKAGE_VERSION_PATCH 8) SET( CPACK_SYSTEM_NAME "debian-9.9-amd64") SET( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}") @@ -47,9 +47,6 @@ SET( CPACK_DEBIAN_PACKAGE_MAINTAINER "Dmitriy Gerasimov <naeper@demlabs.net>" ) SET( CPACK_DEBIAN_PACKAGE_DESCRIPTION_SUMMARY "CellFrame Node software ( https://cellframe.net ) " ) SET( CPACK_DEBIAN_PACKAGE_DESCRIPTION "CellFrame Node" ) SET( CPACK_DEBIAN_PACKAGE_SECTION "extra") -#SET( CPACK_DEBIAN_PACKAGE_ARCHITECTURE "debian-9.7-amd64" ) -#SET( CPACK_PACKAGE_FILE_NAME "${CPACK_DEBIAN_PACKAGE_NAME}-${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}") -#SET( CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64" ) SET( CPACK_DEBIAN_PACKAGE_DEPENDS "debconf (>=1.5), dpkg (>=1.17), bash (>=4), debconf-utils, dconf-cli, less, pv, psmisc") SET( CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) SET( CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA diff --git a/libdap-chain b/libdap-chain index bf6609ff3a05592c6f08ea1951790478beee9192..a9b0b30fdb399da12cf8581319ac1c2279322b19 160000 --- a/libdap-chain +++ b/libdap-chain @@ -1 +1 @@ -Subproject commit bf6609ff3a05592c6f08ea1951790478beee9192 +Subproject commit a9b0b30fdb399da12cf8581319ac1c2279322b19 diff --git a/libdap-chain-mempool b/libdap-chain-mempool index 1bf5ea35fd12fc2e95debe5c4e193a5e06aa0bd6..fd7c74df13d963215d88dd3622bde5b39f5ca7bd 160000 --- a/libdap-chain-mempool +++ b/libdap-chain-mempool @@ -1 +1 @@ -Subproject commit 1bf5ea35fd12fc2e95debe5c4e193a5e06aa0bd6 +Subproject commit fd7c74df13d963215d88dd3622bde5b39f5ca7bd diff --git a/libdap-chain-net b/libdap-chain-net index e19832559cf7462685fe9e95e8dacf0908dddbd7..0b4164fe9fd8da37bc42c270febcafb0aa84fc18 160000 --- a/libdap-chain-net +++ b/libdap-chain-net @@ -1 +1 @@ -Subproject commit e19832559cf7462685fe9e95e8dacf0908dddbd7 +Subproject commit 0b4164fe9fd8da37bc42c270febcafb0aa84fc18