Merge lp:~akopytov/percona-xtrabackup/copyright-notice-1.6 into lp:percona-xtrabackup/1.6

[Alexey Kopytov]

[Vadim Tkachenko (vadim-tk)]

review: Approve

=== modified file 'doc/source/conf.py'
--- doc/source/conf.py	2012-12-17 12:37:33 +0000
+++ doc/source/conf.py	2013-01-11 13:15:33 +0000
@@ -44,7 +44,7 @@
 
 # General information about the project.
 project = u'Percona XtraBackup'
-copyright = u'2010-2012, Percona Inc'
+copyright = u'2010-2012, Percona Ireland Ltd'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -221,7 +221,7 @@
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
   ('index', 'PerconaXtraBackup.tex', u'Percona XtraBackup Documentation',
-   u'Percona Inc', 'manual'),
+   u'Percona Ireland Ltd', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -254,7 +254,7 @@
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('index', 'perconaxtrabackup', u'Percona XtraBackup Documentation',
-     [u'Percona Inc'], 1)
+     [u'Percona Ireland Ltd'], 1)
 ]
 
 # Example configuration for intersphinx: refer to the Python standard library.
 
=== modified file 'doc/source/percona-theme/layout.html'
--- doc/source/percona-theme/layout.html	2012-07-13 10:36:41 +0000
+++ doc/source/percona-theme/layout.html	2013-01-11 13:15:33 +0000
@@ -319,7 +319,7 @@
           Call us: 1-888-316-9775 • <a href="/contact">Contact Us</a><br>
           MySQL and InnoDB are trademarks of Oracle Corp.<br>
           Proudly running <a href="/software/percona-server/">Percona Server<span id="recentServerVersion"></span></a><br>
-          Copyright &copy; 2006-2011 Percona Inc.<br>
+          Copyright &copy; 2006-2011 Percona Ireland Ltd<br>
           <a href="/about-us/policies/">Copyright, Trademark, and Privacy Policy</a> • <a href="/sitemap/">Sitemap</a>
           <span class="inv"><!--[CDATA[</noindex-->]]&gt;</span>
        </div>
 
=== modified file 'doc/source/trademark-policy.rst'
--- doc/source/trademark-policy.rst	2012-02-16 17:05:16 +0000
+++ doc/source/trademark-policy.rst	2013-01-11 13:15:33 +0000
@@ -18,6 +18,6 @@
 
 Neither trademark law nor any of the exceptions set forth in this Trademark Policy permit you to truncate, modify or otherwise use any Percona mark as part of your own brand.  For example, if XYZ creates a modified version of the Percona Server, XYZ may not brand that modification as "XYZ Percona Server" or "Percona XYZ Server", even if that modification otherwise complies with the third exception noted above.
 
-In all cases, you must comply with applicable law, the underlying license, and this Trademark Policy, as amended from time to time.  For instance, any mention of Percona trademarks should include the full trademarked name, with proper spelling and capitalization, along with attribution of ownership to Percona Inc.  For example, the full proper name for XtraBackup is Percona XtraBackup. However, it is acceptable to omit the word "Percona" for brevity on the second and subsequent uses, where such omission does not cause confusion.
+In all cases, you must comply with applicable law, the underlying license, and this Trademark Policy, as amended from time to time.  For instance, any mention of Percona trademarks should include the full trademarked name, with proper spelling and capitalization, along with attribution of ownership to Percona Ireland Ltd.  For example, the full proper name for XtraBackup is Percona XtraBackup. However, it is acceptable to omit the word "Percona" for brevity on the second and subsequent uses, where such omission does not cause confusion.
 
-In the event of doubt as to any of the conditions or exceptions outlined in this Trademark Policy, please contact [e-mail] for assistance and we will do our very best to be helpful.
 \ No newline at end of file
+In the event of doubt as to any of the conditions or exceptions outlined in this Trademark Policy, please contact [e-mail] for assistance and we will do our very best to be helpful.
 
=== modified file 'doc/xtrabackup.1'
--- doc/xtrabackup.1	2011-01-10 12:01:38 +0000
+++ doc/xtrabackup.1	2013-01-11 13:15:33 +0000
@@ -1,4 +1,4 @@
-.TH "XtraBackup" 1 "January 2011" "" "Percona Inc"
+.TH "XtraBackup" 1 "January 2011" "" "Percona Ireland Ltd"
 .SH "NAME"
 Percona XtraBackup
 .SH "DESCRIPTION"
@@ -1478,7 +1478,7 @@
 .B "buf_page_is_corrupted()"
 function.  If the page is corrupt, it re-reads and retries up to 10 times for each page.  It skips this check on the doublewrite buffer.
 .SH "AUTHOR"
-Percona Inc. http://www.percona.com/
+Percona Ireland Ltd. http://www.percona.com/
 .SH "REPORTING BUGS"
 Report bugs to https://bugs.launchpad.net/percona-xtrabackup/+filebug
 .SH "LICENCE"
 
=== modified file 'innobackupex'
--- innobackupex	2012-11-29 09:24:17 +0000
+++ innobackupex	2013-01-11 13:15:33 +0000
@@ -3,7 +3,8 @@
 # A script for making backups of InnoDB and MyISAM tables, indexes and .frm
 # files.
 #
-# Copyright 2003, 2009 Innobase Oy and Percona Inc 2009-2012. All Rights Reserved.
+# Copyright 2003, 2009 Innobase Oy and Percona Ireland Ltd 2009-2012.
+# All Rights Reserved.
 #
 
 use strict;
@@ -26,7 +27,7 @@
 # copyright notice
 my $copyright_notice =
 "InnoDB Backup Utility v${innobackup_version}; Copyright 2003, 2009 Innobase Oy
-and Percona Inc 2009-2012.  All Rights Reserved.
+and Percona Ireland Ltd 2009-2012.  All Rights Reserved.
 
 This software is published under
 the GNU GENERAL PUBLIC LICENSE Version 2, June 1991.
 
=== modified file 'patches/tar4ibd_libtar-1.2.11.patch'
--- patches/tar4ibd_libtar-1.2.11.patch	2012-01-16 11:49:20 +0000
+++ patches/tar4ibd_libtar-1.2.11.patch	2013-01-11 13:15:33 +0000
@@ -1,4 +1,4 @@
-# (c) 2009 - 2011 Percona Inc.
+# (c) 2009 - 2011 Percona Ireland Ltd.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'xtrabackup.c'
--- xtrabackup.c	2012-11-19 02:12:39 +0000
+++ xtrabackup.c	2013-01-11 13:15:33 +0000
@@ -1,6 +1,6 @@
 /******************************************************
 XtraBackup: hot backup tool for InnoDB
-(c) 2009-2012 Percona Inc.
+(c) 2009-2012 Percona Ireland Ltd
 Originally Created 3/3/2009 Yasufumi Kinoshita
 Written by Alexey Kopytov, Aleksandr Kuzminsky, Stewart Smith, Vadim Tkachenko,
 Yasufumi Kinoshita, Ignacio Nin and Baron Schwartz.
@@ -1251,7 +1251,7 @@
 {
   puts("Open source backup tool for InnoDB and XtraDB\n\
 \n\
-Copyright (C) 2009-2012 Percona Inc.\n\
+Copyright (C) 2009-2012 Percona Ireland Ltd.\n\
 Portions Copyright (C) 2000, 2011, MySQL AB & Innobase Oy. All Rights Reserved.\n\
 \n\
 This program is free software; you can redistribute it and/or\n\