Merge ~cjwatson/launchpad:copyright-2023 into launchpad:master

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: cd2bba04dd2130f7e395e13f32162c33aa1fdedc
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:copyright-2023
Merge into: launchpad:master
Diff against target: 255 lines (+22/-22)
20 files modified
LICENSE (+1/-1)
lib/lp/app/stories/basics/copyright.rst (+2/-2)
lib/lp/app/templates/base-layout-macros.pt (+1/-1)
lib/lp/app/tour/api (+1/-1)
lib/lp/app/tour/branch-hosting-tracking (+1/-1)
lib/lp/app/tour/bugs (+1/-1)
lib/lp/app/tour/community (+1/-1)
lib/lp/app/tour/community-support (+1/-1)
lib/lp/app/tour/feature-tracking (+1/-1)
lib/lp/app/tour/index (+1/-1)
lib/lp/app/tour/join-launchpad (+1/-1)
lib/lp/app/tour/ppa (+1/-1)
lib/lp/app/tour/release-management (+1/-1)
lib/lp/app/tour/translation (+1/-1)
lib/lp/services/librarianserver/web.py (+2/-2)
lib/lp/testing/tests/test_standard_test_template.py (+1/-1)
lib/lp/testing/tests/test_standard_yuixhr_test_template.py (+1/-1)
standard_template.py (+1/-1)
standard_test_template.html (+1/-1)
standard_test_template.js (+1/-1)
Reviewer Review Type Date Requested Status
Guruprasad Approve
Review via email: mp+436492@code.launchpad.net

Commit message

Update copyright years to 2023

Description of the change

This just updates user-visible page footers and templates for new files.

To post a comment you must log in.
Revision history for this message
Guruprasad (lgp171188) wrote :

LGTM 👍

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/LICENSE b/LICENSE
2index 7c1b573..2f2a36e 100644
3--- a/LICENSE
4+++ b/LICENSE
5@@ -1,4 +1,4 @@
6-Launchpad is Copyright 2004-2022 Canonical Ltd.
7+Launchpad is Copyright 2004-2023 Canonical Ltd.
8
9 Canonical Ltd ("Canonical") distributes the Launchpad source code
10 under the GNU Affero General Public License, version 3 ("AGPLv3").
11diff --git a/lib/lp/app/stories/basics/copyright.rst b/lib/lp/app/stories/basics/copyright.rst
12index ac3d808..650ed8f 100644
13--- a/lib/lp/app/stories/basics/copyright.rst
14+++ b/lib/lp/app/stories/basics/copyright.rst
15@@ -9,11 +9,11 @@ The tour pages.
16 ... find_tag_by_id(browser.contents, "footer-navigation")
17 ... )
18 ... )
19- Next...© 2004-2022 Canonical Ltd...
20+ Next...© 2004-2023 Canonical Ltd...
21
22 The main template.
23
24 >>> browser.open("http://launchpad.test")
25 >>> print(extract_text(find_tag_by_id(browser.contents, "footer")))
26- © 2004-2022 Canonical Ltd.
27+ © 2004-2023 Canonical Ltd.
28 ...
29diff --git a/lib/lp/app/templates/base-layout-macros.pt b/lib/lp/app/templates/base-layout-macros.pt
30index 98e9544..54980ff 100644
31--- a/lib/lp/app/templates/base-layout-macros.pt
32+++ b/lib/lp/app/templates/base-layout-macros.pt
33@@ -285,7 +285,7 @@
34 </div>
35
36 <div class="colophon">
37- &copy; 2004-2022
38+ &copy; 2004-2023
39 <a href="http://canonical.com/">Canonical&nbsp;Ltd.</a>
40 &nbsp;&bull;&nbsp;
41 <a tal:attributes="href string:${rooturl}legal">Terms of use</a>
42diff --git a/lib/lp/app/tour/api b/lib/lp/app/tour/api
43index e344d35..37e2764 100644
44--- a/lib/lp/app/tour/api
45+++ b/lib/lp/app/tour/api
46@@ -130,7 +130,7 @@ We've even done the hard work for you: use our LGPL Python library &mdash; <a hr
47 <a href="feature-tracking" accesskey="g" tabindex="5">Next</a>
48 </li>
49 <li class="copyright">
50- &copy; 2004-2022 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>
51+ &copy; 2004-2023 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>
52 </li>
53 </ul>
54 </div>
55diff --git a/lib/lp/app/tour/branch-hosting-tracking b/lib/lp/app/tour/branch-hosting-tracking
56index 7050690..b527c6c 100644
57--- a/lib/lp/app/tour/branch-hosting-tracking
58+++ b/lib/lp/app/tour/branch-hosting-tracking
59@@ -126,7 +126,7 @@ All team members can commit to a centrally hosted branch, while anyone can still
60 <a href="translation" accesskey="g" tabindex="5" title="Read about software translation in Launchpad">Next</a>
61 </li>
62 <li class="copyright">
63- &copy; 2004-2022 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>
64+ &copy; 2004-2023 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>
65 </li>
66 </ul>
67 </div>
68diff --git a/lib/lp/app/tour/bugs b/lib/lp/app/tour/bugs
69index a692f3c..f122f4f 100644
70--- a/lib/lp/app/tour/bugs
71+++ b/lib/lp/app/tour/bugs
72@@ -133,7 +133,7 @@ And to help find low-hanging fruit, there&rsquo;s a &ldquo;Bugs fixed elsewhere&
73 <a href="branch-hosting-tracking" accesskey="g" tabindex="5" title="Read about code hosting and review in Launchpad">Next</a>
74 </li>
75 <li class="copyright">
76- &copy; 2004-2022 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>
77+ &copy; 2004-2023 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>
78 </li>
79 </ul>
80 </div>
81diff --git a/lib/lp/app/tour/community b/lib/lp/app/tour/community
82index 67adfc7..3d36549 100644
83--- a/lib/lp/app/tour/community
84+++ b/lib/lp/app/tour/community
85@@ -112,7 +112,7 @@ Launchpad also helps you organise the social structure of your community with a
86 <a href="ppa" accesskey="g" tabindex="5" title="Read about building and distributing Ubuntu packages">Next</a>
87 </li>
88 <li class="copyright">
89- &copy; 2004-2022 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>
90+ &copy; 2004-2023 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>
91 </li>
92 </ul>
93 </div>
94diff --git a/lib/lp/app/tour/community-support b/lib/lp/app/tour/community-support
95index cbdff3f..c0e5551 100644
96--- a/lib/lp/app/tour/community-support
97+++ b/lib/lp/app/tour/community-support
98@@ -105,7 +105,7 @@
99 <a href="api" tabindex="5" accesskey="g">Next</a>
100 </li>
101 <li class="copyright">
102- &copy; 2004-2022 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>
103+ &copy; 2004-2023 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>
104 </li>
105 </ul>
106 </div>
107diff --git a/lib/lp/app/tour/feature-tracking b/lib/lp/app/tour/feature-tracking
108index 0e13db7..a35ddee 100644
109--- a/lib/lp/app/tour/feature-tracking
110+++ b/lib/lp/app/tour/feature-tracking
111@@ -87,7 +87,7 @@
112 <a href="release-management" accesskey="g" tabindex="5" title="Read about managing software releases">Next</a>
113 </li>
114 <li class="copyright">
115- &copy; 2004-2022 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>
116+ &copy; 2004-2023 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>
117 </li>
118 </ul>
119 </div>
120diff --git a/lib/lp/app/tour/index b/lib/lp/app/tour/index
121index a40b8ec..1398755 100644
122--- a/lib/lp/app/tour/index
123+++ b/lib/lp/app/tour/index
124@@ -173,7 +173,7 @@
125 <a href="bugs" accesskey="l" tabindex="10" title="Read about bug tracking in Launchpad">Next</a>
126 </li>
127 <li class="copyright">
128- &copy; 2004-2022 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>
129+ &copy; 2004-2023 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>
130 </li>
131 </ul>
132 </div>
133diff --git a/lib/lp/app/tour/join-launchpad b/lib/lp/app/tour/join-launchpad
134index ab277a7..146bf32 100644
135--- a/lib/lp/app/tour/join-launchpad
136+++ b/lib/lp/app/tour/join-launchpad
137@@ -108,7 +108,7 @@ Launchpad is free to use for <a href="https://help.launchpad.net/Legal/ProjectLi
138 <a href="index" title="Return to the start of the Launchpad tour" accesskey="g" tabindex="5">Start</a>
139 </li>
140 <li class="copyright">
141- &copy; 2004-2022 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>
142+ &copy; 2004-2023 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>
143 </li>
144 </ul>
145 </div>
146diff --git a/lib/lp/app/tour/ppa b/lib/lp/app/tour/ppa
147index c160373..99c4b6d 100644
148--- a/lib/lp/app/tour/ppa
149+++ b/lib/lp/app/tour/ppa
150@@ -112,7 +112,7 @@
151 <a href="community-support" accesskey="g" tabindex="5">Next</a>
152 </li>
153 <li class="copyright">
154- &copy; 2004-2022 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>
155+ &copy; 2004-2023 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>
156 </li>
157 </ul>
158 </div>
159diff --git a/lib/lp/app/tour/release-management b/lib/lp/app/tour/release-management
160index 67e1f16..5168fc6 100644
161--- a/lib/lp/app/tour/release-management
162+++ b/lib/lp/app/tour/release-management
163@@ -95,7 +95,7 @@ Launchpad calls these <em>series</em> and helps you to organise your work &mdash
164 <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>
165 </li>
166 <li class="copyright">
167- &copy; 2004-2022 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>
168+ &copy; 2004-2023 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>
169 </li>
170 </ul>
171 </div>
172diff --git a/lib/lp/app/tour/translation b/lib/lp/app/tour/translation
173index 5ba539c..78d6bf7 100644
174--- a/lib/lp/app/tour/translation
175+++ b/lib/lp/app/tour/translation
176@@ -112,7 +112,7 @@
177 <a href="community" accesskey="g" tabindex="5" title="Read about mailing lists and teams in Launchpad">Next</a>
178 </li>
179 <li class="copyright">
180- &copy; 2004-2022 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>
181+ &copy; 2004-2023 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>
182 </li>
183 </ul>
184 </div>
185diff --git a/lib/lp/services/librarianserver/web.py b/lib/lp/services/librarianserver/web.py
186index ad69619..17a356e 100644
187--- a/lib/lp/services/librarianserver/web.py
188+++ b/lib/lp/services/librarianserver/web.py
189@@ -1,4 +1,4 @@
190-# Copyright 2009-2022 Canonical Ltd. This software is licensed under the
191+# Copyright 2009-2023 Canonical Ltd. This software is licensed under the
192 # GNU Affero General Public License version 3 (see the file LICENSE).
193
194 import time
195@@ -31,7 +31,7 @@ defaultResource = static.Data(
196 file repository used by
197 <a href="https://launchpad.net/">Launchpad</a>.
198 </p>
199- <p><small>Copyright 2004-2022 Canonical Ltd.</small></p>
200+ <p><small>Copyright 2004-2023 Canonical Ltd.</small></p>
201 <!-- kthxbye. -->
202 </body></html>
203 """,
204diff --git a/lib/lp/testing/tests/test_standard_test_template.py b/lib/lp/testing/tests/test_standard_test_template.py
205index 2d03290..685908c 100644
206--- a/lib/lp/testing/tests/test_standard_test_template.py
207+++ b/lib/lp/testing/tests/test_standard_test_template.py
208@@ -1,4 +1,4 @@
209-# Copyright 2022 Canonical Ltd. This software is licensed under the
210+# Copyright 2023 Canonical Ltd. This software is licensed under the
211 # GNU Affero General Public License version 3 (see the file LICENSE).
212
213 """XXX: Module docstring goes here."""
214diff --git a/lib/lp/testing/tests/test_standard_yuixhr_test_template.py b/lib/lp/testing/tests/test_standard_yuixhr_test_template.py
215index fd6e786..736fd10 100644
216--- a/lib/lp/testing/tests/test_standard_yuixhr_test_template.py
217+++ b/lib/lp/testing/tests/test_standard_yuixhr_test_template.py
218@@ -1,4 +1,4 @@
219-# Copyright 2022 Canonical Ltd. This software is licensed under the
220+# Copyright 2023 Canonical Ltd. This software is licensed under the
221 # GNU Affero General Public License version 3 (see the file LICENSE).
222
223 """{Describe your test suite here}.
224diff --git a/standard_template.py b/standard_template.py
225index c676290..30ca2a1 100644
226--- a/standard_template.py
227+++ b/standard_template.py
228@@ -1,4 +1,4 @@
229-# Copyright 2022 Canonical Ltd. This software is licensed under the
230+# Copyright 2023 Canonical Ltd. This software is licensed under the
231 # GNU Affero General Public License version 3 (see the file LICENSE).
232
233 """XXX: Module docstring goes here."""
234diff --git a/standard_test_template.html b/standard_test_template.html
235index 1c127f2..a3d3fb2 100644
236--- a/standard_test_template.html
237+++ b/standard_test_template.html
238@@ -1,6 +1,6 @@
239 <!DOCTYPE html>
240 <!--
241-Copyright 2022 Canonical Ltd. This software is licensed under the
242+Copyright 2023 Canonical Ltd. This software is licensed under the
243 GNU Affero General Public License version 3 (see the file LICENSE).
244 -->
245
246diff --git a/standard_test_template.js b/standard_test_template.js
247index 38d318e..89df631 100644
248--- a/standard_test_template.js
249+++ b/standard_test_template.js
250@@ -1,4 +1,4 @@
251-/* Copyright 2022 Canonical Ltd. This software is licensed under the
252+/* Copyright 2023 Canonical Ltd. This software is licensed under the
253 * GNU Affero General Public License version 3 (see the file LICENSE). */
254
255 YUI.add('lp.$LIBRARY.test', function (Y) {

Subscribers

People subscribed via source and target branches

to status/vote changes: