From 23d4a2cb735dc44b0d0a58f14a2b8a3002923b1e Mon Sep 17 00:00:00 2001 From: jahway603 Date: Tue, 27 Sep 2022 22:27:54 -0400 Subject: [PATCH 1/3] re-fixing spacing in manpages --- doc/man/hush-cli.1 | 3 +++ doc/man/hush-tx.1 | 3 +++ doc/man/hushd.1 | 3 +++ 3 files changed, 9 insertions(+) diff --git a/doc/man/hush-cli.1 b/doc/man/hush-cli.1 index 93c315060..f9c6e7aaa 100644 --- a/doc/man/hush-cli.1 +++ b/doc/man/hush-cli.1 @@ -76,8 +76,11 @@ In order to ensure you are adequately protecting your privacy when using Hush, please see . Copyright (C) 2016-2022 Duke Leto and The Hush Developers + Copyright (C) 2016-2020 jl777 and SuperNET developers + Copyright (C) 2016-2018 The Zcash developers + Copyright (C) 2009-2014 The Bitcoin Core developers This is experimental Free Software! Fuck Yeah!!!!! diff --git a/doc/man/hush-tx.1 b/doc/man/hush-tx.1 index 4a01ad1e7..8ba9a3d28 100644 --- a/doc/man/hush-tx.1 +++ b/doc/man/hush-tx.1 @@ -89,8 +89,11 @@ In order to ensure you are adequately protecting your privacy when using Hush, please see . Copyright (C) 2016-2022 Duke Leto and The Hush Developers + Copyright (C) 2016-2020 jl777 and SuperNET developers + Copyright (C) 2016-2018 The Zcash developers + Copyright (C) 2009-2014 The Bitcoin Core developers This is experimental Free Software! Fuck Yeah!!!!! diff --git a/doc/man/hushd.1 b/doc/man/hushd.1 index 3cd181f7c..631db3502 100644 --- a/doc/man/hushd.1 +++ b/doc/man/hushd.1 @@ -725,8 +725,11 @@ In order to ensure you are adequately protecting your privacy when using Hush, please see . Copyright (C) 2016-2022 Duke Leto and The Hush Developers + Copyright (C) 2016-2020 jl777 and SuperNET developers + Copyright (C) 2016-2018 The Zcash developers + Copyright (C) 2009-2014 The Bitcoin Core developers This is experimental Free Software! Fuck Yeah!!!!! From 64e8d052144f9ba59a6633803f78997372d1271a Mon Sep 17 00:00:00 2001 From: jahway603 Date: Thu, 29 Sep 2022 00:29:28 -0400 Subject: [PATCH 2/3] fixed an update script --- configure.ac | 2 +- util/update-copyrights.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index e863c6384..c542219cd 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ define(_CLIENT_VERSION_BUILD, 50) define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50))) define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1))) define(_CLIENT_VERSION_IS_RELEASE, true) -define(_COPYRIGHT_YEAR, 2021) +define(_COPYRIGHT_YEAR, 2022) AC_INIT([Hush],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_SUFFIX(_ZC_BUILD_VAL)],[https://git.hush.is/hush/hush3],[hush]) AC_CONFIG_SRCDIR([src/main.cpp]) AC_CONFIG_HEADERS([src/config/bitcoin-config.h]) diff --git a/util/update-copyrights.sh b/util/update-copyrights.sh index 5a5c09cb1..96e78a5a0 100755 --- a/util/update-copyrights.sh +++ b/util/update-copyrights.sh @@ -11,3 +11,4 @@ ack -l -i "20..-20..*Hush dev" | xargs ./util/replace.pl -$1 -$2 # This updates the define which is used by C++ help output ./util/replace.pl "COPYRIGHT_YEAR $1" "COPYRIGHT_YEAR $2" src/clientversion.h +./util/replace.pl "COPYRIGHT_YEAR, $1" "COPYRIGHT_YEAR, $2" configure.ac From e8e0cb93b90aeb68a594e53a471574f1062c5fef Mon Sep 17 00:00:00 2001 From: jahway603 Date: Thu, 29 Sep 2022 00:34:41 -0400 Subject: [PATCH 3/3] fixed manpage copyright spacing issue --- src/util.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/util.cpp b/src/util.cpp index e9d0a63e5..47ca963b4 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1036,8 +1036,11 @@ std::string LicenseInfo() { return "\n" + FormatParagraph(strprintf(_("Copyright (C) 2016-%i Duke Leto and The Hush Developers"), COPYRIGHT_YEAR)) + "\n" + + "\n" + FormatParagraph(strprintf(_("Copyright (C) 2016-2020 jl777 and SuperNET developers"))) + "\n" + + "\n" + FormatParagraph(strprintf(_("Copyright (C) 2016-2018 The Zcash developers"))) + "\n" + + "\n" + FormatParagraph(strprintf(_("Copyright (C) 2009-2014 The Bitcoin Core developers"))) + "\n" + "\n" + FormatParagraph(_("This is experimental Free Software! Fuck Yeah!!!!!")) + "\n" +