Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~laurynas-biveinis/percona-server/c-change-2013-5.1 into lp:percona-server/5.1

  1. c-change-2013-5.1
  2. Merge into 5.1
Proposed by Laurynas Biveinis
Status: Merged
Approved by: Hrvoje Matijakovic
Approved revision: no longer in the source branch.
Merged at revision: 586
Proposed branch: lp:~laurynas-biveinis/percona-server/c-change-2013-5.1
Merge into: lp:percona-server/5.1
Diff against target: 64 lines (+8/-6)
3 files modified
Percona-Server/include/welcome_copyright_notice.h (+4/-2)
doc/source/conf.py (+3/-3)
doc/source/copyright.rst (+1/-1)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/c-change-2013-5.1
Reviewer Review Type Date Requested Status
Hrvoje Matijakovic Approve
Vadim Tkachenko Approve
Review via email: mp+181346@code.launchpad.net

Description of the change

Update copyright notices to replace
"Copyright (c) 2009-2013 Percona Ireland Ltd."
with
"Copyright (c) 2009-2013 Percona LLC and/or its affiliates".

http://jenkins.percona.com/job/percona-server-5.1-param/567/

To post a comment you must log in.
Revision history for this message
Vadim Tkachenko (vadim-tk) :
review: Approve
Revision history for this message
Hrvoje Matijakovic (hrvojem) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/include/welcome_copyright_notice.h'
2--- Percona-Server/include/welcome_copyright_notice.h 2013-06-13 05:06:40 +0000
3+++ Percona-Server/include/welcome_copyright_notice.h 2013-08-21 16:14:43 +0000
4@@ -24,12 +24,14 @@
5 */
6 #define ORACLE_WELCOME_COPYRIGHT_NOTICE(first_year) \
7 (strcmp(first_year, COPYRIGHT_NOTICE_CURRENT_YEAR) ? \
8- "Copyright (c) 2009-" COPYRIGHT_NOTICE_CURRENT_YEAR " Percona Ireland Ltd.\n" \
9+ "Copyright (c) 2009-" COPYRIGHT_NOTICE_CURRENT_YEAR \
10+ " Percona LLC and/or its affiliates\n" \
11 "Copyright (c) " first_year ", " COPYRIGHT_NOTICE_CURRENT_YEAR ", " \
12 "Oracle and/or its affiliates. All rights reserved.\n\nOracle is a " \
13 "registered trademark of Oracle Corporation and/or its\naffiliates. " \
14 "Other names may be trademarks of their respective\nowners.\n" : \
15- "Copyright (c) 2009-" COPYRIGHT_NOTICE_CURRENT_YEAR " Percona Ireland Ltd.\n" \
16+ "Copyright (c) 2009-" COPYRIGHT_NOTICE_CURRENT_YEAR \
17+ " Percona LLC and/or its affiliates\n" \
18 "Copyright (c) " first_year ", Oracle and/or its affiliates. " \
19 "All rights reserved.\n\nOracle is a registered trademark of " \
20 "Oracle Corporation and/or its\naffiliates. Other names may be " \
21
22=== modified file 'doc/source/conf.py'
23--- doc/source/conf.py 2013-07-03 09:41:09 +0000
24+++ doc/source/conf.py 2013-08-21 16:14:43 +0000
25@@ -45,7 +45,7 @@
26
27 # General information about the project.
28 project = u'Percona Server'
29-copyright = u'Percona Ireland Ltd. 2009-2013'
30+copyright = u'Percona LLC and/or its affiliates 2009-2013'
31
32 # The version info for the project you're documenting, acts as replacement for
33 # |version| and |release|, also used in various other places throughout the
34@@ -227,7 +227,7 @@
35 # (source start file, target name, title, author, documentclass [howto/manual]).
36 latex_documents = [
37 ('index', 'PerconaServer-5.1.tex', u'Percona Server Documentation',
38- u'Percona Ireland Ltd. 2009-2013', 'manual'),
39+ u'Percona LLC and/or its affiliates 2009-2013', 'manual'),
40 ]
41
42 # The name of an image file (relative to this directory) to place at the top of
43@@ -260,7 +260,7 @@
44 # (source start file, name, description, authors, manual section).
45 man_pages = [
46 ('index', 'perconaserver51', u'Percona Server 5.1 Documentation',
47- [u'Percona Ireland Ltd. 2009-2013'], 1)
48+ [u'Percona LLC and/or its affiliates 2009-2013'], 1)
49 ]
50
51
52
53=== modified file 'doc/source/copyright.rst'
54--- doc/source/copyright.rst 2013-06-12 05:29:26 +0000
55+++ doc/source/copyright.rst 2013-08-21 16:14:43 +0000
56@@ -6,7 +6,7 @@
57 Documentation Licensing
58 =======================
59
60-This software documentation is (C)2009-2013 Percona Ireland Ltd. and is distributed under the `Creative Commons Attribution-ShareAlike 2.0 Generic <http://creativecommons.org/licenses/by-sa/2.0/>`_ license.
61+This software documentation is (C)2009-2013 Percona LLC and/or its affiliates and is distributed under the `Creative Commons Attribution-ShareAlike 2.0 Generic <http://creativecommons.org/licenses/by-sa/2.0/>`_ license.
62
63 Software License
64 ================

Subscribers

People subscribed via source and target branches