Bug #27638192 DEB: ADD VERSION NUMBER TO SHARE DIRECTORY

Sharedir now uses mysql-VERSION instead of just mysql. The flags are also set in install_layout instead of in the packaging files.
Ramedes · Mar 8, 2018 · 2ab1fbb · 2ab1fbb
1 parent 7fd3990
commit 2ab1fbb
Show file tree

Hide file tree

Showing 32 changed files with 147 additions and 155 deletions.
diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake
@@ -386,15 +386,15 @@ SET(INSTALL_PLUGINDIR_DEB               "lib/plugin")
 #
 SET(INSTALL_INCLUDEDIR_DEB              "include")
 #
-SET(INSTALL_DOCDIR_DEB                  "docs")
-SET(INSTALL_DOCREADMEDIR_DEB            ".")
+SET(INSTALL_DOCDIR_DEB                  "share/mysql-${MYSQL_BASE_VERSION}/docs")
+SET(INSTALL_DOCREADMEDIR_DEB            "share/mysql-${MYSQL_BASE_VERSION}")
 SET(INSTALL_MANDIR_DEB                  "man")
-SET(INSTALL_INFODIR_DEB                 "docs")
+SET(INSTALL_INFODIR_DEB                 "share/mysql-${MYSQL_BASE_VERSION}/docs")
 #
 SET(INSTALL_SHAREDIR_DEB                "share")
-SET(INSTALL_MYSQLSHAREDIR_DEB           "share")
+SET(INSTALL_MYSQLSHAREDIR_DEB           "share/mysql-${MYSQL_BASE_VERSION}")
 SET(INSTALL_MYSQLTESTDIR_DEB            "mysql-test")
-SET(INSTALL_SUPPORTFILESDIR_DEB         "support-files")
+SET(INSTALL_SUPPORTFILESDIR_DEB         "share/mysql-${MYSQL_BASE_VERSION}")
 #
 SET(INSTALL_MYSQLDATADIR_DEB            "/var/lib/mysql")
 SET(INSTALL_MYSQLKEYRINGDIR_DEB         "/var/lib/mysql-keyring")

diff --git a/packaging/deb-in/CMakeLists.txt b/packaging/deb-in/CMakeLists.txt
@@ -212,15 +212,15 @@ ELSEIF(DEB_CODENAME STREQUAL "jessie")
   SET (DEB_CONTROL_BDEPS "dh-systemd")
   SET (DEB_INSTALL_SOURCE_XZ "../*.tar.xz usr/src/mysql/")
   SET (DEB_RULES_INSTALL_SYSTEMD
-    "install -m 0755 debian/extra/mysql-systemd-start debian/tmp/usr/share/mysql/")
+    "install -m 0755 debian/extra/mysql-systemd-start debian/tmp/usr/share/mysql-${MYSQL_BASE_VERSION}/")
   SET (DEB_RULES_INSTALL_APPARMOR "")
   SET (DEB_RULES_APPARMOR_LOAD "")
   SET (DEB_RULES_SYSTEMD_ENABLE "dh_systemd_enable --name=mysql")
   SET (DEB_RULES_SYSTEMD_START "dh_systemd_start --restart-after-upgrade")
-  SET (DEB_INSTALL_SERVER_SYSTEMD "usr/share/mysql/mysql-systemd-start")
+  SET (DEB_INSTALL_SERVER_SYSTEMD "usr/share/mysql-${MYSQL_BASE_VERSION}/mysql-systemd-start")
   SET (DEB_INSTALL_SERVER_APPARMOR "")
   SET (DEB_SERVICE_SERVER_EXECPRE
-    "ExecStartPre=/usr/share/mysql/mysql-systemd-start pre")
+    "ExecStartPre=/usr/share/mysql-${MYSQL_BASE_VERSION}/mysql-systemd-start pre")
   SET (DEB_INIT_APPARMOR "")
   SET (DEB_CONTROL_DBGSYM ${DEB_CONTROL_DBGSYM_DEFAULT})
   SET (DEB_RULES_STRIP ${DEB_RULES_STRIP_DEFAULT})
@@ -229,15 +229,15 @@ ELSEIF(DEB_CODENAME STREQUAL "stretch")
   SET (DEB_CONTROL_BDEPS "dh-systemd")
   SET (DEB_INSTALL_SOURCE_XZ "../*.tar.xz usr/src/mysql/")
   SET (DEB_RULES_INSTALL_SYSTEMD
-    "install -m 0755 debian/extra/mysql-systemd-start debian/tmp/usr/share/mysql/")
+    "install -m 0755 debian/extra/mysql-systemd-start debian/tmp/usr/share/mysql-${MYSQL_BASE_VERSION}/")
   SET (DEB_RULES_INSTALL_APPARMOR "")
   SET (DEB_RULES_APPARMOR_LOAD "")
   SET (DEB_RULES_SYSTEMD_ENABLE "dh_systemd_enable --name=mysql")
   SET (DEB_RULES_SYSTEMD_START "dh_systemd_start --restart-after-upgrade")
-  SET (DEB_INSTALL_SERVER_SYSTEMD "usr/share/mysql/mysql-systemd-start")
+  SET (DEB_INSTALL_SERVER_SYSTEMD "usr/share/mysql-${MYSQL_BASE_VERSION}/mysql-systemd-start")
   SET (DEB_INSTALL_SERVER_APPARMOR "")
   SET (DEB_SERVICE_SERVER_EXECPRE
-    "ExecStartPre=/usr/share/mysql/mysql-systemd-start pre")
+    "ExecStartPre=/usr/share/mysql-${MYSQL_BASE_VERSION}/mysql-systemd-start pre")
   SET (DEB_INIT_APPARMOR "")
   SET (DEB_CONTROL_DBGSYM "")
   SET (DEB_RULES_STRIP "")
@@ -249,15 +249,15 @@ ELSEIF(DEB_CODENAME STREQUAL "sid")
   SET (DEB_CONTROL_BDEPS "dh-systemd")
   SET (DEB_INSTALL_SOURCE_XZ "../*.tar.xz usr/src/mysql/")
   SET (DEB_RULES_INSTALL_SYSTEMD
-    "install -m 0755 debian/extra/mysql-systemd-start debian/tmp/usr/share/mysql/")
+    "install -m 0755 debian/extra/mysql-systemd-start debian/tmp/usr/share/mysql-${MYSQL_BASE_VERSION}/")
   SET (DEB_RULES_INSTALL_APPARMOR "")
   SET (DEB_RULES_APPARMOR_LOAD "")
   SET (DEB_RULES_SYSTEMD_ENABLE "dh_systemd_enable --name=mysql")
   SET (DEB_RULES_SYSTEMD_START "dh_systemd_start --restart-after-upgrade")
-  SET (DEB_INSTALL_SERVER_SYSTEMD "usr/share/mysql/mysql-systemd-start")
+  SET (DEB_INSTALL_SERVER_SYSTEMD "usr/share/mysql-${MYSQL_BASE_VERSION}/mysql-systemd-start")
   SET (DEB_INSTALL_SERVER_APPARMOR "")
   SET (DEB_SERVICE_SERVER_EXECPRE
-    "ExecStartPre=/usr/share/mysql/mysql-systemd-start pre")
+    "ExecStartPre=/usr/share/mysql-${MYSQL_BASE_VERSION}/mysql-systemd-start pre")
   SET (DEB_INIT_APPARMOR "")
   SET (DEB_CONTROL_DBGSYM "")
   SET (DEB_RULES_STRIP "")
@@ -283,17 +283,17 @@ ELSEIF(DEB_CODENAME STREQUAL "xenial")
   SET (DEB_CONTROL_BDEPS "dh-apparmor, dh-systemd (>=1.5)")
   SET (DEB_INSTALL_SOURCE_XZ "../*.tar.xz usr/src/mysql/")
   SET (DEB_RULES_INSTALL_SYSTEMD
-    "install -m 0755 debian/extra/mysql-systemd-start debian/tmp/usr/share/mysql/")
+    "install -m 0755 debian/extra/mysql-systemd-start debian/tmp/usr/share/mysql-${MYSQL_BASE_VERSION}/")
   SET (DEB_RULES_INSTALL_APPARMOR
     "install -g root -o root -m 0644 -D debian/extra/apparmor-profile debian/tmp/etc/apparmor.d/usr.sbin.mysqld")
   SET (DEB_RULES_APPARMOR_LOAD
     "dh_apparmor -pmysql-${DEB_PRODUCTNAME}-server --profile-name=usr.sbin.mysqld")
   SET (DEB_RULES_SYSTEMD_ENABLE "dh_systemd_enable --name=mysql")
   SET (DEB_RULES_SYSTEMD_START "dh_systemd_start --restart-after-upgrade")
-  SET (DEB_INSTALL_SERVER_SYSTEMD "usr/share/mysql/mysql-systemd-start")
+  SET (DEB_INSTALL_SERVER_SYSTEMD "usr/share/mysql-${MYSQL_BASE_VERSION}/mysql-systemd-start")
   SET (DEB_INSTALL_SERVER_APPARMOR "etc/apparmor.d/usr.sbin.mysqld")
   SET (DEB_SERVICE_SERVER_EXECPRE
-    "ExecStartPre=/usr/share/mysql/mysql-systemd-start pre")
+    "ExecStartPre=/usr/share/mysql-${MYSQL_BASE_VERSION}/mysql-systemd-start pre")
   SET (DEB_INIT_APPARMOR "/lib/apparmor/profile-load usr.sbin.mysqld")
   SET (DEB_CONTROL_DBGSYM ${DEB_CONTROL_DBGSYM_DEFAULT})
   SET (DEB_RULES_STRIP ${DEB_RULES_STRIP_DEFAULT})
@@ -302,17 +302,17 @@ ELSEIF(DEB_CODENAME STREQUAL "zesty")
   SET (DEB_CONTROL_BDEPS "dh-apparmor, dh-systemd (>=1.5)")
   SET (DEB_INSTALL_SOURCE_XZ "../*.tar.xz usr/src/mysql/")
   SET (DEB_RULES_INSTALL_SYSTEMD
-    "install -m 0755 debian/extra/mysql-systemd-start debian/tmp/usr/share/mysql/")
+    "install -m 0755 debian/extra/mysql-systemd-start debian/tmp/usr/share/mysql-${MYSQL_BASE_VERSION}/")
   SET (DEB_RULES_INSTALL_APPARMOR
     "install -g root -o root -m 0644 -D debian/extra/apparmor-profile debian/tmp/etc/apparmor.d/usr.sbin.mysqld")
   SET (DEB_RULES_APPARMOR_LOAD
     "dh_apparmor -pmysql-${DEB_PRODUCTNAME}-server --profile-name=usr.sbin.mysqld")
   SET (DEB_RULES_SYSTEMD_ENABLE "dh_systemd_enable --name=mysql")
   SET (DEB_RULES_SYSTEMD_START "dh_systemd_start --restart-after-upgrade")
-  SET (DEB_INSTALL_SERVER_SYSTEMD "usr/share/mysql/mysql-systemd-start")
+  SET (DEB_INSTALL_SERVER_SYSTEMD "usr/share/mysql-${MYSQL_BASE_VERSION}/mysql-systemd-start")
   SET (DEB_INSTALL_SERVER_APPARMOR "etc/apparmor.d/usr.sbin.mysqld")
   SET (DEB_SERVICE_SERVER_EXECPRE
-    "ExecStartPre=/usr/share/mysql/mysql-systemd-start pre")
+    "ExecStartPre=/usr/share/mysql-${MYSQL_BASE_VERSION}/mysql-systemd-start pre")
   SET (DEB_INIT_APPARMOR "/lib/apparmor/profile-load usr.sbin.mysqld")
   SET (DEB_CONTROL_DBGSYM ${DEB_CONTROL_DBGSYM_DEFAULT})
   SET (DEB_RULES_STRIP ${DEB_RULES_STRIP_DEFAULT})
@@ -321,17 +321,17 @@ ELSEIF(DEB_CODENAME STREQUAL "artful")
   SET (DEB_CONTROL_BDEPS "dh-apparmor, dh-systemd (>=1.5)")
   SET (DEB_INSTALL_SOURCE_XZ "../*.tar.xz usr/src/mysql/")
   SET (DEB_RULES_INSTALL_SYSTEMD
-    "install -m 0755 debian/extra/mysql-systemd-start debian/tmp/usr/share/mysql/")
+    "install -m 0755 debian/extra/mysql-systemd-start debian/tmp/usr/share/mysql-${MYSQL_BASE_VERSION}/")
   SET (DEB_RULES_INSTALL_APPARMOR
     "install -g root -o root -m 0644 -D debian/extra/apparmor-profile debian/tmp/etc/apparmor.d/usr.sbin.mysqld")
   SET (DEB_RULES_APPARMOR_LOAD
     "dh_apparmor -pmysql-${DEB_PRODUCTNAME}-server --profile-name=usr.sbin.mysqld")
   SET (DEB_RULES_SYSTEMD_ENABLE "dh_systemd_enable --name=mysql")
   SET (DEB_RULES_SYSTEMD_START "dh_systemd_start --restart-after-upgrade")
-  SET (DEB_INSTALL_SERVER_SYSTEMD "usr/share/mysql/mysql-systemd-start")
+  SET (DEB_INSTALL_SERVER_SYSTEMD "usr/share/mysql-${MYSQL_BASE_VERSION}/mysql-systemd-start")
   SET (DEB_INSTALL_SERVER_APPARMOR "etc/apparmor.d/usr.sbin.mysqld")
   SET (DEB_SERVICE_SERVER_EXECPRE
-    "ExecStartPre=/usr/share/mysql/mysql-systemd-start pre")
+    "ExecStartPre=/usr/share/mysql-${MYSQL_BASE_VERSION}/mysql-systemd-start pre")
   SET (DEB_INIT_APPARMOR "/lib/apparmor/profile-load usr.sbin.mysqld")
   SET (DEB_CONTROL_DBGSYM ${DEB_CONTROL_DBGSYM_DEFAULT})
   SET (DEB_RULES_STRIP ${DEB_RULES_STRIP_DEFAULT})
@@ -340,17 +340,17 @@ ELSEIF(DEB_CODENAME STREQUAL "bionic")
   SET (DEB_CONTROL_BDEPS "dh-apparmor, dh-systemd (>=1.5)")
   SET (DEB_INSTALL_SOURCE_XZ "../*.tar.xz usr/src/mysql/")
   SET (DEB_RULES_INSTALL_SYSTEMD
-    "install -m 0755 debian/extra/mysql-systemd-start debian/tmp/usr/share/mysql/")
+    "install -m 0755 debian/extra/mysql-systemd-start debian/tmp/usr/share/mysql-${MYSQL_BASE_VERSION}/")
   SET (DEB_RULES_INSTALL_APPARMOR
     "install -g root -o root -m 0644 -D debian/extra/apparmor-profile debian/tmp/etc/apparmor.d/usr.sbin.mysqld")
   SET (DEB_RULES_APPARMOR_LOAD
     "dh_apparmor -pmysql-${DEB_PRODUCTNAME}-server --profile-name=usr.sbin.mysqld")
   SET (DEB_RULES_SYSTEMD_ENABLE "dh_systemd_enable --name=mysql")
   SET (DEB_RULES_SYSTEMD_START "dh_systemd_start --restart-after-upgrade")
-  SET (DEB_INSTALL_SERVER_SYSTEMD "usr/share/mysql/mysql-systemd-start")
+  SET (DEB_INSTALL_SERVER_SYSTEMD "usr/share/mysql-${MYSQL_BASE_VERSION}/mysql-systemd-start")
   SET (DEB_INSTALL_SERVER_APPARMOR "etc/apparmor.d/usr.sbin.mysqld")
   SET (DEB_SERVICE_SERVER_EXECPRE
-    "ExecStartPre=/usr/share/mysql/mysql-systemd-start pre")
+    "ExecStartPre=/usr/share/mysql-${MYSQL_BASE_VERSION}/mysql-systemd-start pre")
   SET (DEB_INIT_APPARMOR "/lib/apparmor/profile-load usr.sbin.mysqld")
   SET (DEB_CONTROL_DBGSYM "")
   SET (DEB_RULES_STRIP "")

diff --git a/packaging/deb-in/deb_debug.cmake b/packaging/deb-in/deb_debug.cmake
@@ -28,16 +28,13 @@ SET (DEB_RULES_DEBUG_CMAKE
 		-DCMAKE_INSTALL_PREFIX=/usr \\
 		-DCMAKE_BUILD_TYPE=Debug \\
 		-DINSTALL_DOCDIR=share/mysql/docs \\
-		-DINSTALL_DOCREADMEDIR=share/mysql \\
 		-DINSTALL_INCLUDEDIR=include/mysql \\
 		-DINSTALL_INFODIR=share/mysql/docs \\
 		-DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \\
 		-DINSTALL_MANDIR=share/man \\
-		-DINSTALL_MYSQLSHAREDIR=share/mysql \\
 		-DINSTALL_MYSQLTESTDIR=lib/mysql-test \\
 		-DINSTALL_PLUGINDIR=lib/mysql/plugin \\
 		-DINSTALL_SBINDIR=sbin \\
-		-DINSTALL_SUPPORTFILESDIR=share/mysql \\
 		-DSYSCONFDIR=/etc/mysql \\
 		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \\
 		-DWITH_SSL=bundled \\

diff --git a/packaging/deb-in/libmysqlclient-dev.install.in b/packaging/deb-in/libmysqlclient-dev.install.in
@@ -30,5 +30,5 @@ usr/bin/mysql_config
 usr/share/man/man1/mysql_config.1
 usr/share/aclocal/mysql.m4
 # legal
-usr/share/mysql/LICENSE usr/share/doc/libmysqlclient-dev/
-usr/share/mysql/README usr/share/doc/libmysqlclient-dev/
+usr/share/mysql-@MYSQL_BASE_VERSION@/LICENSE usr/share/doc/libmysqlclient-dev/
+usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/libmysqlclient-dev/
diff --git a/packaging/deb-in/libmysqlclient21-dbgsym.install.in b/packaging/deb-in/libmysqlclient21-dbgsym.install.in
@@ -1,4 +1,4 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2018, 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,5 +21,5 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 # legal
-usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/libmysqlclient21-dbgsym/
-usr/share/mysql/README usr/share/doc/libmysqlclient21-dbgsym/
+usr/share/mysql-@MYSQL_BASE_VERSION@/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/libmysqlclient21-dbgsym/
+usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/libmysqlclient21-dbgsym/
diff --git a/packaging/deb-in/libmysqlclient21.install.in b/packaging/deb-in/libmysqlclient21.install.in
@@ -1,4 +1,4 @@
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2018, 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,
@@ -22,5 +22,5 @@
 
 usr/lib/*/libmysqlclient.so.21*
 # legal
-usr/share/mysql/LICENSE usr/share/doc/libmysqlclient21/
-usr/share/mysql/README usr/share/doc/libmysqlclient21/
+usr/share/mysql-@MYSQL_BASE_VERSION@/LICENSE usr/share/doc/libmysqlclient21/
+usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/libmysqlclient21/
diff --git a/packaging/deb-in/mysql-client.install.in b/packaging/deb-in/mysql-client.install.in
@@ -1,4 +1,4 @@
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2018, 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,5 +21,5 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 # legal
-usr/share/mysql/LICENSE usr/share/doc/mysql-client/
-usr/share/mysql/README usr/share/doc/mysql-client/
+usr/share/mysql-@MYSQL_BASE_VERSION@/LICENSE usr/share/doc/mysql-client/
+usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/mysql-client/
diff --git a/packaging/deb-in/mysql-common.install.in b/packaging/deb-in/mysql-common.install.in
@@ -24,8 +24,8 @@
 debian/extra/conf.d  etc/mysql/
 debian/extra/my.cnf.fallback etc/mysql/
 
-usr/share/mysql/docs/INFO_SRC
-usr/share/mysql/docs/INFO_BIN
+usr/share/mysql-@MYSQL_BASE_VERSION@/docs/INFO_SRC
+usr/share/mysql-@MYSQL_BASE_VERSION@/docs/INFO_BIN
 # legal
-usr/share/mysql/LICENSE usr/share/doc/mysql-common/
-usr/share/mysql/README usr/share/doc/mysql-common/
+usr/share/mysql-@MYSQL_BASE_VERSION@/LICENSE usr/share/doc/mysql-common/
+usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/mysql-common/
diff --git a/packaging/deb-in/mysql-packagesource-auto-installer.install.in b/packaging/deb-in/mysql-packagesource-auto-installer.install.in
@@ -1,4 +1,4 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2018, 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,
@@ -20,7 +20,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 usr/bin/mcc_config.py
-usr/share/mysql/mcc/*
+usr/share/mysql-@MYSQL_BASE_VERSION@/mcc/*
 # legal
-usr/share/mysql/LICENSE usr/share/doc/mysql-@DEB_PRODUCTNAME@-auto-installer/
-usr/share/mysql/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-auto-installer/
+usr/share/mysql-@MYSQL_BASE_VERSION@/LICENSE usr/share/doc/mysql-@DEB_PRODUCTNAME@-auto-installer/
+usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-auto-installer/
diff --git a/packaging/deb-in/mysql-packagesource-client-core-dbgsym.install.in b/packaging/deb-in/mysql-packagesource-client-core-dbgsym.install.in
@@ -1,4 +1,4 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2018, 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,5 +21,5 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 # legal
-usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/mysql-@DEB_PRODUCTNAME@-client-core-dbgsym/
-usr/share/mysql/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-client-core-dbgsym/
+usr/share/mysql-@MYSQL_BASE_VERSION@/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/mysql-@DEB_PRODUCTNAME@-client-core-dbgsym/
+usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-client-core-dbgsym/
diff --git a/packaging/deb-in/mysql-packagesource-client-core.install.in b/packaging/deb-in/mysql-packagesource-client-core.install.in
@@ -30,5 +30,5 @@ usr/share/man/man1/mysql.1
 usr/share/man/man1/mysqldump.1
 usr/share/man/man1/mysqlpump.1
 # legal
-usr/share/mysql/LICENSE usr/share/doc/mysql-@DEB_PRODUCTNAME@-client-core/
-usr/share/mysql/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-client-core/
+usr/share/mysql-@MYSQL_BASE_VERSION@/LICENSE usr/share/doc/mysql-@DEB_PRODUCTNAME@-client-core/
+usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-client-core/
diff --git a/packaging/deb-in/mysql-packagesource-client-dbgsym.install.in b/packaging/deb-in/mysql-packagesource-client-dbgsym.install.in
@@ -1,4 +1,4 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2018, 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,6 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 # legal
-usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/mysql-@DEB_PRODUCTNAME@-client-dbgsym/
-usr/share/mysql/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-client-dbgsym/
+usr/share/mysql-@MYSQL_BASE_VERSION@/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/mysql-@DEB_PRODUCTNAME@-client-dbgsym/
+usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-client-dbgsym/
 
diff --git a/packaging/deb-in/mysql-packagesource-client.conffiles.in b/packaging/deb-in/mysql-packagesource-client.conffiles.in
@@ -1,25 +1,25 @@
-/usr/share/mysql/charsets/armscii8.xml
-/usr/share/mysql/charsets/ascii.xml
-/usr/share/mysql/charsets/cp1250.xml
-/usr/share/mysql/charsets/cp1251.xml
-/usr/share/mysql/charsets/cp1256.xml
-/usr/share/mysql/charsets/cp1257.xml
-/usr/share/mysql/charsets/cp850.xml
-/usr/share/mysql/charsets/cp852.xml
-/usr/share/mysql/charsets/cp866.xml
-/usr/share/mysql/charsets/dec8.xml
-/usr/share/mysql/charsets/geostd8.xml
-/usr/share/mysql/charsets/greek.xml
-/usr/share/mysql/charsets/hebrew.xml
-/usr/share/mysql/charsets/hp8.xml
-/usr/share/mysql/charsets/Index.xml
-/usr/share/mysql/charsets/keybcs2.xml
-/usr/share/mysql/charsets/koi8r.xml
-/usr/share/mysql/charsets/koi8u.xml
-/usr/share/mysql/charsets/latin1.xml
-/usr/share/mysql/charsets/latin2.xml
-/usr/share/mysql/charsets/latin5.xml
-/usr/share/mysql/charsets/latin7.xml
-/usr/share/mysql/charsets/macce.xml
-/usr/share/mysql/charsets/macroman.xml
-/usr/share/mysql/charsets/swe7.xml
+/usr/share/mysql-@MYSQL_BASE_VERSION@/charsets/armscii8.xml
+/usr/share/mysql-@MYSQL_BASE_VERSION@/charsets/ascii.xml
+/usr/share/mysql-@MYSQL_BASE_VERSION@/charsets/cp1250.xml
+/usr/share/mysql-@MYSQL_BASE_VERSION@/charsets/cp1251.xml
+/usr/share/mysql-@MYSQL_BASE_VERSION@/charsets/cp1256.xml
+/usr/share/mysql-@MYSQL_BASE_VERSION@/charsets/cp1257.xml
+/usr/share/mysql-@MYSQL_BASE_VERSION@/charsets/cp850.xml
+/usr/share/mysql-@MYSQL_BASE_VERSION@/charsets/cp852.xml
+/usr/share/mysql-@MYSQL_BASE_VERSION@/charsets/cp866.xml
+/usr/share/mysql-@MYSQL_BASE_VERSION@/charsets/dec8.xml
+/usr/share/mysql-@MYSQL_BASE_VERSION@/charsets/geostd8.xml
+/usr/share/mysql-@MYSQL_BASE_VERSION@/charsets/greek.xml
+/usr/share/mysql-@MYSQL_BASE_VERSION@/charsets/hebrew.xml
+/usr/share/mysql-@MYSQL_BASE_VERSION@/charsets/hp8.xml
+/usr/share/mysql-@MYSQL_BASE_VERSION@/charsets/Index.xml
+/usr/share/mysql-@MYSQL_BASE_VERSION@/charsets/keybcs2.xml
+/usr/share/mysql-@MYSQL_BASE_VERSION@/charsets/koi8r.xml
+/usr/share/mysql-@MYSQL_BASE_VERSION@/charsets/koi8u.xml
+/usr/share/mysql-@MYSQL_BASE_VERSION@/charsets/latin1.xml
+/usr/share/mysql-@MYSQL_BASE_VERSION@/charsets/latin2.xml
+/usr/share/mysql-@MYSQL_BASE_VERSION@/charsets/latin5.xml
+/usr/share/mysql-@MYSQL_BASE_VERSION@/charsets/latin7.xml
+/usr/share/mysql-@MYSQL_BASE_VERSION@/charsets/macce.xml
+/usr/share/mysql-@MYSQL_BASE_VERSION@/charsets/macroman.xml
+/usr/share/mysql-@MYSQL_BASE_VERSION@/charsets/swe7.xml
diff --git a/packaging/deb-in/mysql-packagesource-client.install.in b/packaging/deb-in/mysql-packagesource-client.install.in
@@ -30,8 +30,8 @@ usr/bin/mysqlimport
 usr/bin/mysqlshow
 usr/bin/mysqlslap
 # charsets
-usr/share/mysql/charsets/*.xml
-usr/share/mysql/charsets/README
+usr/share/mysql-@MYSQL_BASE_VERSION@/charsets/*.xml
+usr/share/mysql-@MYSQL_BASE_VERSION@/charsets/README
 # man pages
 usr/share/man/man1/myisam_ftdump.1
 usr/share/man/man1/mysql_config_editor.1
@@ -43,7 +43,7 @@ usr/share/man/man1/mysqlman.1
 usr/share/man/man1/mysqlshow.1
 usr/share/man/man1/mysqlslap.1
 # legal
-usr/share/mysql/LICENSE usr/share/doc/mysql-@DEB_PRODUCTNAME@-client/
-usr/share/mysql/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-client/
+usr/share/mysql-@MYSQL_BASE_VERSION@/LICENSE usr/share/doc/mysql-@DEB_PRODUCTNAME@-client/
+usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-client/
 
 @DEB_NDB_CLIENT_EXTRA@
diff --git a/packaging/deb-in/mysql-packagesource-data-node.install.in b/packaging/deb-in/mysql-packagesource-data-node.install.in
@@ -24,5 +24,5 @@ usr/sbin/ndbmtd
 usr/share/man/man8/ndbd.8*
 usr/share/man/man8/ndbmtd.8*
 # legal
-usr/share/mysql/LICENSE usr/share/doc/mysql-@DEB_PRODUCTNAME@-data-node/
-usr/share/mysql/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-data-node/
+usr/share/mysql-@MYSQL_BASE_VERSION@/LICENSE usr/share/doc/mysql-@DEB_PRODUCTNAME@-data-node/
+usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-data-node/