← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/launchpad:2020-update into launchpad:master

 

Colin Watson has proposed merging ~cjwatson/launchpad:2020-update into launchpad:master.

Commit message:
Update copyright years to 2020

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/377343
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:2020-update into launchpad:master.
diff --git a/LICENSE b/LICENSE
index cd7120e..67b6744 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Launchpad is Copyright 2004-2019 Canonical Ltd.
+Launchpad is Copyright 2004-2020 Canonical Ltd.
 
 Canonical Ltd ("Canonical") distributes the Launchpad source code
 under the GNU Affero General Public License, version 3 ("AGPLv3").
diff --git a/lib/lp/app/stories/basics/copyright.txt b/lib/lp/app/stories/basics/copyright.txt
index 9450fed..c435fc2 100644
--- a/lib/lp/app/stories/basics/copyright.txt
+++ b/lib/lp/app/stories/basics/copyright.txt
@@ -5,11 +5,11 @@ The tour pages.
   >>> browser.open('http://launchpad.test/')
   >>> browser.getLink('Take the tour').click()
   >>> print extract_text(find_tag_by_id(browser.contents, 'footer-navigation'))
-  Next...© 2004-2019 Canonical Ltd...
+  Next...© 2004-2020 Canonical Ltd...
 
 The main template.
 
   >>> browser.open('http://launchpad.test')
   >>> print extract_text(find_tag_by_id(browser.contents, 'footer'))
-  © 2004-2019 Canonical Ltd.
+  © 2004-2020 Canonical Ltd.
   ...
diff --git a/lib/lp/app/templates/base-layout-macros.pt b/lib/lp/app/templates/base-layout-macros.pt
index 56b28e6..6d9be5d 100644
--- a/lib/lp/app/templates/base-layout-macros.pt
+++ b/lib/lp/app/templates/base-layout-macros.pt
@@ -285,7 +285,7 @@
     </div>
 
     <div class="colophon">
-      &copy; 2004-2019
+      &copy; 2004-2020
       <a href="http://canonical.com/";>Canonical&nbsp;Ltd.</a>
       &nbsp;&bull;&nbsp;
       <a tal:attributes="href string:${rooturl}legal">Terms of use</a>
diff --git a/lib/lp/app/tour/api b/lib/lp/app/tour/api
index b90fc99..d9fff29 100644
--- a/lib/lp/app/tour/api
+++ b/lib/lp/app/tour/api
@@ -131,7 +131,7 @@ We've even done the hard work for you: use our LGPL Python library &mdash; <a hr
                 <a href="feature-tracking" accesskey="g" tabindex="5">Next</a>
             </li>
              <li class="copyright">
-                &copy; 2004-2019 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
+                &copy; 2004-2020 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
             </li>
         </ul>
     </div>
diff --git a/lib/lp/app/tour/branch-hosting-tracking b/lib/lp/app/tour/branch-hosting-tracking
index f13b92c..f67faea 100644
--- a/lib/lp/app/tour/branch-hosting-tracking
+++ b/lib/lp/app/tour/branch-hosting-tracking
@@ -127,7 +127,7 @@ Thanks to Bazaar&rsquo;s workflow flexibility, all team members can commit to a 
                 <a href="translation" accesskey="g" tabindex="5" title="Read about software translation in Launchpad">Next</a>
             </li>
             <li class="copyright">
-                &copy; 2004-2019 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
+                &copy; 2004-2020 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
             </li>
         </ul>
     </div>
diff --git a/lib/lp/app/tour/bugs b/lib/lp/app/tour/bugs
index 594abe8..fb24244 100644
--- a/lib/lp/app/tour/bugs
+++ b/lib/lp/app/tour/bugs
@@ -134,7 +134,7 @@ And to help find low-hanging fruit, there&rsquo;s a &ldquo;Bugs fixed elsewhere&
                 <a href="branch-hosting-tracking" accesskey="g" tabindex="5" title="Read about code hosting and review in Launchpad">Next</a>
             </li>
             <li class="copyright">
-                &copy; 2004-2019 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="i" tabindex="7">Terms of Use</a> &#124; <a href="https://help.launchpad.net/Feedback"; accesskey="j" tabindex="8">Feedback</a> &#124; <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="k" tabindex="9">FAQ</a>
+                &copy; 2004-2020 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="i" tabindex="7">Terms of Use</a> &#124; <a href="https://help.launchpad.net/Feedback"; accesskey="j" tabindex="8">Feedback</a> &#124; <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="k" tabindex="9">FAQ</a>
             </li>
         </ul>
     </div>
diff --git a/lib/lp/app/tour/community b/lib/lp/app/tour/community
index f53921c..30c0879 100644
--- a/lib/lp/app/tour/community
+++ b/lib/lp/app/tour/community
@@ -113,7 +113,7 @@ Launchpad also helps you organise the social structure of your community with a 
                 <a href="ppa" accesskey="g" tabindex="5" title="Read about building and distributing Ubuntu packages">Next</a>
             </li>
             <li class="copyright">
-                &copy; 2004-2019 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
+                &copy; 2004-2020 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
             </li>
         </ul>
     </div>
diff --git a/lib/lp/app/tour/community-support b/lib/lp/app/tour/community-support
index 85488ca..e344e81 100644
--- a/lib/lp/app/tour/community-support
+++ b/lib/lp/app/tour/community-support
@@ -106,7 +106,7 @@
                 <a href="api" tabindex="5" accesskey="g">Next</a>
             </li>
             <li class="copyright">
-                &copy; 2004-2019 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
+                &copy; 2004-2020 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
             </li>
         </ul>
     </div>
diff --git a/lib/lp/app/tour/feature-tracking b/lib/lp/app/tour/feature-tracking
index cc3cef7..f08e4a8 100644
--- a/lib/lp/app/tour/feature-tracking
+++ b/lib/lp/app/tour/feature-tracking
@@ -88,7 +88,7 @@
                 <a href="release-management" accesskey="g" tabindex="5" title="Read about managing software releases">Next</a>
             </li>
             <li class="copyright">
-                &copy; 2004-2019 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
+                &copy; 2004-2020 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
             </li>
         </ul>
     </div>
diff --git a/lib/lp/app/tour/index b/lib/lp/app/tour/index
index 74d2021..d9786ec 100644
--- a/lib/lp/app/tour/index
+++ b/lib/lp/app/tour/index
@@ -174,7 +174,7 @@
                 <a href="bugs" accesskey="l" tabindex="10"  title="Read about bug tracking in Launchpad">Next</a>
             </li>
             <li class="copyright">
-                &copy; 2004-2019 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="i" tabindex="7">Terms of Use</a> &#124; <a href="https://help.launchpad.net/Feedback"; accesskey="j" tabindex="8">Feedback</a> &#124; <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="k" tabindex="9">FAQ</a>
+                &copy; 2004-2020 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="i" tabindex="7">Terms of Use</a> &#124; <a href="https://help.launchpad.net/Feedback"; accesskey="j" tabindex="8">Feedback</a> &#124; <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="k" tabindex="9">FAQ</a>
             </li>
         </ul>
     </div>
diff --git a/lib/lp/app/tour/join-launchpad b/lib/lp/app/tour/join-launchpad
index 958c688..dfb91c3 100644
--- a/lib/lp/app/tour/join-launchpad
+++ b/lib/lp/app/tour/join-launchpad
@@ -109,7 +109,7 @@ Launchpad is free to use for <a href="https://help.launchpad.net/Legal/ProjectLi
                 <a href="index" title="Return to the start of the Launchpad tour" accesskey="g" tabindex="5">Start</a>
             </li>
              <li class="copyright">
-                &copy; 2004-2019 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
+                &copy; 2004-2020 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
             </li>
         </ul>
     </div>
diff --git a/lib/lp/app/tour/ppa b/lib/lp/app/tour/ppa
index 3c00eb2..8a8cfb2 100644
--- a/lib/lp/app/tour/ppa
+++ b/lib/lp/app/tour/ppa
@@ -113,7 +113,7 @@
                 <a href="community-support" accesskey="g" tabindex="5">Next</a>
             </li>
             <li class="copyright">
-                &copy; 2004-2019 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
+                &copy; 2004-2020 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
             </li>
         </ul>
     </div>
diff --git a/lib/lp/app/tour/release-management b/lib/lp/app/tour/release-management
index 7d15fc0..acf89ca 100644
--- a/lib/lp/app/tour/release-management
+++ b/lib/lp/app/tour/release-management
@@ -96,7 +96,7 @@ Launchpad calls these <em>series</em> and helps you to organise your work &mdash
                 <a href="join-launchpad" title="Read about commercial features and free access to Launchpad" accesskey="g" tabindex="5" title="Read about commercial features and free access to Launchpad">Next</a>
             </li>
              <li class="copyright">
-                &copy; 2004-2019 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
+                &copy; 2004-2020 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
             </li>
         </ul>
     </div>
diff --git a/lib/lp/app/tour/translation b/lib/lp/app/tour/translation
index fd44b91..6112e32 100644
--- a/lib/lp/app/tour/translation
+++ b/lib/lp/app/tour/translation
@@ -113,7 +113,7 @@
                 <a href="community" accesskey="g" tabindex="5" title="Read about mailing lists and teams in Launchpad">Next</a>
             </li>
             <li class="copyright">
-                &copy; 2004-2019 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
+                &copy; 2004-2020 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
             </li>
         </ul>
     </div>
diff --git a/lib/lp/services/librarianserver/web.py b/lib/lp/services/librarianserver/web.py
index 693581f..36b4642 100644
--- a/lib/lp/services/librarianserver/web.py
+++ b/lib/lp/services/librarianserver/web.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2019 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __metaclass__ = type
@@ -49,7 +49,7 @@ defaultResource = static.Data("""
         file repository used by
         <a href="https://launchpad.net/";>Launchpad</a>.
         </p>
-        <p><small>Copyright 2004-2019 Canonical Ltd.</small></p>
+        <p><small>Copyright 2004-2020 Canonical Ltd.</small></p>
         <!-- kthxbye. -->
         </body></html>
         """, type='text/html')
diff --git a/lib/lp/services/mailman/monkeypatches/lp-mhonarc-common.mrc b/lib/lp/services/mailman/monkeypatches/lp-mhonarc-common.mrc
index 3d066cb..1129182 100644
--- a/lib/lp/services/mailman/monkeypatches/lp-mhonarc-common.mrc
+++ b/lib/lp/services/mailman/monkeypatches/lp-mhonarc-common.mrc
@@ -156,7 +156,7 @@ PAGE-BOTTOM
         </div>
     </div>
     <div class="colophon">
-      &copy; 2004-2019
+      &copy; 2004-2020
       <a href="http://canonical.com/";>Canonical&nbsp;Ltd.</a>
       &nbsp;&bull;&nbsp;
       <a href="https://launchpad.net/legal";>Terms of use</a>
diff --git a/lib/lp/testing/tests/test_standard_test_template.py b/lib/lp/testing/tests/test_standard_test_template.py
index 8e01c32..c018df1 100644
--- a/lib/lp/testing/tests/test_standard_test_template.py
+++ b/lib/lp/testing/tests/test_standard_test_template.py
@@ -1,4 +1,4 @@
-# Copyright 2019 Canonical Ltd.  This software is licensed under the
+# Copyright 2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """XXX: Module docstring goes here."""
diff --git a/lib/lp/testing/tests/test_standard_yuixhr_test_template.py b/lib/lp/testing/tests/test_standard_yuixhr_test_template.py
index 28d68ad..583439c 100644
--- a/lib/lp/testing/tests/test_standard_yuixhr_test_template.py
+++ b/lib/lp/testing/tests/test_standard_yuixhr_test_template.py
@@ -1,4 +1,4 @@
-# Copyright 2019 Canonical Ltd.  This software is licensed under the
+# Copyright 2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """{Describe your test suite here}.
diff --git a/standard_template.py b/standard_template.py
index 615b593..f07b58a 100644
--- a/standard_template.py
+++ b/standard_template.py
@@ -1,4 +1,4 @@
-# Copyright 2019 Canonical Ltd.  This software is licensed under the
+# Copyright 2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """XXX: Module docstring goes here."""
diff --git a/standard_test_template.html b/standard_test_template.html
index 6138b58..ae43335 100644
--- a/standard_test_template.html
+++ b/standard_test_template.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright 2019 Canonical Ltd.  This software is licensed under the
+Copyright 2020 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).
 -->
 
diff --git a/standard_test_template.js b/standard_test_template.js
index c95c254..9ad2a4d 100644
--- a/standard_test_template.js
+++ b/standard_test_template.js
@@ -1,4 +1,4 @@
-/* Copyright 2019 Canonical Ltd.  This software is licensed under the
+/* Copyright 2020 Canonical Ltd.  This software is licensed under the
  * GNU Affero General Public License version 3 (see the file LICENSE). */
 
 YUI.add('lp.${LIBRARY}.test', function (Y) {