Patchwork [STABLE] copyright: update to 2016

login
register
mail settings
Submitter timeless@mozdev.org
Date Jan. 21, 2016, 9:23 p.m.
Message ID <3a1ca0fd48b7a9ff5c0e.1453411396@waste.org>
Download mbox | patch
Permalink /patch/12863/
State Accepted
Headers show

Comments

timeless@mozdev.org - Jan. 21, 2016, 9:23 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1453410952 0
#      Thu Jan 21 21:15:52 2016 +0000
# Branch stable
# Node ID 3a1ca0fd48b7a9ff5c0e52e29d1c9419e03ced11
# Parent  f62dea3f36975b3daac82e9dcd0ec964cf30c2a7
copyright: update to 2016
Bryan O'Sullivan - Jan. 22, 2016, 3:43 a.m.
On Thu, Jan 21, 2016 at 1:23 PM, timeless <timeless@mozdev.org> wrote:

> copyright: update to 2016
>

Pushed to the clowncopter, thanks.

Patch

diff --git a/contrib/win32/ReadMe.html b/contrib/win32/ReadMe.html
--- a/contrib/win32/ReadMe.html
+++ b/contrib/win32/ReadMe.html
@@ -140,7 +140,7 @@ 
     </p>
 
     <p>
-      Mercurial is Copyright 2005-2015 Matt Mackall and others. See
+      Mercurial is Copyright 2005-2016 Matt Mackall and others. See
       the <tt>Contributors.txt</tt> file for a list of contributors.
     </p>
 
diff --git a/contrib/win32/mercurial.iss b/contrib/win32/mercurial.iss
--- a/contrib/win32/mercurial.iss
+++ b/contrib/win32/mercurial.iss
@@ -21,7 +21,7 @@ 
 #endif
 
 [Setup]
-AppCopyright=Copyright 2005-2015 Matt Mackall and others
+AppCopyright=Copyright 2005-2016 Matt Mackall and others
 AppName=Mercurial
 AppVersion={#VERSION}
 #if ARCH == "x64"
@@ -45,7 +45,7 @@ 
 DefaultDirName={pf}\Mercurial
 SourceDir=..\..
 VersionInfoDescription=Mercurial distributed SCM (version {#VERSION})
-VersionInfoCopyright=Copyright 2005-2015 Matt Mackall and others
+VersionInfoCopyright=Copyright 2005-2016 Matt Mackall and others
 VersionInfoCompany=Matt Mackall and others
 InternalCompressLevel=max
 SolidCompression=true
diff --git a/contrib/wix/COPYING.rtf b/contrib/wix/COPYING.rtf
index 1e7901519fdae09596c98bf7ca8bf2e81461da1e..099bc84580f573d5d5618f7016e299f6734d66e9
GIT binary patch
literal 1686
zc$|$@ZExE)5Z>ni{SSwJSzBbbq{ag}4+Fd+X^bU~VLK=c@Cz+b)~yt&kdzI>@PFSO
zB{v=hYy$$uvX1w>+(Y^(Tqsi^jmNm;%{I+OnJ83QCcJ8CwrP^x97SnO2pdfw5>Xn|
zqRcDlyb1}duvQ*sY7YxrOEW&5-dr6;Znbr^1IEIsA`x4slu5)!w<;Tr#<Avu*eau(
z4A#M;FM}#Dz-Vxj4l?>1C7;G8u|u{0hNid?ZJvrox<Y6irI~PX^*XyrXsufvQt|Sq
z=qP{u7>W8Ufk)-?)}hoOew3deOOnw~S(5$?k1_;W@^4aWkfs0|D&;(5yt#T^JG?aF
zrNT>U@DJ1r5cE)zRPeS8d+F2|4z`6{8Xz0c2Zx(BC?KH(IV9n=EwDWB7p*Cj10n%I
zx!Qv*<HMKPGkl3YX_&VgjX6AEu8db8Jv97{uT%k>LoB~z^kt6@cb2-!fYyvbAq#{Z
ziKJ)9&H#P4Yall7WMIM$Y{Q%06Uzf=8D94dI%`(6v2k|mBr#>AS8)ZPiH$4Ukd}&C
z($fL<NJeiIv|g31z6Pp=uhZ52)AI@@vo(C3EEbd5YCWdPP+5AbcB<=yb)%6QlO`uk
zI573c+r{U5s-OHmeVDG+%>Hh=n%yp!aQC!;3Ct&p)%5f8!(;*T=f(VKdE0ZJ8Zb6C
zXVbOvo`&<%qU&6g4T0ryqZKLNb6?5nEg)D{ws#oNY&$t@Pi~uo!)+Bvu%;14Bl$%P
z6c8j4-d7fCc{q=|AO7Dm5iTsfW}`Gl5(LW`DyhDZwcILtize4?!891CJ4R%wZ&Z%_
zf!<?5`Y1EBEw?n^mzJJ6qJ0yZ8hY-)PWMru(QrK)xj~IYo3Q!2OKR}$6`V(CY#^pJ
zhRz{veT*)pPC}$i|2K-Oo#KSYe8`;63&n~ncn8t(tq&4SHv<-I`7od>qJu~kY%7!!
zbxV2c8GmO*&=j}WljCzafWGAYbr&cs2`jJqX>r%fK~;39Hgs2kEOzLL%^8STV(*IW
zJM>QWv05tiUkA2~2cA!hBCYzob4_YJC0-W<zf)vXu5d@#GKTB_+yvUjNRn{!%%3%n
zSu72Rl0oEttwLyi84maR{a|a_fpy!V?i%>vZ#@^f;!){>Z|73ekbOAbujjXmhw1DO
wc-wcV&-dNHE3FLXgWT3{Pp2dAabAa`Xtl`86#i|)>2x|@(;YVbD*SNu7h(!hlmGw#

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -7018,7 +7018,7 @@ 
              % util.version())
     ui.status(_(
         "(see https://mercurial-scm.org for more information)\n"
-        "\nCopyright (C) 2005-2015 Matt Mackall and others\n"
+        "\nCopyright (C) 2005-2016 Matt Mackall and others\n"
         "This is free software; see the source for copying conditions. "
         "There is NO\nwarranty; "
         "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
diff --git a/mercurial/help/hg.1.txt b/mercurial/help/hg.1.txt
--- a/mercurial/help/hg.1.txt
+++ b/mercurial/help/hg.1.txt
@@ -112,7 +112,7 @@ 
 
 Copying
 """""""
-Copyright (C) 2005-2015 Matt Mackall.
+Copyright (C) 2005-2016 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/help/hgignore.5.txt b/mercurial/help/hgignore.5.txt
--- a/mercurial/help/hgignore.5.txt
+++ b/mercurial/help/hgignore.5.txt
@@ -26,7 +26,7 @@ 
 Copying
 =======
 This manual page is copyright 2006 Vadim Gelfer.
-Mercurial is copyright 2005-2015 Matt Mackall.
+Mercurial is copyright 2005-2016 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/help/hgrc.5.txt b/mercurial/help/hgrc.5.txt
--- a/mercurial/help/hgrc.5.txt
+++ b/mercurial/help/hgrc.5.txt
@@ -34,7 +34,7 @@ 
 Copying
 =======
 This manual page is copyright 2005 Bryan O'Sullivan.
-Mercurial is copyright 2005-2015 Matt Mackall.
+Mercurial is copyright 2005-2016 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
@@ -613,7 +613,7 @@ 
 if py2exeloaded:
     extra['console'] = [
         {'script':'hg',
-         'copyright':'Copyright (C) 2005-2015 Matt Mackall and others',
+         'copyright':'Copyright (C) 2005-2016 Matt Mackall and others',
          'product_version':version}]
     # sub command of 'build' because 'py2exe' does not handle sub_commands
     build.sub_commands.insert(0, ('build_hgextindex', None))
diff --git a/tests/test-help.t b/tests/test-help.t
--- a/tests/test-help.t
+++ b/tests/test-help.t
@@ -436,7 +436,7 @@ 
   Mercurial Distributed SCM (version *) (glob)
   (see https://mercurial-scm.org for more information)
   
-  Copyright (C) 2005-2015 Matt Mackall and others
+  Copyright (C) 2005-2016 Matt Mackall and others
   This is free software; see the source for copying conditions. There is NO
   warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
diff --git a/tests/test-hgrc.t b/tests/test-hgrc.t
--- a/tests/test-hgrc.t
+++ b/tests/test-hgrc.t
@@ -71,7 +71,7 @@ 
   Mercurial Distributed SCM (version *) (glob)
   (see https://mercurial-scm.org for more information)
   
-  Copyright (C) 2005-2015 Matt Mackall and others
+  Copyright (C) 2005-2016 Matt Mackall and others
   This is free software; see the source for copying conditions. There is NO
   warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   $ unset FAKEPATH