diff --git a/contrib/packaging/debian/copyright b/contrib/packaging/debian/copyright --- a/contrib/packaging/debian/copyright +++ b/contrib/packaging/debian/copyright @@ -3,7 +3,7 @@ Upstream-Name: mercurial Source: https://www.mercurial-scm.org/ Files: * -Copyright: 2005-2020, Matt Mackall and others. +Copyright: 2005-2021, Matt Mackall and others. License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff --git a/contrib/packaging/inno/mercurial.iss b/contrib/packaging/inno/mercurial.iss --- a/contrib/packaging/inno/mercurial.iss +++ b/contrib/packaging/inno/mercurial.iss @@ -6,7 +6,7 @@ #endif [Setup] -AppCopyright=Copyright 2005-2020 Matt Mackall and others +AppCopyright=Copyright 2005-2021 Matt Mackall and others AppName=Mercurial AppVersion={#VERSION} OutputBaseFilename=Mercurial-{#VERSION}{#SUFFIX} @@ -29,7 +29,7 @@ AppContact=mercurial@mercurial-scm.org DefaultDirName={pf}\Mercurial SourceDir=stage VersionInfoDescription=Mercurial distributed SCM (version {#VERSION}) -VersionInfoCopyright=Copyright 2005-2020 Matt Mackall and others +VersionInfoCopyright=Copyright 2005-2021 Matt Mackall and others VersionInfoCompany=Matt Mackall and others VersionInfoVersion={#QUAD_VERSION} InternalCompressLevel=max diff --git a/contrib/packaging/wix/COPYING.rtf b/contrib/packaging/wix/COPYING.rtf index fc98ff56d9794ed561e92196cf4ec116b680532f..8bca18aa4dbe55caca8ffb71d89f9d31d2e02413 GIT binary patch literal 1792 zc$|$@O>g5i5bZfY{=;A|-7Qi_(k6$kivsQ<*%(cnz;Un$zza=L)^sUSAt@V%;s4$l zN^V><*wzQxl7{m>=8@hBAFEtQ8!%l|yUL5pLX^6yGGSeZ$~CQw{J==N%Cq8PCn{%S zTpIe3iOQl8m8zu=I%crIMhBSb4a{95?RdXGJ=qE6jPtYt#=`3|6DzN^&BW4ly12X? zr<$L{N?Yw^bROoYYF!o?BFip+F0vwrI~gNg)Hi7iNLzx7wf2EA zdZg2nW5hfm<|0UH@h{vX7z|L6SO~6)8|n2JwypyuEszlyqQ_+yHDF}WbCTY;600pg z=xnJy5DkdhHvwFgZobT(;7fAKz(cn*sNfcrwn2jo(DIW&=D~8C%C8yyaX^P_M_pw^ zXUCwCCBm9y(mfOhfT7zN5S#ZhGGPy{Eh=8X#tbjGkl%Q=abpuc}$hDcJx-Sb>9h_ z)*v+|OOkErBVyG@6uexUb~=mJl5)+jxvAJ$LDweL&=A;K2TT@ma2zoao6KP)wHRWbXtKd*BFS+ z0f<=Q;EEeM3{DQQder*AHf)tPJnt4wTFqhQGpP-fcvBMmT9Z*q

- Mercurial is Copyright 2005-2020 Matt Mackall and others. + Mercurial is Copyright 2005-2021 Matt Mackall and others.

diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -7707,7 +7707,7 @@ def version_(ui, **opts): ) license = _( b"(see https://mercurial-scm.org for more information)\n" - b"\nCopyright (C) 2005-2020 Matt Mackall and others\n" + b"\nCopyright (C) 2005-2021 Matt Mackall and others\n" b"This is free software; see the source for copying conditions. " b"There is NO\nwarranty; " b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" diff --git a/mercurial/helptext/hg.1.txt b/mercurial/helptext/hg.1.txt --- a/mercurial/helptext/hg.1.txt +++ b/mercurial/helptext/hg.1.txt @@ -112,7 +112,7 @@ Mailing list: https://www.mercurial-scm. Copying """"""" -Copyright (C) 2005-2020 Matt Mackall. +Copyright (C) 2005-2021 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License version 2 or any later version. diff --git a/mercurial/helptext/hgignore.5.txt b/mercurial/helptext/hgignore.5.txt --- a/mercurial/helptext/hgignore.5.txt +++ b/mercurial/helptext/hgignore.5.txt @@ -26,7 +26,7 @@ See Also Copying ======= This manual page is copyright 2006 Vadim Gelfer. -Mercurial is copyright 2005-2020 Matt Mackall. +Mercurial is copyright 2005-2021 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License version 2 or any later version. diff --git a/mercurial/helptext/hgrc.5.txt b/mercurial/helptext/hgrc.5.txt --- a/mercurial/helptext/hgrc.5.txt +++ b/mercurial/helptext/hgrc.5.txt @@ -34,7 +34,7 @@ See Also Copying ======= This manual page is copyright 2005 Bryan O'Sullivan. -Mercurial is copyright 2005-2020 Matt Mackall. +Mercurial is copyright 2005-2021 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License version 2 or any later version. diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -1706,7 +1706,7 @@ if py2exeloaded: extra['console'] = [ { 'script': 'hg', - 'copyright': 'Copyright (C) 2005-2020 Matt Mackall and others', + 'copyright': 'Copyright (C) 2005-2021 Matt Mackall and others', 'product_version': version, } ]