diff --git a/configure.ac b/configure.ac index 61505c9c75a6e..aa1e17b760027 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 0) define(_CLIENT_VERSION_MINOR, 12) define(_CLIENT_VERSION_REVISION, 6) -define(_CLIENT_VERSION_BUILD, 0) +define(_CLIENT_VERSION_BUILD, 1) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2019) define(_COPYRIGHT_HOLDERS,[The %s developers]) diff --git a/contrib/devtools/split-debug.sh b/contrib/devtools/split-debug.sh deleted file mode 100755 index 7f124ca9d909a..0000000000000 --- a/contrib/devtools/split-debug.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -if [ $# -ne 3 ]; - then echo "usage: $0 " -fi - - --enable-deterministic-archives -p --only-keep-debug $1 $3 - --enable-deterministic-archives -p --strip-debug $1 $2 -/usr/bin/strip --enable-deterministic-archives -p -s $2 - --enable-deterministic-archives -p --add-gnu-debuglink=$3 $2 diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 417f2f6da593d..df041f69d0b2d 100755 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -37,7 +37,8 @@ files: [] script: | WRAP_DIR=$HOME/wrapped - HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu" + HOSTS="i686-pc-linux-gnu x86_64-linux-gnu" + # the following architectures have issues when compiling which is why we are commenting them out: arm-linux-gnueabihf aarch64-linux-gnu CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests" FAKETIME_HOST_PROGS="" FAKETIME_PROGS="date ar ranlib nm" diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index 9da1984b3ca56..653b2827c741e 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -30,7 +30,7 @@ packages: - "python3-setuptools" - "fonts-tuffy" remotes: -- "url": "https://github.com/CryptoMx/PAC.git" +- "url": "https://github.com/PACCommunity/PAC.git" "dir": "PAC" files: - "MacOSX10.11.sdk.tar.gz" diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index c98015c517d92..6e07162835e79 100755 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -25,7 +25,7 @@ packages: - "python3" - "rename" remotes: -- "url": "https://github.com/CryptoMx/PAC.git" +- "url": "https://github.com/PACCommunity/PAC.git" "dir": "PAC" files: [] script: | diff --git a/src/clientversion.h b/src/clientversion.h index 8fdbb850085fd..e21ab46e1dcf0 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -17,7 +17,7 @@ #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 12 #define CLIENT_VERSION_REVISION 6 -#define CLIENT_VERSION_BUILD 0 +#define CLIENT_VERSION_BUILD 1 //! Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true