Merge pull request 're-fixing spacing in manpages' (#217) from jahway603 into dev

Reviewed-on: #217
2 years ago · 0cb343d508
6 changed files with 14 additions and 1 deletions
--- 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])
--- 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 <https://hush.is/security/>.

 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!!!!!
--- 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 <https://hush.is/security/>.

 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!!!!!
--- 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 <https://hush.is/security/>.

 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!!!!!
--- 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" +
--- 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