Bug #30145579 UPDATE README IN SOURCE TREE TO NEW FORMAT

This also involves removing COPYING and replacing it with the License Book.

Packaging changes accordingly.

Change-Id: I7280e1d4ffaaa5adfb887848a063531285190911

CMakeLists.txt

@@ -794,12 +794,10 @@ ENDIF()
 # RPM installs documentation directly from the source tree
 #
 IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-  INSTALL(FILES COPYING LICENSE.mysql 
-  DESTINATION ${INSTALL_DOCREADMEDIR} 
-  COMPONENT Readme
-  OPTIONAL
-  )
-  INSTALL(FILES README DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
+  INSTALL(FILES
+    README
+    LICENSE
+    DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
   INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})
 
   # MYSQL_DOCS_LOCATON is used in "make dist", points to the documentation directory

README

@@ -1,56 +1,17 @@
-MySQL Server 5.7
-
-This is a release of MySQL, a dual-license SQL database server.
-For the avoidance of doubt, this particular copy of the software
-is released under the version 2 of the GNU General Public License.
-MySQL is brought to you by Oracle.
-
 Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
 
-License information can be found in the COPYING file.
-
-MySQL FOSS License Exception
-We want free and open source software applications under certain
-licenses to be able to use specified GPL-licensed MySQL client
-libraries despite the fact that not all such FOSS licenses are
-compatible with version 2 of the GNU General Public License.
-Therefore there are special exceptions to the terms and conditions
-of the GPLv2 as applied to these client libraries, which are
-identified and described in more detail in the FOSS License
-Exception at
-<http://www.mysql.com/about/legal/licensing/foss-exception.html>.
+This is a release of MySQL, an SQL database server.
 
-This distribution may include materials developed by third
-parties. For license and attribution notices for these
-materials, please refer to the documentation that accompanies
-this distribution (see the "Licenses for Third-Party Components"
-appendix) or view the online documentation at
-<http://dev.mysql.com/doc/>.
+License information can be found in the LICENSE file.
 
-GPLv2 Disclaimer
-For the avoidance of doubt, except that if any license choice
-other than GPL or LGPL is available it will apply instead,
-Oracle elects to use only the General Public License version 2
-(GPLv2) at this time for any software where a choice of GPL
-license versions is made available with the language indicating
-that GPLv2 or any later version may be used, or where a choice
-of which version of the GPL is applied is otherwise unspecified.
+This distribution may include materials developed by third parties.
+For license and attribution notices for these materials,
+please refer to the LICENSE file.
 
-For further information about MySQL or additional documentation,
-see:
-- The latest information about MySQL: http://www.mysql.com
-- The current MySQL documentation: http://dev.mysql.com/doc
+For further information on MySQL or additional documentation, visit
+  http://dev.mysql.com/doc/
 
-Some Reference Manual sections of special interest:
-- If you are migrating from an older version of MySQL, please
-  read the "Upgrading from..." section.
-- To see what MySQL can do, take a look at the features section.
-- For installation instructions, see the Installing and Upgrading
-  chapter.
-- For the new features/bugfix history, see the MySQL Change History
-  appendix.
+For additional downloads and the source of MySQL, visit
+  http://dev.mysql.com/downloads/
 
-You can browse the MySQL Reference Manual online or download it
-in any of several formats at the URL given earlier in this file.
-Source distributions include a local copy of the manual in the
-Docs directory.
+MySQL is brought to you by the MySQL team at Oracle.

packaging/WiX/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,
@@ -75,22 +75,18 @@ FIND_PROGRAM(CANDLE_EXECUTABLE candle ${WIX_DIR})
 FIND_PROGRAM(LIGHT_EXECUTABLE light ${WIX_DIR})
 
 # WiX wants the license text as rtf; if there is no rtf license, 
-# we create a fake one from the plain text COPYING file.
-IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.rtf")
- SET(COPYING_RTF "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.rtf")
+# we create a fake one from the plain text LICENSE file.
+IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.rtf")
+ SET(LICENSE_RTF "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.rtf")
 ELSE()
-  IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../LICENSE.mysql")
-    SET(LICENSE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../../LICENSE.mysql")
-  ELSE()
-    SET(LICENSE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../../COPYING")
-  ENDIF()
+  SET(LICENSE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../../LICENSE")
   FILE(READ ${LICENSE_FILE} CONTENTS)
   STRING(REGEX REPLACE "\n" "\\\\par\n" CONTENTS "${CONTENTS}")
   STRING(REGEX REPLACE "\t" "\\\\tab" CONTENTS "${CONTENTS}")
-  FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/COPYING.rtf" "{\\rtf1\\ansi\\deff0{\\fonttbl{\\f0\\fnil\\fcharset0 Courier New;}}\\viewkind4\\uc1\\pard\\lang1031\\f0\\fs15")
-  FILE(APPEND "${CMAKE_CURRENT_BINARY_DIR}/COPYING.rtf" "${CONTENTS}")
-  FILE(APPEND "${CMAKE_CURRENT_BINARY_DIR}/COPYING.rtf" "\n}\n")
-  SET(COPYING_RTF "${CMAKE_CURRENT_BINARY_DIR}/COPYING.rtf")
+  FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.rtf" "{\\rtf1\\ansi\\deff0{\\fonttbl{\\f0\\fnil\\fcharset0 Courier New;}}\\viewkind4\\uc1\\pard\\lang1031\\f0\\fs15")
+  FILE(APPEND "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.rtf" "${CONTENTS}")
+  FILE(APPEND "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.rtf" "\n}\n")
+  SET(LICENSE_RTF "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.rtf")
 ENDIF()
 SET(CPACK_WIX_CONFIG ${CMAKE_CURRENT_SOURCE_DIR}/CPackWixConfig.cmake)
 SET(CPACK_WIX_INCLUDE "${CMAKE_CURRENT_BINARY_DIR}/mysql_server_extra.wxs;${CMAKE_CURRENT_SOURCE_DIR}/custom_ui.wxs")
@@ -145,4 +141,4 @@ ADD_CUSTOM_TARGET(
   ${CONFIG_PARAM} 
   -P  ${CMAKE_CURRENT_BINARY_DIR}/create_msi.cmake
 )
-ADD_DEPENDENCIES(MSI configure_mysql_server_extra)
+ADD_DEPENDENCIES(MSI configure_mysql_server_extra)

packaging/WiX/create_msi.cmake.in

@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,
@@ -39,7 +39,7 @@ IF("${VERSION}" MATCHES "-ndb-")
 ENDIF()
 SET(CMAKE_SIZEOF_VOID_P @CMAKE_SIZEOF_VOID_P@)
 SET(MANUFACTURER "@MANUFACTURER@")
-SET(COPYING_RTF "@COPYING_RTF@")
+SET(LICENSE_RTF "@LICENSE_RTF@")
 SET(CPACK_WIX_CONFIG "@CPACK_WIX_CONFIG@")
 SET(CPACK_WIX_INCLUDE "@CPACK_WIX_INCLUDE@")
 SET(PRODUCT_NAME "MySQL Server")
@@ -431,4 +431,4 @@ EXECUTE_PROCESS(
 
 IF(LIGHT_RESULT)
   MESSAGE(FATAL_ERROR "ERROR: can't run light")
-ENDIF()
+ENDIF()

packaging/WiX/mysql_server.wxs.in

@@ -2,7 +2,7 @@
       xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 
 <!--
-   Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
@@ -179,7 +179,7 @@
     <!-- License -->
     <WixVariable
       Id="WixUILicenseRtf"
-      Value="@COPYING_RTF@"/>
+      Value="@LICENSE_RTF@"/>
 
     <!-- Installation root-->
     <Directory Id='TARGETDIR' Name='SourceDir'>

packaging/deb-in/CMakeLists.txt

@@ -61,7 +61,6 @@ IF (DEB_PRODUCT STREQUAL "commercial")
   SET (DEB_PRODUCTNAMEC "${DEB_BASE_PRODUCTC}Commercial")
   SET (DEB_NOTPRODUCTNAME "${DEB_BASE_PRODUCT}community")
   SET (DEB_LICENSENAME "Advanced")
-  SET (DEB_INSTALL_LICENSEFILE "LICENSE.mysql")
   SET (DEB_SERVERVERSION "${DEB_BASE_VERSION}+commercial-1")
   # List of plugins that are only in commercial packages
   # Plugins that are in both community and commercial should NOT be added here
@@ -132,10 +131,10 @@ ELSE()
   SET (DEB_PRODUCTNAMEC "${DEB_BASE_PRODUCTC}Community")
   SET (DEB_NOTPRODUCTNAME "${DEB_BASE_PRODUCT}commercial")
   SET (DEB_LICENSENAME "GPL")
-  SET (DEB_INSTALL_LICENSEFILE "COPYING")
   SET (DEB_SERVERVERSION "${DEB_BASE_VERSION}-1")
   SET (DEB_REMOVEPATTERN "com.in")
 ENDIF()
+SET (DEB_INSTALL_LICENSEFILE "LICENSE")
 
 # Generate debug symbol packages (this is done automatically in Debian9+)
 SET (DEB_RULES_STRIP_DEFAULT

packaging/deb-in/copyright.com.in

@@ -4,61 +4,21 @@ Upstream-Contact: MySQL Release Engineering <[email protected]>
 Source: http://dev.mysql.com/
 
 Files: *
-Copyright: 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright: 2000, 2019, Oracle and/or its affiliates. All rights reserved.
 License: Commercial
- This is a release of MySQL, a dual-license SQL database server.
- For the avoidance of doubt, this particular copy of the software
- is released under a commercial license and the GNU General Public
- License does not apply. MySQL is brought to you by Oracle.
+ This is a release of MySQL, an SQL database server.
  .
- This distribution may include materials developed by third
- parties. For license and attribution notices for these
- materials, please refer to the documentation that accompanies
- this distribution (see the "Licenses for Third-Party Components"
- appendix) or view the online documentation at
- <http://dev.mysql.com/doc/>.
+ License information can be found in the LICENSE file.
  .
- This software and related documentation are provided under a license
- agreement containing restrictions on use and disclosure and are protected by
- intellectual property laws. Except as expressly permitted in your license
- agreement or allowed by law, you may not use, copy, reproduce, translate,
- broadcast, modify, license, transmit, distribute, exhibit, perform, publish,
- or display any part, in any form, or by any means. Reverse engineering,
- disassembly, or decompilation of this software, unless required by law for
- interoperability, is prohibited.
+ This distribution may include materials developed by third parties.
+ For license and attribution notices for these materials,
+ please refer to the LICENSE file.
  .
- If this software or related documentation is delivered to the U.S.
- Government or anyone licensing it on behalf of the U.S. Government, the
- following notice is applicable:
+ For more information on MySQL, visit 
+ https://docs.oracle.com/cd/E17952_01/mysql-5.7-en/index.html
+ or http://dev.mysql.com/doc/
  .
- U.S. GOVERNMENT RIGHTS Programs, software, databases, and related
- documentation and technical data delivered to U.S. Government customers are
- "commercial computer software" or "commercial technical data" pursuant to
- the applicable Federal Acquisition Regulation and agency-specific
- supplemental regulations. As such, the use, duplication, disclosure,
- modification, and adaptation shall be subject to the restrictions and
- license terms set forth in the applicable Government contract, and, to the
- extent applicable by the terms of the Government contract, the additional
- rights set forth in FAR 52.227-19, Commercial Computer Software License
- (December 2007). Oracle USA, Inc., 500 Oracle Parkway, Redwood City, CA
- 94065.
+ For additional downloads of MySQL, visit
+ https://support.oracle.com/
  .
- This software is developed for general use in a variety of information
- management applications. It is not developed or intended for use in any
- inherently dangerous applications, including applications which may create a
- risk of personal injury. If you use this software in dangerous applications,
- then you shall be responsible to take all appropriate fail-safe, backup,
- redundancy, and other measures to ensure the safe use of this software.
- Oracle Corporation and its affiliates disclaim any liability for any damages
- caused by use of this software in dangerous applications.
- .
- Oracle is a registered trademark of Oracle Corporation and/or its
- affiliates. Other names may be trademarks of their respective owners.
- .
- This software and documentation may provide access to or information on
- content, products, and services from third parties. Oracle Corporation and
- its affiliates are not responsible for and expressly disclaim all warranties
- of any kind with respect to third-party content, products, and services.
- Oracle Corporation and its affiliates will not be responsible for any loss,
- costs, or damages incurred due to your access to or use of third-party
- content, products, or services.
+ MySQL is brought to you by the MySQL team at Oracle.

packaging/deb-in/copyright.gpl.in

@@ -3,39 +3,20 @@ Upstream-Name: @DEB_COPYRIGHT_UPSTREAMNAME@
 Upstream-Contact: MySQL Release Engineering <[email protected]>
 Source: http://dev.mysql.com/
 
-Copyright: 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright: 2000, 2019, Oracle and/or its affiliates. All rights reserved.
 License:
- This is a release of MySQL, a dual-license SQL database server.
- For the avoidance of doubt, this particular copy of the software
- is released under the version 2 of the GNU General Public License.
- MySQL is brought to you by Oracle.
+ This is a release of MySQL, an SQL database server.
  .
- MySQL FOSS License Exception
- We want free and open source software applications under certain
- licenses to be able to use specified GPL-licensed MySQL client
- libraries despite the fact that not all such FOSS licenses are
- compatible with version 2 of the GNU General Public License.
- Therefore there are special exceptions to the terms and conditions
- of the GPLv2 as applied to these client libraries, which are
- identified and described in more detail in the FOSS License
- Exception at
- <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
+ License information can be found in the LICENSE file.
  .
- This distribution may include materials developed by third
- parties. For license and attribution notices for these
- materials, please refer to the documentation that accompanies
- this distribution (see the "Licenses for Third-Party Components"
- appendix) or view the online documentation at
- <http://dev.mysql.com/doc/>.
+ This distribution may include materials developed by third parties.
+ For license and attribution notices for these materials,
+ please refer to the LICENSE file.
  .
- GPLv2 Disclaimer
- For the avoidance of doubt, except that if any license choice
- other than GPL or LGPL is available it will apply instead,
- Oracle elects to use only the General Public License version 2
- (GPLv2) at this time for any software where a choice of GPL
- license versions is made available with the language indicating
- that GPLv2 or any later version may be used, or where a choice
+ For further information on MySQL or additional documentation, visit
+ http://dev.mysql.com/doc/
  .
- The full text of the GNU General Public License version 2 can
- be found in the file
- `/usr/share/mysql/doc/@DEB_INSTALL_LICENSEFILE@'.
+ For additional downloads and the source of MySQL, visit
+ http://dev.mysql.com/downloads/
+ .
+ MySQL is brought to you by the MySQL team at Oracle.

packaging/deb-in/libmysqlclient-dev.lintian-overrides.in

@@ -1,4 +1,4 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,
@@ -21,8 +21,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 # Additional license file is needed so overriding this warning
-libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/LICENSE.mysql
-libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/@[email protected]
+libmysqlclient-dev: extra-license-file
 libmysqlclient-dev: copyright-should-refer-to-common-license-file-for-lgpl
 # Due to static linking this cannot be avoided and hence being overridden
 libmysqlclient-dev: embedded-library

packaging/deb-in/libmysqlclient20.lintian-overrides.in

@@ -1,4 +1,4 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,
@@ -21,8 +21,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 # Additional license file is needed so overriding this warning
-libmysqlclient20: extra-license-file usr/share/doc/libmysqlclient20/LICENSE.mysql
-libmysqlclient20: extra-license-file usr/share/doc/libmysqlclient20/@[email protected]
+libmysqlclient20: extra-license-file
 libmysqlclient20: copyright-should-refer-to-common-license-file-for-lgpl
 # Due to static linking this cannot be avoided and hence being overridden
 libmysqlclient20: embedded-library

packaging/deb-in/libmysqld-dev.lintian-overrides.in

@@ -1,4 +1,4 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,
@@ -21,6 +21,5 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 # Additional license file is needed so overriding this warning
-libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/LICENSE.mysql
-libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/@[email protected]
+libmysqld-dev: extra-license-file
 libmysqld-dev: copyright-should-refer-to-common-license-file-for-lgpl

packaging/deb-in/mysql-client.lintian-overrides.in

@@ -1,4 +1,4 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,
@@ -21,6 +21,5 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 # Additional license file is needed so overriding this warning
-mysql-client: extra-license-file usr/share/doc/mysql-client/LICENSE.mysql
-mysql-client: extra-license-file usr/share/doc/mysql-client/@[email protected]
+mysql-client: extra-license-file
 mysql-client: copyright-should-refer-to-common-license-file-for-lgpl

packaging/deb-in/mysql-common.lintian-overrides.in

@@ -1,4 +1,4 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,
@@ -21,6 +21,5 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 # Additional license file is needed so overriding this warning
-mysql-common: extra-license-file usr/share/doc/mysql-common/LICENSE.mysql
-mysql-common: extra-license-file usr/share/doc/mysql-common/@[email protected]
+mysql-common: extra-license-file
 mysql-common: copyright-should-refer-to-common-license-file-for-lgpl