58 files changed, 591 insertions, 642 deletions
diff --git a/debian/additions/mysql.init b/debian/additions/mysql.init
index 0d4c6019ab5..980c6e832d5 100755
--- a/debian/additions/mysql.init
+++ b/debian/additions/mysql.init
@@ -158,7 +158,7 @@ case "${1:-''}" in
 
   if ! mysqld_status check_dead warn; then
     log_end_msg 1
-    log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-10.5/README.Debian.gz!"
+    log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-10.6/README.Debian.gz!"
     exit -1
   else
     log_end_msg 0
diff --git a/debian/additions/source_mariadb-10.5.py b/debian/additions/source_mariadb-10.6.py
index 6bd3baaa77f..b965716eca3 100644
--- a/debian/additions/source_mariadb-10.5.py
+++ b/debian/additions/source_mariadb-10.6.py
@@ -1,4 +1,4 @@
-'''apport package hook for mariadb-10.5
+'''apport package hook for mariadb-10.6
 
 (c) 2009 Canonical Ltd.
 Author: Mathias Gug <mathias.gug@canonical.com>
@@ -21,7 +21,7 @@ def _add_my_conf_files(report, filename):
             continue
 
 def add_info(report):
-    attach_conffiles(report, 'mariadb-server-10.5', conffiles=None)
+    attach_conffiles(report, 'mariadb-server-10.6', conffiles=None)
     key = 'Logs' + path_to_key('/var/log/daemon.log')
     report[key] = ""
     for line in read_file('/var/log/daemon.log').split('\n'):
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh
index 505d369f3a0..f040af76d45 100755
--- a/debian/autobake-deb.sh
+++ b/debian/autobake-deb.sh
@@ -90,7 +90,7 @@ then
   sed -i -e "/Package: mariadb-plugin-mroonga/,/^$/d" debian/control
   sed -i -e "/Package: mariadb-plugin-spider/,/^$/d" debian/control
   sed -i -e "/Package: mariadb-plugin-oqgraph/,/^$/d" debian/control
-  sed -i -e "/usr\/lib\/mysql\/plugin\/ha_sphinx.so/d" debian/mariadb-server-10.5.install
+  sed -i -e "/usr\/lib\/mysql\/plugin\/ha_sphinx.so/d" debian/mariadb-server-10.6.install
   sed -i -e "/Package: libmariadbd-dev/,/^$/d" debian/control
 fi
 
diff --git a/debian/changelog b/debian/changelog
index 581da3bc92f..08065467bdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,65 +1,5 @@
-mariadb-10.5 (1:10.5.0) unstable; urgency=low
+mariadb-10.6 (1:10.6.0) unstable; urgency=medium
 
   * Initial Release
 
- -- Vicentiu Ciorbaru <vicentiu@mariadb.org>  Tue, 21 May 2019 13:27:19 +0000
-
-mariadb-10.4 (1:10.4.0) unstable; urgency=low
-
-  * Initial release.
-
- -- Otto Kekäläinen <otto@debian.org>  Sun, 05 Aug 2018 00:06:30 -0500
-
-mariadb-10.3 (1:10.3.0) unstable; urgency=low
-
-  * Bump epoch to supersede 1:10.1.29-6 in Debian
-
- -- Otto Kekäläinen <otto@mariadb.org>  Sat, 31 Mar 2018 22:34:34 +0300
-
-mariadb-10.3 (10.3.0) unstable; urgency=low
-
-  * Initial release.
-
- -- Vicențiu Ciorbaru <vicentiu@mariadb.org>  Wed, 5 Apr 2017 21:18:02 +0200
-
-mariadb-10.2 (10.2.0) unstable; urgency=low
-
-  * Initial release.
-
- -- Otto Kekäläinen <otto@mariadb.org>  Sat, 14 Nov 2015 21:26:45 +0200
-
-mariadb-10.1 (10.1.0) unstable; urgency=low
-
-  * Initial release.
-
- -- Sergei Golubchik <serg@askmonty.org>  Fri, 23 May 2014 09:44:38 -0200
-
-mariadb-10.0 (10.0.0) unstable; urgency=low
-
-  * Initial release.
-
- -- Sergei Golubchik <serg@askmonty.org>  Sat, 20 Oct 2012 17:18:44 -0100
-
-mariadb-5.5 (5.5.1) unstable; urgency=low
-
-  * Initial release.
-
- -- Kristian Nielsen <knielsen@askmonty.org>  Fri, 6 Jan 2012 15:17:23 -0100
-
-mariadb-5.3 (5.3.0) unstable; urgency=low
-
-  * Initial release.
-
- -- Sergei Golubchik <serg@askmonty.org>  Mon, 1 Nov 2010 09:16:01 -0100
-
-mariadb-5.2 (5.2.0) unstable; urgency=low
-
-  * Initial release.
-
- -- Kristian Nielsen <knielsen@askmonty.org>  Wed, 17 Mar 2010 12:54:51 -0100
-
-mariadb-5.1 (5.1.0) unstable; urgency=low
-
-  * Initial release.
-
- -- Peter Lieverdink <peter@openquery.com>  Tue, 29 Sep 2009 17:05:03 +1000
+ -- Otto Kekäläinen <otto@debian.org>  Thu, 14 May 2020 18:00:57 +0300
diff --git a/debian/control b/debian/control
index c0132f07dce..c05aa1b8f44 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: mariadb-10.5
+Source: mariadb-10.6
 Section: database
 Priority: optional
 Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
@@ -241,7 +241,7 @@ Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf)
  This package includes files needed by all versions of the client library
  (e.g. /etc/mysql/conf.d/mariadb.cnf).
 
-Package: mariadb-client-core-10.5
+Package: mariadb-client-core-10.6
 Architecture: any
 Depends: libmariadb3,
          mariadb-common (>= ${source:Version}),
@@ -252,7 +252,8 @@ Conflicts: mariadb-client-10.0,
            mariadb-client-10.2,
            mariadb-client-10.3,
            mariadb-client-10.4,
-           mariadb-client-10.5 (<< ${source:Version}),
+           mariadb-client-10.6,
+           mariadb-client-10.6 (<< ${source:Version}),
            mariadb-client-5.1,
            mariadb-client-5.2,
            mariadb-client-5.3,
@@ -281,7 +282,8 @@ Replaces: mariadb-client-10.0,
           mariadb-client-10.2,
           mariadb-client-10.3,
           mariadb-client-10.4,
-          mariadb-client-10.5 (<< ${source:Version}),
+          mariadb-client-10.5,
+          mariadb-client-10.6 (<< ${source:Version}),
           mariadb-client-5.1,
           mariadb-client-5.2,
           mariadb-client-5.3,
@@ -315,10 +317,10 @@ Description: MariaDB database core client binaries
  .
  This package includes the core client files, as used by Akonadi.
 
-Package: mariadb-client-10.5
+Package: mariadb-client-10.6
 Architecture: any
 Depends: debianutils (>=1.6),
-         mariadb-client-core-10.5 (>= ${source:Version}),
+         mariadb-client-core-10.6 (>= ${source:Version}),
          mariadb-common,
          ${misc:Depends},
          ${perl:Depends},
@@ -329,7 +331,8 @@ Conflicts: mariadb-client (<< ${source:Version}),
            mariadb-client-10.2,
            mariadb-client-10.3,
            mariadb-client-10.4,
-           mariadb-client-10.5 (<< ${source:Version}),
+           mariadb-client-10.5,
+           mariadb-client-10.6 (<< ${source:Version}),
            mariadb-client-5.1,
            mariadb-client-5.2,
            mariadb-client-5.3,
@@ -354,14 +357,16 @@ Breaks: mariadb-client-core-10.0,
         mariadb-client-core-10.2,
         mariadb-client-core-10.3,
         mariadb-client-core-10.4,
-        mariadb-client-core-10.5 (<< ${source:Version})
+        mariadb-client-core-10.5,
+        mariadb-client-core-10.6 (<< ${source:Version})
 Replaces: mariadb-client (<< ${source:Version}),
           mariadb-client-10.0,
           mariadb-client-10.1,
           mariadb-client-10.2,
           mariadb-client-10.3,
           mariadb-client-10.4,
-          mariadb-client-10.5 (<< ${source:Version}),
+          mariadb-client-10.5,
+          mariadb-client-10.6 (<< ${source:Version}),
           mariadb-client-5.1,
           mariadb-client-5.2,
           mariadb-client-5.3,
@@ -371,8 +376,10 @@ Replaces: mariadb-client (<< ${source:Version}),
           mariadb-client-core-10.2,
           mariadb-client-core-10.3,
           mariadb-client-core-10.4,
-          mariadb-client-core-10.5 (<< ${source:Version}),
-          mariadb-server-10.5 (<< ${source:Version}),
+          mariadb-client-core-10.5,
+          mariadb-client-core-10.6 (<< ${source:Version}),
+          mariadb-server-10.5,
+          mariadb-server-10.6 (<< ${source:Version}),
           mysql-client (<< 5.0.51),
           mysql-client-5.0,
           mysql-client-5.1,
@@ -402,7 +409,7 @@ Description: MariaDB database client binaries
  This package includes the client binaries and the additional tools
  innotop and mariadb-report (mysqlreport).
 
-Package: mariadb-server-core-10.5
+Package: mariadb-server-core-10.6
 Architecture: any
 Depends: mariadb-common (>= ${source:Version}),
          ${misc:Depends},
@@ -429,10 +436,12 @@ Breaks: mariadb-client-10.0,
         mariadb-client-10.2,
         mariadb-client-10.3,
         mariadb-client-10.4,
-        mariadb-client-10.5 (<< ${source:Version}),
+        mariadb-client-10.5,
+        mariadb-client-10.6 (<< ${source:Version}),
         mariadb-server-10.3,
         mariadb-server-10.4,
-        mariadb-server-10.5 (<< ${source:Version}),
+        mariadb-server-10.5,
+        mariadb-server-10.6 (<< ${source:Version}),
         mysql-server-5.6,
         mysql-server-5.7,
         mysql-server-8.0
@@ -441,10 +450,12 @@ Replaces: mariadb-client-10.0,
           mariadb-client-10.2,
           mariadb-client-10.3,
           mariadb-client-10.4,
-          mariadb-client-10.5 (<< ${source:Version}),
+          mariadb-client-10.5,
+          mariadb-client-10.6 (<< ${source:Version}),
           mariadb-server-10.3,
           mariadb-server-10.4,
-          mariadb-server-10.5 (<< ${source:Version}),
+          mariadb-server-10.5,
+          mariadb-server-10.6 (<< ${source:Version}),
           mariadb-server-core-10.0,
           mariadb-server-core-10.1,
           mariadb-server-core-10.2,
@@ -475,7 +486,7 @@ Description: MariaDB database core server files
  .
  This package includes the core server files, as used by Akonadi.
 
-Package: mariadb-server-10.5
+Package: mariadb-server-10.6
 Architecture: any
 Suggests: mailx,
           mariadb-test,
@@ -491,8 +502,8 @@ Depends: galera-4 (>=26.4),
          libdbi-perl,
          lsb-base (>= 3.0-10),
          lsof [linux-any],
-         mariadb-client-10.5 (>= ${source:Version}),
-         mariadb-server-core-10.5 (>= ${binary:Version}),
+         mariadb-client-10.6 (>= ${source:Version}),
+         mariadb-server-core-10.6 (>= ${binary:Version}),
          passwd,
          perl (>= 5.6),
          procps,
@@ -527,7 +538,8 @@ Conflicts: mariadb-server (<< ${source:Version}),
            virtual-mysql-server
 Replaces: libmariadbclient-dev (<< 5.5.0),
           libmariadbclient16,
-          mariadb-client-10.5 (<< ${source:Version}),
+          mariadb-client-10.5,
+          mariadb-client-10.6 (<< ${source:Version}),
           mariadb-server (<< ${source:Version}),
           mariadb-server-10.0,
           mariadb-server-10.1,
@@ -563,11 +575,11 @@ Description: MariaDB database server binaries
 
 Package: mariadb-server
 Architecture: all
-Depends: mariadb-server-10.5 (>= ${source:Version}),
+Depends: mariadb-server-10.6 (>= ${source:Version}),
          ${misc:Depends}
 Description: MariaDB database server (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
- mariadb-server (currently mariadb-server-10.5), as determined by the MariaDB
+ mariadb-server (currently mariadb-server-10.6), as determined by the MariaDB
  maintainers. Install this package if in doubt about which MariaDB
  version you need. That will install the version recommended by the
  package maintainers.
@@ -579,11 +591,11 @@ Description: MariaDB database server (metapackage depending on the latest versio
 
 Package: mariadb-client
 Architecture: all
-Depends: mariadb-client-10.5 (>= ${source:Version}),
+Depends: mariadb-client-10.6 (>= ${source:Version}),
          ${misc:Depends}
 Description: MariaDB database client (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
- mariadb-client (currently mariadb-client-10.5), as determined by the MariaDB
+ mariadb-client (currently mariadb-client-10.6), as determined by the MariaDB
  maintainers.  Install this package if in doubt about which MariaDB version
  you want, as this is the one considered to be in the best shape.
 
@@ -593,7 +605,7 @@ Breaks: mariadb-backup-10.1,
         mariadb-backup-10.2
 Replaces: mariadb-backup-10.1,
           mariadb-backup-10.2
-Depends: mariadb-client-core-10.5 (= ${binary:Version}),
+Depends: mariadb-client-core-10.6 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Backup tool for MariaDB server
@@ -606,7 +618,7 @@ Description: Backup tool for MariaDB server
 Package: mariadb-plugin-connect
 Architecture: any
 Depends: libxml2,
-         mariadb-server-10.5 (= ${binary:Version}),
+         mariadb-server-10.6 (= ${binary:Version}),
          unixodbc,
          ${misc:Depends},
          ${shlibs:Depends}
@@ -626,7 +638,7 @@ Description: Connect storage engine for MariaDB
 
 Package: mariadb-plugin-rocksdb
 Architecture: amd64 arm64 mips64el ppc64el
-Depends: mariadb-server-10.5 (= ${binary:Version}),
+Depends: mariadb-server-10.6 (= ${binary:Version}),
          rocksdb-tools,
          ${misc:Depends},
          ${shlibs:Depends}
@@ -645,7 +657,7 @@ Description: RocksDB storage engine for MariaDB
 Package: mariadb-plugin-oqgraph
 Architecture: any
 Depends: libjudydebian1,
-         mariadb-server-10.5 (= ${binary:Version}),
+         mariadb-server-10.6 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-oqgraph-engine-10.1,
@@ -663,7 +675,7 @@ Description: OQGraph storage engine for MariaDB
 
 Package: mariadb-plugin-mroonga
 Architecture: any-alpha any-amd64 any-arm any-arm64 any-i386 any-ia64 any-mips64el any-mips64r6el any-mipsel any-mipsr6el any-nios2 any-powerpcel any-ppc64el any-sh3 any-sh4 any-tilegx
-Depends: mariadb-server-10.5 (= ${binary:Version}),
+Depends: mariadb-server-10.6 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-server-10.0,
@@ -683,7 +695,7 @@ Description: Mroonga storage engine for MariaDB
 
 Package: mariadb-plugin-spider
 Architecture: any
-Depends: mariadb-server-10.5 (= ${binary:Version}),
+Depends: mariadb-server-10.6 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-server-10.0,
@@ -705,7 +717,7 @@ Description: Spider storage engine for MariaDB
 Package: mariadb-plugin-gssapi-server
 Architecture: any
 Depends: libgssapi-krb5-2,
-         mariadb-server-10.5 (= ${binary:Version}),
+         mariadb-server-10.6 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-gssapi-server-10.1,
@@ -725,7 +737,7 @@ Description: GSSAPI authentication plugin for MariaDB server
 Package: mariadb-plugin-gssapi-client
 Architecture: any
 Depends: libgssapi-krb5-2,
-         mariadb-client-10.5 (= ${binary:Version}),
+         mariadb-client-10.6 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-gssapi-client-10.1,
@@ -745,7 +757,7 @@ Description: GSSAPI authentication plugin for MariaDB client
 Package: mariadb-plugin-cracklib-password-check
 Architecture: any
 Depends: libcrack2 (>= 2.9.0),
-         mariadb-server-10.5 (= ${binary:Version}),
+         mariadb-server-10.6 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: CrackLib Password Validation Plugin for MariaDB
@@ -756,8 +768,8 @@ Description: CrackLib Password Validation Plugin for MariaDB
 
 Package: mariadb-test
 Architecture: any
-Depends: mariadb-client-10.5 (= ${binary:Version}),
-         mariadb-server-10.5 (= ${binary:Version}),
+Depends: mariadb-client-10.6 (= ${binary:Version}),
+         mariadb-server-10.6 (= ${binary:Version}),
          mariadb-test-data (= ${source:Version}),
          virtual-mysql-testsuite,
          ${misc:Depends},
diff --git a/debian/mariadb-client-10.5.README.Debian b/debian/mariadb-client-10.6.README.Debian
index 64f0f509951..64f0f509951 100644
--- a/debian/mariadb-client-10.5.README.Debian
+++ b/debian/mariadb-client-10.6.README.Debian
diff --git a/debian/mariadb-client-10.5.docs b/debian/mariadb-client-10.6.docs
index c09092629c3..c09092629c3 100644
--- a/debian/mariadb-client-10.5.docs
+++ b/debian/mariadb-client-10.6.docs
diff --git a/debian/mariadb-client-10.5.install b/debian/mariadb-client-10.6.install
index 35b614cd976..35b614cd976 100644
--- a/debian/mariadb-client-10.5.install
+++ b/debian/mariadb-client-10.6.install
diff --git a/debian/mariadb-client-10.5.links b/debian/mariadb-client-10.6.links
index bc42197629b..bc42197629b 100644
--- a/debian/mariadb-client-10.5.links
+++ b/debian/mariadb-client-10.6.links
diff --git a/debian/mariadb-client-10.5.manpages b/debian/mariadb-client-10.6.manpages
index 8735caeea8b..8735caeea8b 100644
--- a/debian/mariadb-client-10.5.manpages
+++ b/debian/mariadb-client-10.6.manpages
diff --git a/debian/mariadb-client-10.5.menu b/debian/mariadb-client-10.6.menu
index bb9d6f9076d..90280215b8b 100644
--- a/debian/mariadb-client-10.5.menu
+++ b/debian/mariadb-client-10.6.menu
@@ -1,3 +1,3 @@
 # According to /usr/share/menu/ policy 1.4, not /usr/share/doc/debian-policy/
-?package(mariadb-client-10.5):needs="text" section="Applications/Data Management"\
+?package(mariadb-client-10.6):needs="text" section="Applications/Data Management"\
   title="Innotop" command="/usr/bin/innotop"
diff --git a/debian/mariadb-client-core-10.5.install b/debian/mariadb-client-core-10.6.install
index 224e324b704..224e324b704 100644
--- a/debian/mariadb-client-core-10.5.install
+++ b/debian/mariadb-client-core-10.6.install
diff --git a/debian/mariadb-client-core-10.5.links b/debian/mariadb-client-core-10.6.links
index 5134dd814b5..5134dd814b5 100644
--- a/debian/mariadb-client-core-10.5.links
+++ b/debian/mariadb-client-core-10.6.links
diff --git a/debian/mariadb-server-10.5.README.Debian b/debian/mariadb-server-10.6.README.Debian
index 5a05f196042..5a05f196042 100644
--- a/debian/mariadb-server-10.5.README.Debian
+++ b/debian/mariadb-server-10.6.README.Debian
diff --git a/debian/mariadb-server-10.5.config b/debian/mariadb-server-10.6.config
index 1929c370d6d..1929c370d6d 100644
--- a/debian/mariadb-server-10.5.config
+++ b/debian/mariadb-server-10.6.config
diff --git a/debian/mariadb-server-10.5.dirs b/debian/mariadb-server-10.6.dirs
index 5057fe806c3..5057fe806c3 100644
--- a/debian/mariadb-server-10.5.dirs
+++ b/debian/mariadb-server-10.6.dirs
diff --git a/debian/mariadb-server-10.5.install b/debian/mariadb-server-10.6.install
index ac8ab27b7c2..f2a8da01fe7 100644
--- a/debian/mariadb-server-10.5.install
+++ b/debian/mariadb-server-10.6.install
@@ -3,7 +3,7 @@ debian/additions/debian-start.inc.sh usr/share/mysql
 debian/additions/echo_stderr usr/share/mysql
 debian/additions/mysql.init usr/share/mysql
 debian/additions/mysqld_safe_syslog.cnf etc/mysql/conf.d
-debian/additions/source_mariadb-10.5.py usr/share/apport/package-hooks
+debian/additions/source_mariadb-10.6.py usr/share/apport/package-hooks
 etc/apparmor.d/usr.sbin.mysqld
 etc/security/user_map.conf
 lib/*/security/pam_user_map.so
@@ -61,7 +61,7 @@ usr/lib/mysql/plugin/server_audit.so
 usr/lib/mysql/plugin/simple_password_check.so
 usr/lib/mysql/plugin/sql_errlog.so
 usr/lib/mysql/plugin/wsrep_info.so
-usr/share/doc/mariadb-server-10.5/mysqld.sym.gz
+usr/share/doc/mariadb-server-10.6/mysqld.sym.gz
 usr/share/man/man1/aria_chk.1
 usr/share/man/man1/aria_dump_log.1
 usr/share/man/man1/aria_ftdump.1
diff --git a/debian/mariadb-server-10.5.links b/debian/mariadb-server-10.6.links
index 9cc3a436ba8..9cc3a436ba8 100644
--- a/debian/mariadb-server-10.5.links
+++ b/debian/mariadb-server-10.6.links
diff --git a/debian/mariadb-server-10.5.logcheck.ignore.paranoid b/debian/mariadb-server-10.6.logcheck.ignore.paranoid
index 00cc5c3e29d..00cc5c3e29d 100644
--- a/debian/mariadb-server-10.5.logcheck.ignore.paranoid
+++ b/debian/mariadb-server-10.6.logcheck.ignore.paranoid
diff --git a/debian/mariadb-server-10.5.logcheck.ignore.server b/debian/mariadb-server-10.6.logcheck.ignore.server
index 5b7b0322fc3..5b7b0322fc3 100644
--- a/debian/mariadb-server-10.5.logcheck.ignore.server
+++ b/debian/mariadb-server-10.6.logcheck.ignore.server
diff --git a/debian/mariadb-server-10.5.logcheck.ignore.workstation b/debian/mariadb-server-10.6.logcheck.ignore.workstation
index 5b7b0322fc3..5b7b0322fc3 100644
--- a/debian/mariadb-server-10.5.logcheck.ignore.workstation
+++ b/debian/mariadb-server-10.6.logcheck.ignore.workstation
diff --git a/debian/mariadb-server-10.5.mysql-server.logrotate b/debian/mariadb-server-10.6.mysql-server.logrotate
index 4111a276dc3..4111a276dc3 100644
--- a/debian/mariadb-server-10.5.mysql-server.logrotate
+++ b/debian/mariadb-server-10.6.mysql-server.logrotate
diff --git a/debian/mariadb-server-10.5.mysql.default b/debian/mariadb-server-10.6.mysql.default
index 146c5a87a84..146c5a87a84 100644
--- a/debian/mariadb-server-10.5.mysql.default
+++ b/debian/mariadb-server-10.6.mysql.default
diff --git a/debian/mariadb-server-10.5.postinst b/debian/mariadb-server-10.6.postinst
index 9f301878d8c..9f301878d8c 100644
--- a/debian/mariadb-server-10.5.postinst
+++ b/debian/mariadb-server-10.6.postinst
diff --git a/debian/mariadb-server-10.5.postrm b/debian/mariadb-server-10.6.postrm
index 5d1324cead1..5d1324cead1 100644
--- a/debian/mariadb-server-10.5.postrm
+++ b/debian/mariadb-server-10.6.postrm
diff --git a/debian/mariadb-server-10.5.preinst b/debian/mariadb-server-10.6.preinst
index 947b4420ee6..947b4420ee6 100644
--- a/debian/mariadb-server-10.5.preinst
+++ b/debian/mariadb-server-10.6.preinst
diff --git a/debian/mariadb-server-10.5.prerm b/debian/mariadb-server-10.6.prerm
index 6060c4fb6b1..6060c4fb6b1 100644
--- a/debian/mariadb-server-10.5.prerm
+++ b/debian/mariadb-server-10.6.prerm
diff --git a/debian/mariadb-server-10.5.templates b/debian/mariadb-server-10.6.templates
index fde43a55706..68db2871897 100644
--- a/debian/mariadb-server-10.5.templates
+++ b/debian/mariadb-server-10.6.templates
@@ -7,7 +7,7 @@
 # Even minor modifications require translation updates and such
 # changes should be coordinated with translators and reviewers.
 
-Template: mariadb-server-10.5/old_data_directory_saved
+Template: mariadb-server-10.6/old_data_directory_saved
 Type: note
 _Description: The old data directory will be saved at new location
  A file named /var/lib/mysql/debian-*.flag exists on this system.
@@ -19,7 +19,7 @@ _Description: The old data directory will be saved at new location
  .
  Please manually export/import your data (e.g. with mysqldump) if needed.
 
-Template: mariadb-server-10.5/nis_warning
+Template: mariadb-server-10.6/nis_warning
 Type: note
 #flag:translate!:3,5
 _Description: Important note for NIS/YP users
@@ -33,7 +33,7 @@ _Description: Important note for NIS/YP users
  .
   /var/lib/mysql: drwxr-xr-x   mysql    mysql
 
-Template: mariadb-server-10.5/postrm_remove_databases
+Template: mariadb-server-10.6/postrm_remove_databases
 Type: boolean
 Default: false
 _Description: Remove all MariaDB databases?
@@ -66,11 +66,10 @@ _Description: Unable to set password for the MariaDB "root" user
  .
  You should check the account's password after the package installation.
  .
- Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file
+ Please read the /usr/share/doc/mariadb-server-10.6/README.Debian file
  for more information.
 
 Template: mysql-server/password_mismatch
 Type: error
 _Description: Password input error
  The two passwords you entered were not the same. Please try again.
-
diff --git a/debian/mariadb-server-10.5.triggers b/debian/mariadb-server-10.6.triggers
index d1f5f5e14f1..d1f5f5e14f1 100644
--- a/debian/mariadb-server-10.5.triggers
+++ b/debian/mariadb-server-10.6.triggers
diff --git a/debian/mariadb-server-core-10.5.install b/debian/mariadb-server-core-10.6.install
index 77e673e4e0b..77e673e4e0b 100644
--- a/debian/mariadb-server-core-10.5.install
+++ b/debian/mariadb-server-core-10.6.install
diff --git a/debian/mariadb-server-core-10.5.links b/debian/mariadb-server-core-10.6.links
index c2be98f38fb..c2be98f38fb 100644
--- a/debian/mariadb-server-core-10.5.links
+++ b/debian/mariadb-server-core-10.6.links
diff --git a/debian/not-installed b/debian/not-installed
index 1c20318e2b8..e928b821bcf 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -7,15 +7,15 @@ usr/lib/sysusers.d/sysusers.conf
 usr/lib/tmpfiles.d/tmpfiles.conf
 usr/lib/mysql/plugin/JavaWrappers.jar # These are only built if JNI/libjawt.so is installed from e.g. openjdk-8-jre-headless
 usr/lib/mysql/plugin/JdbcInterface.jar # These are only built if JNI/libjawt.so is installed from e.g. openjdk-8-jre-headless
-usr/share/doc/mariadb-server-10.5/COPYING
-usr/share/doc/mariadb-server-10.5/COPYING.AGPLv3
-usr/share/doc/mariadb-server-10.5/COPYING.GPLv2
-usr/share/doc/mariadb-server-10.5/COPYING.thirdparty
-usr/share/doc/mariadb-server-10.5/CREDITS
-usr/share/doc/mariadb-server-10.5/EXCEPTIONS-CLIENT
-usr/share/doc/mariadb-server-10.5/INSTALL-BINARY
-usr/share/doc/mariadb-server-10.5/PATENTS
-usr/share/doc/mariadb-server-10.5/README-wsrep
+usr/share/doc/mariadb-server-10.6/COPYING
+usr/share/doc/mariadb-server-10.6/COPYING.AGPLv3
+usr/share/doc/mariadb-server-10.6/COPYING.GPLv2
+usr/share/doc/mariadb-server-10.6/COPYING.thirdparty
+usr/share/doc/mariadb-server-10.6/CREDITS
+usr/share/doc/mariadb-server-10.6/EXCEPTIONS-CLIENT
+usr/share/doc/mariadb-server-10.6/INSTALL-BINARY
+usr/share/doc/mariadb-server-10.6/PATENTS
+usr/share/doc/mariadb-server-10.6/README-wsrep
 usr/share/groonga/COPYING
 usr/share/groonga-normalizer-mysql/lgpl-2.0.txt
 usr/share/groonga-normalizer-mysql/README.md
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
index 662c4be9fbc..17bbe40ee92 100644
--- a/debian/po/POTFILES.in
+++ b/debian/po/POTFILES.in
@@ -1 +1 @@
-[type: gettext/rfc822deb] mariadb-server-10.5.templates
+[type: gettext/rfc822deb] mariadb-server-10.6.templates
diff --git a/debian/po/ar.po b/debian/po/ar.po
index f8469e448f9..413aa4c1f96 100644
--- a/debian/po/ar.po
+++ b/debian/po/ar.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: templates\n"
-"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
 "POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2007-05-01 13:04+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
@@ -27,13 +27,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
 "indicates a database binary format version that cannot automatically be "
@@ -42,7 +42,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
 "and a new data directory will be initialized at /var/lib/mysql."
@@ -50,20 +50,20 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "ملاحظة هامة لمستخدمي NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -71,7 +71,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 #, fuzzy
 #| msgid ""
 #| "You should also check the permissions and the owner of the /var/lib/mysql "
@@ -83,13 +83,13 @@ msgstr "عليك أيضاً أن تقوم بالتأكد من صلاحيات م�
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "إزالة جميع قواعد بيانات MariaDB؟"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -97,7 +97,7 @@ msgstr "الدليل /var/lib/mysql الذي يحتوي قواعد بيانات
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -108,13 +108,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "كلمة المرور الجديدة لمستخد \"root\" الخاص بـMariaDB:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -124,7 +124,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 #, fuzzy
 #| msgid "If that field is left blank, the password will not be changed."
 msgid "If this field is left blank, the password will not be changed."
@@ -132,7 +132,7 @@ msgstr "إن ترك الحقل فارغاً، فلن يتم تغيير كلمة
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:6001
+#: ../mariadb-server-10.6.templates:6001
 #, fuzzy
 #| msgid "New password for the MariaDB \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -140,13 +140,13 @@ msgstr "كلمة المرور الجديدة لمستخد \"root\" الخاص ب
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "تعذر تعيين كلمة مرور للمستخدم \"root\" الخاص بـMariaDB."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -158,7 +158,7 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 #, fuzzy
 #| msgid ""
 #| "You should check the account's password after tha package installation."
@@ -167,26 +167,26 @@ msgstr "يجب عليك التحقق من كلمة مرور الحساب عقب
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 #, fuzzy
 #| msgid ""
 #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.6/README.Debian file for "
 "more information."
 msgstr ""
-"الرجاء قراءة الملف /usr/share/doc/mariadb-server-10.5/README.Debian للمزيد "
+"الرجاء قراءة الملف /usr/share/doc/mariadb-server-10.6/README.Debian للمزيد "
 "من المعلومات."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
diff --git a/debian/po/ca.po b/debian/po/ca.po
index ea826909b53..4923d4e2d74 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-4.1\n"
-"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
 "POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2004-01-31 19:20GMT\n"
 "Last-Translator: Aleix Badia i Bosch <abadia@ica.es>\n"
@@ -17,13 +17,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
 "indicates a database binary format version that cannot automatically be "
@@ -32,7 +32,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
 "and a new data directory will be initialized at /var/lib/mysql."
@@ -40,14 +40,14 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 #, fuzzy
 #| msgid "Important note for NIS/YP users!"
 msgid "Important note for NIS/YP users"
@@ -55,7 +55,7 @@ msgstr "Nota important pels usuaris de NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -63,7 +63,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -71,13 +71,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -85,7 +85,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -94,13 +94,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -108,25 +108,25 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:6001
+#: ../mariadb-server-10.6.templates:6001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -135,26 +135,26 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.6/README.Debian file for "
 "more information."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
diff --git a/debian/po/cs.po b/debian/po/cs.po
index f5f669ee4bd..93b7412178c 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1\n"
-"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
 "POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2007-05-01 13:01+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
@@ -26,13 +26,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
 "indicates a database binary format version that cannot automatically be "
@@ -41,7 +41,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
 "and a new data directory will be initialized at /var/lib/mysql."
@@ -49,20 +49,20 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Důležitá poznámka pro uživatele NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -70,7 +70,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 #, fuzzy
 #| msgid ""
 #| "You should also check the permissions and the owner of the /var/lib/mysql "
@@ -83,13 +83,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Odstranit všechny MariaDB databáze?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -99,7 +99,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -111,13 +111,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Nové heslo MariaDB uživatele \"root\":"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -127,7 +127,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 #, fuzzy
 #| msgid "If that field is left blank, the password will not be changed."
 msgid "If this field is left blank, the password will not be changed."
@@ -135,7 +135,7 @@ msgstr "Ponecháte-li pole prázdné, heslo se nezmění."
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:6001
+#: ../mariadb-server-10.6.templates:6001
 #, fuzzy
 #| msgid "New password for the MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -143,13 +143,13 @@ msgstr "Nové heslo MariaDB uživatele \"root\":"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "Nelze nastavit heslo MariaDB uživatele \"root\""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -161,7 +161,7 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 #, fuzzy
 #| msgid ""
 #| "You should check the account's password after tha package installation."
@@ -170,25 +170,25 @@ msgstr "Po instalaci balíku byste měli heslo ověřit."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 #, fuzzy
 #| msgid ""
 #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.6/README.Debian file for "
 "more information."
 msgstr ""
-"Více informací naleznete v /usr/share/doc/mariadb-server-10.5/README.Debian."
+"Více informací naleznete v /usr/share/doc/mariadb-server-10.6/README.Debian."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
diff --git a/debian/po/da.po b/debian/po/da.po
index 780b893c328..b74756dc10f 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-4.1\n"
-"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
 "POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2007-05-30 22:41+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
@@ -27,13 +27,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
 "indicates a database binary format version that cannot automatically be "
@@ -42,7 +42,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
 "and a new data directory will be initialized at /var/lib/mysql."
@@ -50,20 +50,20 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Vigtig oplysning til NIS/YP-brugere"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -71,7 +71,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 #, fuzzy
 #| msgid ""
 #| "You should also check the permissions and the owner of the /var/lib/mysql "
@@ -80,17 +80,17 @@ msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
 msgstr ""
-"Du b�r ogs� tjekke filrettighederne og ejerskabet af mappen /var/lib/mysql:"
+"Du b�r ogs� tjekke filrettighederne og ejerskabet af mappen /var/lib/mysql:"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Fjern alle MariaDB-databaser?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -100,43 +100,43 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
 "the data should be kept."
 msgstr ""
 "Hvis du fjerner MariaDB-pakken for senere at installere en nyere version, "
-"eller hvis en anden mariadb-server-pakke allerede benytter den, b�r dataene "
+"eller hvis en anden mariadb-server-pakke allerede benytter den, b�r dataene "
 "bevares."
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Ny adgangskode for MariaDB's \"root\"-bruger:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
 msgstr ""
-"Selvom det ikke kr�ves, anbefales det kraftigt, at du s�tter en adgangskode "
+"Selvom det ikke kr�ves, anbefales det kraftigt, at du s�tter en adgangskode "
 "for MariaDB's administrationsbruger \"root\"."
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 #, fuzzy
 #| msgid "If that field is left blank, the password will not be changed."
 msgid "If this field is left blank, the password will not be changed."
-msgstr "Hvis du lader dette felt st� tomt, vil adgangskoden ikke blive �ndret."
+msgstr "Hvis du lader dette felt st� tomt, vil adgangskoden ikke blive �ndret."
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:6001
+#: ../mariadb-server-10.6.templates:6001
 #, fuzzy
 #| msgid "New password for the MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -144,51 +144,51 @@ msgstr "Ny adgangskode for MariaDB's \"root\"-bruger:"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
-msgstr "Kunne ikke s�tte adgangskoden for MariaDB's \"root\"-bruger"
+msgstr "Kunne ikke s�tte adgangskoden for MariaDB's \"root\"-bruger"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
 "because of a communication problem with the MariaDB server."
 msgstr ""
 "Der opstod en fejl, da adgangskoden for MariaDB's administrationsbruger blev "
-"fors�gt �ndret. Dette kan v�re sket, fordi brugeren allerede har en "
+"fors�gt �ndret. Dette kan v�re sket, fordi brugeren allerede har en "
 "adgangskode, eller fordi der var problemer med at kommunikere med MariaDB-"
 "serveren."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "You should check the account's password after the package installation."
-msgstr "Du b�r tjekke kontoens adgangskode efter pakkeinstallationen."
+msgstr "Du b�r tjekke kontoens adgangskode efter pakkeinstallationen."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 #, fuzzy
 #| msgid ""
 #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.6/README.Debian file for "
 "more information."
 msgstr ""
-"Se filen /usr/share/doc/mariadb-server-10.5/README.Debian for yderligere "
+"Se filen /usr/share/doc/mariadb-server-10.6/README.Debian for yderligere "
 "oplysninger."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
diff --git a/debian/po/de.po b/debian/po/de.po
index 253986ff9a5..15b064c2373 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1_5.1.37-1_de\n"
-"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
 "POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2009-08-27 22:41+0200\n"
 "Last-Translator: Thomas Mueller <thomas.mueller@tmit.eu>\n"
@@ -29,13 +29,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
 "indicates a database binary format version that cannot automatically be "
@@ -44,7 +44,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
 "and a new data directory will be initialized at /var/lib/mysql."
@@ -52,20 +52,20 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Wichtige Anmerkung für NIS/YP-Benutzer!"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -75,7 +75,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -85,13 +85,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Alle MariaDB-Datenbanken entfernen?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -101,7 +101,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -113,13 +113,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Neues Passwort für den MariaDB »root«-Benutzer:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -129,25 +129,25 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "If this field is left blank, the password will not be changed."
 msgstr "Wenn dieses Feld freigelassen wird, wird das Passwort nicht geändert."
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:6001
+#: ../mariadb-server-10.6.templates:6001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr "Wiederholen Sie das Passwort für den MariaDB-»root«-Benutzer:"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "Konnte für den MariaDB-»root«-Benutzer kein Passwort setzen"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -160,7 +160,7 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 "Sie sollten das Passwort des administrativen Benutzers nach der "
@@ -168,13 +168,13 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 #, fuzzy
 #| msgid ""
 #| "Please read the /usr/share/doc/mariadb-server-5.1/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.6/README.Debian file for "
 "more information."
 msgstr ""
 "Für weitere Informationen lesen Sie /usr/share/doc/mariadb-server-5.1/README."
@@ -182,13 +182,13 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "Password input error"
 msgstr "Passwort-Eingabefehler"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 "Die beiden von Ihnen eingegebenen Passwörter sind nicht identisch. Bitte "
diff --git a/debian/po/es.po b/debian/po/es.po
index 9e7e561693b..1b7baef0ce0 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -40,7 +40,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1_5.0.24-3\n"
-"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
 "POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2007-05-28 22:21+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
@@ -52,13 +52,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
 "indicates a database binary format version that cannot automatically be "
@@ -67,7 +67,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
 "and a new data directory will be initialized at /var/lib/mysql."
@@ -75,20 +75,20 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Nota importante para los usuarios de NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -96,7 +96,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 #, fuzzy
 #| msgid ""
 #| "You should also check the permissions and the owner of the /var/lib/mysql "
@@ -110,13 +110,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "¿Desea eliminar todas las bases de datos MariaDB?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -126,7 +126,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -138,13 +138,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Nueva contraseña para el usuario «root» de MariaDB:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -154,7 +154,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 #, fuzzy
 #| msgid "If that field is left blank, the password will not be changed."
 msgid "If this field is left blank, the password will not be changed."
@@ -162,7 +162,7 @@ msgstr "No se modificará la contraseña si deja el espacio en blanco."
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:6001
+#: ../mariadb-server-10.6.templates:6001
 #, fuzzy
 #| msgid "New password for the MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -170,13 +170,13 @@ msgstr "Nueva contraseña para el usuario «root» de MariaDB:"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "No se pudo fijar la contraseña para el usuario «root» de MariaDB"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -189,7 +189,7 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 "Debería comprobar la contraseña de la cuenta después de la instalación del "
@@ -197,26 +197,26 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 #, fuzzy
 #| msgid ""
 #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.6/README.Debian file for "
 "more information."
 msgstr ""
-"Consulte /usr/share/doc/mariadb-server-10.5/README.Debian para más "
+"Consulte /usr/share/doc/mariadb-server-10.6/README.Debian para más "
 "información."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
diff --git a/debian/po/eu.po b/debian/po/eu.po
index 49082c9059c..896c93784ed 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
-"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
 "POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2009-07-29 11:59+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
@@ -20,13 +20,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
 "indicates a database binary format version that cannot automatically be "
@@ -35,7 +35,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
 "and a new data directory will be initialized at /var/lib/mysql."
@@ -43,20 +43,20 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "NIS/YP erabiltzaileentzat ohar garrantzitsua"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -64,7 +64,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 #, fuzzy
 #| msgid ""
 #| "You should also check the permissions and the owner of the /var/lib/mysql "
@@ -78,13 +78,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Ezabatu MariaDB datubase guztiak?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -93,7 +93,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -105,13 +105,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "MariaDB \"root\" erabiltzailearen pasahitz berria:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -121,7 +121,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 #, fuzzy
 #| msgid "If that field is left blank, the password will not be changed."
 msgid "If this field is left blank, the password will not be changed."
@@ -129,19 +129,19 @@ msgstr "Eremua hau zurian utziaz gero ez da pasahitza aldatuko."
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:6001
+#: ../mariadb-server-10.6.templates:6001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr "Errepikatu MariaDB \"root\" erabiltzailearen pasahitza:"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "Ezin da MariaDB \"root\" erabiltzailearen pasahitza ezarri"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -153,33 +153,33 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 "Kontuaren pasahitza egiaztatu beharko zenuke paketea instalatu aurretik."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 #, fuzzy
 #| msgid ""
-#| "Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for "
+#| "Please read the /usr/share/doc/mariadb-server-10.6/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.6/README.Debian file for "
 "more information."
 msgstr ""
-"Mesedez irakurri /usr/share/doc/mariadb-server-10.5/README.Debian fitxategia "
+"Mesedez irakurri /usr/share/doc/mariadb-server-10.6/README.Debian fitxategia "
 "xehetasun gehiagorako."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "Password input error"
 msgstr "Pasahitz sarrera errorea"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr "Idatzi dituzun bi pasahitzak ez dira berdina. Mesedez saiatu berriz."
diff --git a/debian/po/fr.po b/debian/po/fr.po
index ef2e74058bd..7dec0b8a9e2 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
-"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
 "POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2009-08-08 14:56+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
@@ -22,13 +22,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
 "indicates a database binary format version that cannot automatically be "
@@ -37,7 +37,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
 "and a new data directory will be initialized at /var/lib/mysql."
@@ -45,20 +45,20 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Note importante pour les utilisateurs NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -68,7 +68,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -78,13 +78,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Faut-il supprimer toutes les bases de données MariaDB ?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -94,7 +94,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -105,13 +105,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Nouveau mot de passe du superutilisateur de MariaDB :"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -121,26 +121,26 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "If this field is left blank, the password will not be changed."
 msgstr "Si ce champ est laissé vide, le mot de passe ne sera pas changé."
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:6001
+#: ../mariadb-server-10.6.templates:6001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr "Confirmation du mot de passe du superutilisateur de MariaDB :"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr ""
 "Impossible de changer le mot de passe de l'utilisateur « root » de MariaDB"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -152,7 +152,7 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 "Vous devriez vérifier le mot de passe de ce compte après l'installation du "
@@ -160,27 +160,27 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 #, fuzzy
 #| msgid ""
-#| "Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for "
+#| "Please read the /usr/share/doc/mariadb-server-10.6/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.6/README.Debian file for "
 "more information."
 msgstr ""
-"Veuillez consulter le fichier /usr/share/doc/mysql-server-10.5/README.Debian "
+"Veuillez consulter le fichier /usr/share/doc/mysql-server-10.6/README.Debian "
 "pour plus d'informations."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "Password input error"
 msgstr "Erreur de saisie du mot de passe"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 "Le mot de passe et sa confirmation ne sont pas identiques. Veuillez "
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 8c309995001..e0d36980d65 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1\n"
-"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
 "POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2007-04-20 09:44+0200\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
@@ -17,13 +17,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
 "indicates a database binary format version that cannot automatically be "
@@ -32,7 +32,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
 "and a new data directory will be initialized at /var/lib/mysql."
@@ -40,20 +40,20 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Nota importante para os usuarios de NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -61,7 +61,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 #, fuzzy
 #| msgid ""
 #| "You should also check the permissions and the owner of the /var/lib/mysql "
@@ -75,13 +75,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "¿Eliminar tódalas bases de datos de MariaDB?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -91,7 +91,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -103,13 +103,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Novo contrasinal para o usuario \"root\" de MariaDB:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -119,7 +119,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 #, fuzzy
 #| msgid "If that field is left blank, the password will not be changed."
 msgid "If this field is left blank, the password will not be changed."
@@ -127,7 +127,7 @@ msgstr "Se deixa o campo en branco, non se ha cambiar o contrasinal."
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:6001
+#: ../mariadb-server-10.6.templates:6001
 #, fuzzy
 #| msgid "New password for the MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -135,13 +135,13 @@ msgstr "Novo contrasinal para o usuario \"root\" de MariaDB:"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "Non se puido establecer o contrasinal do usuario \"root\" de MariaDB"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -153,7 +153,7 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 #, fuzzy
 #| msgid ""
 #| "You should check the account's password after tha package installation."
@@ -162,26 +162,26 @@ msgstr "Debería comprobar o contrasinal da conta trala instalación do paquete.
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 #, fuzzy
 #| msgid ""
 #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.6/README.Debian file for "
 "more information."
 msgstr ""
-"Consulte o ficheiro /usr/share/doc/mariadb-server-10.5/README.Debian para "
+"Consulte o ficheiro /usr/share/doc/mariadb-server-10.6/README.Debian para "
 "máis información."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
diff --git a/debian/po/it.po b/debian/po/it.po
index 255db97e902..32f6b2e8414 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.1.37 italian debconf templates\n"
-"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
 "POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2009-08-08 11:03+0200\n"
 "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
 "indicates a database binary format version that cannot automatically be "
@@ -33,7 +33,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
 "and a new data directory will be initialized at /var/lib/mysql."
@@ -41,20 +41,20 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Nota importante per gli utenti NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -64,7 +64,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -74,13 +74,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Eliminare tutti i database MariaDB?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -90,7 +90,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -102,13 +102,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Nuova password per l'utente «root» di MariaDB:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -118,25 +118,25 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "If this field is left blank, the password will not be changed."
 msgstr "Se questo campo è lasciato vuoto, la password non viene cambiata."
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:6001
+#: ../mariadb-server-10.6.templates:6001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr "Ripetere la password per l'utente «root» di MariaDB:"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "Impossibile impostare la password per l'utente «root» di MariaDB"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -149,33 +149,33 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 "Al termine dell'installazione si deve verificare la password dell'account."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 #, fuzzy
 #| msgid ""
-#| "Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for "
+#| "Please read the /usr/share/doc/mariadb-server-10.6/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.6/README.Debian file for "
 "more information."
 msgstr ""
 "Per maggiori informazioni si consulti il file /usr/share/doc/mariadb-"
-"server-10.5/README.Debian."
+"server-10.6/README.Debian."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "Password input error"
 msgstr "Errore di inserimento della password"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr "Le due password inserite sono diverse. Riprovare."
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 2f3c1359601..693cc19e81c 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.1.37-1\n"
-"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
 "POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2009-09-01 08:25+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
@@ -27,13 +27,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
 "indicates a database binary format version that cannot automatically be "
@@ -42,7 +42,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
 "and a new data directory will be initialized at /var/lib/mysql."
@@ -50,20 +50,20 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "NIS/YP ユーザへの重要な注意"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -73,7 +73,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -81,13 +81,13 @@ msgstr "/var/lib/mysql の所有者権限をチェックする必要もありま
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "すべての MariaDB データベースを削除しますか?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -97,7 +97,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -109,13 +109,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "MariaDB の \"root\" ユーザに対する新しいパスワード:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -125,25 +125,25 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "If this field is left blank, the password will not be changed."
 msgstr "この値を空のままにしておいた場合は、パスワードは変更されません。"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:6001
+#: ../mariadb-server-10.6.templates:6001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr "MariaDB の \"root\" ユーザに対する新しいパスワード:"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "MariaDB の \"root\" ユーザのパスワードを設定できません"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -155,32 +155,32 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 "パッケージのインストール後、アカウントのパスワードを確認する必要があります。"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 #, fuzzy
 #| msgid ""
-#| "Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for "
+#| "Please read the /usr/share/doc/mariadb-server-10.6/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.6/README.Debian file for "
 "more information."
 msgstr ""
-"詳細は /usr/share/doc/mariadb-server-10.5/README.Debian を参照してください。"
+"詳細は /usr/share/doc/mariadb-server-10.6/README.Debian を参照してください。"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "Password input error"
 msgstr "パスワード入力エラー"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr "入力された二つのパスワードが一致しません。再入力してください。"
diff --git a/debian/po/nb.po b/debian/po/nb.po
index 742b58dd944..3d661fdc1ae 100644
--- a/debian/po/nb.po
+++ b/debian/po/nb.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql_nb\n"
-"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
 "POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2007-02-18 12:13+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
 "indicates a database binary format version that cannot automatically be "
@@ -34,7 +34,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
 "and a new data directory will be initialized at /var/lib/mysql."
@@ -42,14 +42,14 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 #, fuzzy
 #| msgid "Important note for NIS/YP users!"
 msgid "Important note for NIS/YP users"
@@ -57,7 +57,7 @@ msgstr "Viktig merknad for NIS/YP-brukere!"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -65,7 +65,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -73,13 +73,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -87,7 +87,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 #, fuzzy
 #| msgid ""
 #| "The script is about to remove the data directory /var/lib/mysql. If it is "
@@ -104,7 +104,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "New password for the MariaDB \"root\" user:"
@@ -112,7 +112,7 @@ msgstr "Nytt passord for MariaDBs «root»-bruker:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 #, fuzzy
 #| msgid ""
 #| "It is highly recommended that you set a password for the MySQL "
@@ -126,13 +126,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:6001
+#: ../mariadb-server-10.6.templates:6001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -140,7 +140,7 @@ msgstr "Nytt passord for MariaDBs «root»-bruker:"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 #, fuzzy
 #| msgid "Unable to set password for MySQL \"root\" user"
 msgid "Unable to set password for the MariaDB \"root\" user"
@@ -148,7 +148,7 @@ msgstr "Klarer ikke angi passord for MariaDBs «root»-bruker"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 #, fuzzy
 #| msgid ""
 #| "It seems an error occurred while setting the password for the MySQL "
@@ -167,26 +167,26 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.6/README.Debian file for "
 "more information."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 6473df81055..efeb3c4ab2e 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.0.30-1\n"
-"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
 "POT-Creation-Date: 2016-10-08 01:26+0300\n"
-"PO-Revision-Date: 2006-02-19 10.50+0100\n"
+"PO-Revision-Date: 2006-02-19 10.60+0100\n"
 "Last-Translator: Thijs Kinkhorst <thijs@debian.org>\n"
 "Language-Team: Debian-Dutch <debian-l10n-dutch@lists.debian.org>\n"
 "Language: \n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
 "indicates a database binary format version that cannot automatically be "
@@ -33,7 +33,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
 "and a new data directory will be initialized at /var/lib/mysql."
@@ -41,14 +41,14 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 #, fuzzy
 #| msgid "Important note for NIS/YP users!"
 msgid "Important note for NIS/YP users"
@@ -56,7 +56,7 @@ msgstr "Belangrijke opmerking voor gebruikers van NIS/YP!"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -64,7 +64,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -72,13 +72,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -86,7 +86,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 #, fuzzy
 #| msgid ""
 #| "The script is about to remove the data directory /var/lib/mysql. If it is "
@@ -104,7 +104,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "New password for the MariaDB \"root\" user:"
@@ -112,7 +112,7 @@ msgstr "Nieuw wachtwoord voor de MariaDB \"root\"-gebruiker:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 #, fuzzy
 #| msgid ""
 #| "It is highly recommended that you set a password for the MySQL "
@@ -126,13 +126,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:6001
+#: ../mariadb-server-10.6.templates:6001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -140,7 +140,7 @@ msgstr "Nieuw wachtwoord voor de MariaDB \"root\"-gebruiker:"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 #, fuzzy
 #| msgid "Unable to set password for MySQL \"root\" user"
 msgid "Unable to set password for the MariaDB \"root\" user"
@@ -148,7 +148,7 @@ msgstr "Kan het wachtwoord voor de MariaDB \"root\"-gebruiker niet instellen"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 #, fuzzy
 #| msgid ""
 #| "It seems an error occurred while setting the password for the MySQL "
@@ -167,26 +167,26 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.6/README.Debian file for "
 "more information."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
diff --git a/debian/po/pt.po b/debian/po/pt.po
index b8f34f107c8..815eaa8b501 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1\n"
-"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
 "POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2007-05-05 21:01+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
 "indicates a database binary format version that cannot automatically be "
@@ -33,7 +33,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
 "and a new data directory will be initialized at /var/lib/mysql."
@@ -41,20 +41,20 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Nota importante para utilizadores de NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -62,7 +62,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 #, fuzzy
 #| msgid ""
 #| "You should also check the permissions and the owner of the /var/lib/mysql "
@@ -75,13 +75,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Remover todas as bases de dados MariaDB?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -91,7 +91,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -103,13 +103,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Nova palavra-passe para o utilizador \"root\" do MariaDB:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -119,7 +119,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 #, fuzzy
 #| msgid "If that field is left blank, the password will not be changed."
 msgid "If this field is left blank, the password will not be changed."
@@ -128,7 +128,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:6001
+#: ../mariadb-server-10.6.templates:6001
 #, fuzzy
 #| msgid "New password for the MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -136,7 +136,7 @@ msgstr "Nova palavra-passe para o utilizador \"root\" do MariaDB:"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr ""
 "Não foi possível definir a palavra-passe para o utilizador \"root\" do "
@@ -144,7 +144,7 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -157,7 +157,7 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 #, fuzzy
 #| msgid ""
 #| "You should check the account's password after tha package installation."
@@ -167,26 +167,26 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 #, fuzzy
 #| msgid ""
 #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.6/README.Debian file for "
 "more information."
 msgstr ""
 "Para mais informação por favor leia o ficheiro /usr/share/doc/mariadb-"
-"server-10.5/README.Debian."
+"server-10.6/README.Debian."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 7df742ca842..2ea2993910b 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1\n"
-"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
 "POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2007-04-21 15:59-0300\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
@@ -21,13 +21,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
 "indicates a database binary format version that cannot automatically be "
@@ -36,7 +36,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
 "and a new data directory will be initialized at /var/lib/mysql."
@@ -44,20 +44,20 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Aviso importante para usuários NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -65,7 +65,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 #, fuzzy
 #| msgid ""
 #| "You should also check the permissions and the owner of the /var/lib/mysql "
@@ -78,13 +78,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Remover todas as bases de dados do MariaDB?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -94,7 +94,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -106,13 +106,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Nova senha para o usuário \"root\" do MariaDB:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -122,7 +122,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 #, fuzzy
 #| msgid "If that field is left blank, the password will not be changed."
 msgid "If this field is left blank, the password will not be changed."
@@ -130,7 +130,7 @@ msgstr "Caso este campo seja deixado em branco, a senha não sera mudada."
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:6001
+#: ../mariadb-server-10.6.templates:6001
 #, fuzzy
 #| msgid "New password for the MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -138,13 +138,13 @@ msgstr "Nova senha para o usuário \"root\" do MariaDB:"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "Impossível definir senha para o usuário \"root\" do MariaDB"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -157,7 +157,7 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 #, fuzzy
 #| msgid ""
 #| "You should check the account's password after tha package installation."
@@ -166,26 +166,26 @@ msgstr "Você deverá checar a senha dessa conta após a instalação deste paco
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 #, fuzzy
 #| msgid ""
 #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.6/README.Debian file for "
 "more information."
 msgstr ""
-"Por favor, leia o arquivo /usr/share/doc/mariadb-server-10.5/README.Debian "
+"Por favor, leia o arquivo /usr/share/doc/mariadb-server-10.6/README.Debian "
 "para maiores informações."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
diff --git a/debian/po/ro.po b/debian/po/ro.po
index e54ed9ba6ba..fbf3457c15e 100644
--- a/debian/po/ro.po
+++ b/debian/po/ro.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: po-debconf://mysql-dfsg\n"
-"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
 "POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2006-12-20 21:27+0200\n"
 "Last-Translator: stan ioan-eugen <stan.ieugen@gmail.com>\n"
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
 "indicates a database binary format version that cannot automatically be "
@@ -34,7 +34,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
 "and a new data directory will be initialized at /var/lib/mysql."
@@ -42,14 +42,14 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 #, fuzzy
 #| msgid "Important note for NIS/YP users!"
 msgid "Important note for NIS/YP users"
@@ -57,7 +57,7 @@ msgstr "Notă importantă pentru utilizatorii NIS/YP!"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -65,7 +65,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -73,13 +73,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -87,7 +87,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 #, fuzzy
 #| msgid ""
 #| "The script is about to remove the data directory /var/lib/mysql. If it is "
@@ -104,7 +104,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "New password for the MariaDB \"root\" user:"
@@ -112,7 +112,7 @@ msgstr "Noua parolă pentru utilizatorul „root” al MariaDB:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 #, fuzzy
 #| msgid ""
 #| "It is highly recommended that you set a password for the MySQL "
@@ -126,13 +126,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:6001
+#: ../mariadb-server-10.6.templates:6001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -140,7 +140,7 @@ msgstr "Noua parolă pentru utilizatorul „root” al MariaDB:"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 #, fuzzy
 #| msgid "Unable to set password for MySQL \"root\" user"
 msgid "Unable to set password for the MariaDB \"root\" user"
@@ -148,7 +148,7 @@ msgstr "Nu s-a putut stabili parola pentru utilizatorul „root” al MariaDB"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 #, fuzzy
 #| msgid ""
 #| "It seems an error occurred while setting the password for the MySQL "
@@ -167,26 +167,26 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.6/README.Debian file for "
 "more information."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 6198b7425c8..4eea8606a7d 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.1.37-1\n"
-"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
 "POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2009-08-06 20:27+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
@@ -32,13 +32,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
 "indicates a database binary format version that cannot automatically be "
@@ -47,7 +47,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
 "and a new data directory will be initialized at /var/lib/mysql."
@@ -55,20 +55,20 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Важное замечание для пользователей NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -78,7 +78,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -86,13 +86,13 @@ msgstr "Также проверьте права доступа и владел�
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Удалить все базы данных MariaDB?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -101,7 +101,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -113,13 +113,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Новый пароль для MariaDB пользователя \"root\":"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -129,25 +129,25 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "If this field is left blank, the password will not be changed."
 msgstr "Если оставить поле пустым, то пароль изменён не будет."
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:6001
+#: ../mariadb-server-10.6.templates:6001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr "Повторите ввод пароля для MariaDB пользователя \"root\":"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "Невозможно задать пароль MariaDB пользователю \"root\""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -159,31 +159,31 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr "Проверьте пароль учётной записи после установки пакета."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 #, fuzzy
 #| msgid ""
-#| "Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for "
+#| "Please read the /usr/share/doc/mariadb-server-10.6/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.6/README.Debian file for "
 "more information."
 msgstr ""
-"Подробности см. в файле /usr/share/doc/mariadb-server-10.5/README.Debian."
+"Подробности см. в файле /usr/share/doc/mariadb-server-10.6/README.Debian."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "Password input error"
 msgstr "Ошибка ввода пароля"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr "Два введённых пароля не одинаковы. Повторите ввод."
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 9b74e3300ab..ebaf24cf09c 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.0.21-3\n"
-"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
 "POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2009-09-08 21:42+0100\n"
 "Last-Translator: Martin Bagge <brother@bsnet.se>\n"
@@ -21,13 +21,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
 "indicates a database binary format version that cannot automatically be "
@@ -36,7 +36,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
 "and a new data directory will be initialized at /var/lib/mysql."
@@ -44,20 +44,20 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Viktig information för NIS/YP-användare"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -77,13 +77,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Ta bort alla MariaDB-databaser?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -93,7 +93,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -105,13 +105,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Nytt lösenord för MariaDBs \"root\"-användare:"
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -121,25 +121,25 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "If this field is left blank, the password will not be changed."
 msgstr "Om detta fält lämnas tom kommer lösenordet inte att ändras."
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:6001
+#: ../mariadb-server-10.6.templates:6001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr "Repetera lösenordet för MariaDBs \"root\"-användare:"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "Kunde inte sätta lösenord för MariaDBs \"root\"-användare"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -152,32 +152,32 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr "Du bör kontrollera kontots lösenord efter installationen av paketet."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 #, fuzzy
 #| msgid ""
-#| "Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for "
+#| "Please read the /usr/share/doc/mariadb-server-10.6/README.Debian file for "
 #| "more information."
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.6/README.Debian file for "
 "more information."
 msgstr ""
-"Läs filen /usr/share/doc/mariadb-server-10.5/README.Debian för mer "
+"Läs filen /usr/share/doc/mariadb-server-10.6/README.Debian för mer "
 "information."
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "Password input error"
 msgstr "Fel vid inmatning av lösenord"
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr "De två lösenorden du angav stämde inte överrens. Prova igen."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 225818688b3..a82b90be44d 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: mariadb-10.5\n"
-"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n"
+"Project-Id-Version: mariadb-10.6\n"
+"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
 "POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
 "indicates a database binary format version that cannot automatically be "
@@ -34,7 +34,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
 "and a new data directory will be initialized at /var/lib/mysql."
@@ -42,20 +42,20 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -63,7 +63,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -71,13 +71,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -85,7 +85,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -94,13 +94,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -108,25 +108,25 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:6001
+#: ../mariadb-server-10.6.templates:6001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -135,26 +135,26 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.6/README.Debian file for "
 "more information."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
diff --git a/debian/po/tr.po b/debian/po/tr.po
index a4249bfe9c6..0c55d32fa05 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-4.1\n"
-"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
 "POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2004-06-05 08:53+0300\n"
 "Last-Translator: Gürkan Aslan <gurkan@iaslan.com>\n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
 "indicates a database binary format version that cannot automatically be "
@@ -33,7 +33,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
 "and a new data directory will be initialized at /var/lib/mysql."
@@ -41,14 +41,14 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:2001
+#: ../mariadb-server-10.6.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 #, fuzzy
 #| msgid "Important note for NIS/YP users!"
 msgid "Important note for NIS/YP users"
@@ -56,7 +56,7 @@ msgstr "NIS/YP kullanıcıları için önemli not!"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -64,7 +64,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.5.templates:3001
+#: ../mariadb-server-10.6.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -72,13 +72,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -86,7 +86,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.5.templates:4001
+#: ../mariadb-server-10.6.templates:4001
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
@@ -95,13 +95,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -109,25 +109,25 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:5001
+#: ../mariadb-server-10.6.templates:5001
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mariadb-server-10.5.templates:6001
+#: ../mariadb-server-10.6.templates:6001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -136,26 +136,26 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:7001
+#: ../mariadb-server-10.6.templates:7001
 msgid ""
-"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for "
+"Please read the /usr/share/doc/mariadb-server-10.6/README.Debian file for "
 "more information."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../mariadb-server-10.5.templates:8001
+#: ../mariadb-server-10.6.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
diff --git a/debian/rules b/debian/rules
index a445d2e0fac..7d4fb9afa4e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -115,8 +115,8 @@ override_dh_auto_install:
 
 ifneq (,$(filter linux,$(DEB_HOST_ARCH_OS)))
 	# Copy systemd files to a location available for dh_installinit
-	cp $(BUILDDIR)/support-files/mariadb.service debian/mariadb-server-10.5.mariadb.service
-	cp $(BUILDDIR)/support-files/mariadb@.service debian/mariadb-server-10.5.mariadb@.service
+	cp $(BUILDDIR)/support-files/mariadb.service debian/mariadb-server-10.6.mariadb.service
+	cp $(BUILDDIR)/support-files/mariadb@.service debian/mariadb-server-10.6.mariadb@.service
 endif
 
 	# Run 'make install' without output since it is uninteresting and
@@ -135,7 +135,7 @@ endif
 
 	# nm numeric soft is not enough, therefore extra sort in command
 	# to satisfy Debian reproducible build requirements
-	nm --defined-only $(BUILDDIR)/sql/mysqld | LC_ALL=C sort | gzip -n -9 > $(TMP)/usr/share/doc/mariadb-server-10.5/mysqld.sym.gz
+	nm --defined-only $(BUILDDIR)/sql/mysqld | LC_ALL=C sort | gzip -n -9 > $(TMP)/usr/share/doc/mariadb-server-10.6/mysqld.sym.gz
 
 	# rename and install AppArmor profile
 	install -D -m 644 debian/apparmor-profile $(TMP)/etc/apparmor.d/usr.sbin.mysqld
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
index a201e6190cb..1a62bb2b52b 100644
--- a/debian/salsa-ci.yml
+++ b/debian/salsa-ci.yml
@@ -110,7 +110,7 @@ fresh install:
     # Verify installation of MariaDB built in this commit
     - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
     - mariadb --version # Client version
-    - service mysql status
+    - service mariadb status # There is no init.d/mysql in MariaDB 10.6
     - mkdir -p debug # Ensure dir exists before using it
     - find /var/lib/mysql -ls > debug/var-lib-mysql.list || true # Ignore errors about "no such file or directory"
     - cp -ra /etc/mysql debug/etc-mysql
@@ -125,7 +125,7 @@ fresh install:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
   allow_failure: true
 
-mariadb-10.3.x to mariadb-10.5.y upgrade:
+mariadb-10.3.x to mariadb-10.6.y upgrade:
   stage: upgrade in Sid
   dependencies:
     - build
@@ -147,7 +147,7 @@ mariadb-10.3.x to mariadb-10.5.y upgrade:
     - mariadb --skip-column-names -e "select @@version, @@version_comment"
     - echo 'SHOW DATABASES;' | mysql
     # Install MariaDB built in this commit
-    - apt-get install -y ./*.deb || true # Allow to proceed so debug artifacts get collected
+    - apt-get install -o Dpkg::Options::=--force-confnew -y ./*.deb || true # Allow to proceed so debug artifacts get collected
     # Verify installation of MariaDB built in this commit
     - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
     - mariadb --version # Client version
@@ -166,7 +166,7 @@ mariadb-10.3.x to mariadb-10.5.y upgrade:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
   allow_failure: true
 
-mariadb-10.3.x buster to mariadb-10.5 upgrade:
+mariadb-10.3.x buster to mariadb-10.6 upgrade:
   stage: upgrade from Buster/Stretch/Jessie
   dependencies:
     - build
@@ -192,7 +192,7 @@ mariadb-10.3.x buster to mariadb-10.5 upgrade:
     - sed '/sid-updates/d' -i /etc/apt/sources.list # Remove repositories that don't exist for Sid
     - sed '/security/d' -i /etc/apt/sources.list # Remove repositories that don't exist for Sid
     - apt-get update; apt-get install -y apt # Uprade minimal stack first
-    - apt-get install -y ./*.deb || true # Allow to proceed so debug artifacts get collected
+    - apt-get install -o Dpkg::Options::=--force-confnew -y ./*.deb || true # Allow to proceed so debug artifacts get collected
     # Verify installation of MariaDB built in this commit
     - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
     - mariadb --version # Client version
@@ -211,7 +211,7 @@ mariadb-10.3.x buster to mariadb-10.5 upgrade:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
   allow_failure: true
 
-mariadb-10.1 to mariadb-10.5 upgrade:
+mariadb-10.1 to mariadb-10.6 upgrade:
   stage: upgrade from Buster/Stretch/Jessie
   dependencies:
     - build
@@ -237,7 +237,7 @@ mariadb-10.1 to mariadb-10.5 upgrade:
     - sed '/sid-updates/d' -i /etc/apt/sources.list # Remove repositories that don't exist for Sid
     - sed '/security/d' -i /etc/apt/sources.list # Remove repositories that don't exist for Sid
     - apt-get update; apt-get install -y apt # Uprade minimal stack first
-    - apt-get install -y ./*.deb || true # Allow to proceed so debug artifacts get collected
+    - apt-get install -o Dpkg::Options::=--force-confnew -y ./*.deb || true # Allow to proceed so debug artifacts get collected
     # Verify installation of MariaDB built in this commit
     - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
     - mariadb --version # Client version
@@ -275,7 +275,7 @@ test basic features:
     # Verify installation of MariaDB built in this commit
     - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
     - mariadb --version # Client version
-    - service mysql status
+    - service mariadb status # There is no init.d/mysql in MariaDB 10.6
     - mkdir -p debug # Ensure dir exists before using it
     - find /var/lib/mysql -ls > debug/var-lib-mysql.list || true # Ignore errors about "no such file or directory"
     - cp -ra /etc/mysql debug/etc-mysql
@@ -490,7 +490,7 @@ mariadb-connector-c on stretch upgrade:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
   allow_failure: true
 
-mysql-5.5 to mariadb-10.5 upgrade:
+mysql-5.5 to mariadb-10.6 upgrade:
   stage: upgrade from Buster/Stretch/Jessie
   dependencies:
     - build
@@ -516,7 +516,7 @@ mysql-5.5 to mariadb-10.5 upgrade:
     - sed '/security/d' -i /etc/apt/sources.list # Remove repositories that don't exist for Sid
     - apt-get update; apt-get install -y apt || true # Install apt 1.4.9 so the wildcard command below works
     - apt-get dist-upgrade -y || true # Upgrade all to avoid udev/systemd failures
-    - apt-get install -y ./*.deb || true # Allow to proceed so debug artifacts get collected
+    - apt-get install -o Dpkg::Options::=--force-confnew -y ./*.deb || true # Allow to proceed so debug artifacts get collected
     # Verify installation of MariaDB built in this commit
     - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
     - mariadb --version # Client version
@@ -537,7 +537,7 @@ mysql-5.5 to mariadb-10.5 upgrade:
 
 # Upgrading from MySQL 5.7 involves automatic renaming of auth_socket plugin
 # to unix_socket and automaticly re-adding Password column in user table.
-mysql-5.7 to mariadb-10.5 upgrade:
+mysql-5.7 to mariadb-10.6 upgrade:
   stage: test extras
   dependencies:
     - build
@@ -584,7 +584,7 @@ mysql-5.7 to mariadb-10.5 upgrade:
 
 # Upgrading from MySQL 8.0 with datadir in place is not possible. Users need to do a data dump.
 # The Debian maintainer scripts detect this situation and simply moves old datadir aside and start fresh.
-mysql-8.0 to mariadb-10.5 upgrade:
+mysql-8.0 to mariadb-10.6 upgrade:
   stage: upgrade extras
   dependencies:
     - build
@@ -633,7 +633,7 @@ mysql-8.0 to mariadb-10.5 upgrade:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
 
-mariadb.org-10.5.x to mariadb-10.5 upgrade:
+mariadb.org-10.5.x to mariadb-10.6 upgrade:
   stage: upgrade extras
   dependencies:
     - build
@@ -648,14 +648,16 @@ mariadb.org-10.5.x to mariadb-10.5 upgrade:
     - cd ${WORKING_DIR} # Don't repeat this step, it's just cd ./debian/output
     - apt-get update
     - apt install -y curl systemctl # systemctl shim needed on platforms that don't have systemd
-    - curl https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc
+    - curl -sS https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc
     - echo 'deb [arch=amd64,i386] http://mirror.one.com/mariadb/repo/10.5/debian sid main' > /etc/apt/sources.list.d/mariadb.list
     - apt-get update
     - apt-get install -y mariadb-server-10.5
     # Verify installation of MySQL from Sid
     - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
-    - service mysql status || true # Currently does not support service name 'mysql'
-    - service mariadb status
+    # MariaDB.org version of 10.4 and early 10.5 do not install an init file, so
+    # it must be installed here manually
+    - cp /usr/share/mysql/mysql.init /etc/init.d/mysql; chmod +x /etc/init.d/mysql; service mysql start; sleep 5
+    - service mysql status
     - mysql --skip-column-names -e "SELECT @@version, @@version_comment"
     - mysql -e "SELECT Host,User,plugin,authentication_string FROM user;" mysql
     - mysql -e "SELECT * FROM plugin;" mysql
@@ -665,7 +667,7 @@ mariadb.org-10.5.x to mariadb-10.5 upgrade:
     # Verify installation of MariaDB built in this commit
     - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
     - mariadb --version # Client version
-    - service mysql status || true # Currently does not support service name 'mysql'
+    - service mysql status
     - service mariadb status
     - mkdir -p debug # Ensure dir exists before using it
     - find /var/lib/mysql -ls > debug/var-lib-mysql.list || true # Ignore errors about "no such file or directory"
@@ -683,7 +685,7 @@ mariadb.org-10.5.x to mariadb-10.5 upgrade:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
 
-mariadb.org-10.4 to mariadb-10.5 upgrade:
+mariadb.org-10.4 to mariadb-10.6 upgrade:
   stage: upgrade extras
   dependencies:
     - build
@@ -698,14 +700,16 @@ mariadb.org-10.4 to mariadb-10.5 upgrade:
     - cd ${WORKING_DIR} # Don't repeat this step, it's just cd ./debian/output
     - apt-get update
     - apt install -y curl systemctl # systemctl shim needed on platforms that don't have systemd
-    - curl https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc
+    - curl -sS https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc
     - echo 'deb [arch=amd64,i386] http://mirror.one.com/mariadb/repo/10.4/debian sid main' > /etc/apt/sources.list.d/mariadb.list
     - apt-get update
     - apt-get install -y mariadb-server-10.4
     # Verify installation of MySQL from Sid
     - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
-    - service mysql status || true # Currently does not support service name 'mysql'
-    - service mariadb status
+    # MariaDB.org version of 10.4 and early 10.5 do not install an init file, so
+    # it must be installed here manually
+    - cp /usr/share/mysql/mysql.init /etc/init.d/mysql; chmod +x /etc/init.d/mysql; service mysql start; sleep 5
+    - service mysql status
     - mysql --skip-column-names -e "SELECT @@version, @@version_comment"
     - mysql -e "SELECT Host,User,plugin,authentication_string FROM user;" mysql
     - mysql -e "SELECT * FROM plugin;" mysql
@@ -715,7 +719,7 @@ mariadb.org-10.4 to mariadb-10.5 upgrade:
     # Verify installation of MariaDB built in this commit
     - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
     - mariadb --version # Client version
-    - service mysql status || true # Currently does not support service name 'mysql'
+    - service mysql status
     - service mariadb status
     - mkdir -p debug # Ensure dir exists before using it
     - find /var/lib/mysql -ls > debug/var-lib-mysql.list || true # Ignore errors about "no such file or directory"
@@ -733,7 +737,7 @@ mariadb.org-10.4 to mariadb-10.5 upgrade:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
 
-mariadb.org-10.3 to mariadb-10.5 upgrade:
+mariadb.org-10.3 to mariadb-10.6 upgrade:
   stage: upgrade extras
   dependencies:
     - build
@@ -748,7 +752,7 @@ mariadb.org-10.3 to mariadb-10.5 upgrade:
     - cd ${WORKING_DIR} # Don't repeat this step, it's just cd ./debian/output
     - apt-get update
     - apt install -y curl
-    - curl https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc
+    - curl -sS https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc
     - echo 'deb [arch=amd64,i386] http://mirror.one.com/mariadb/repo/10.3/debian sid main' > /etc/apt/sources.list.d/mariadb.list
     - apt-get update
     - apt-get install -y mariadb-server-10.3
@@ -760,14 +764,11 @@ mariadb.org-10.3 to mariadb-10.5 upgrade:
     - mysql --defaults-file=/etc/mysql/debian.cnf -e "SELECT Host,User,plugin,authentication_string FROM user;" mysql
     - mysql --defaults-file=/etc/mysql/debian.cnf -e "SELECT * FROM plugin;" mysql
     - echo 'SHOW DATABASES;' | mysql --defaults-file=/etc/mysql/debian.cnf
-    # Additional systemctl hack since there is no real systemctl in Docker
-    - ln -s /bin/true /bin/systemctl
     # Install MariaDB built in this commit
     - apt-get install -y ./*.deb || true # Allow to proceed so debug artifacts get collected
     # Verify installation of MariaDB built in this commit
     - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
     - mariadb --version # Client version
-    - service mysql restart # Needed due to systemctl hack and lack of real init support
     - service mysql status
     - mkdir -p debug # Ensure dir exists before using it
     - find /var/lib/mysql -ls > debug/var-lib-mysql.list || true # Ignore errors about "no such file or directory"
@@ -785,7 +786,7 @@ mariadb.org-10.3 to mariadb-10.5 upgrade:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
 
-mariadb.org-10.2 to mariadb-10.5 upgrade:
+mariadb.org-10.2 to mariadb-10.6 upgrade:
   stage: upgrade extras
   dependencies:
     - build
@@ -800,7 +801,7 @@ mariadb.org-10.2 to mariadb-10.5 upgrade:
     - cd ${WORKING_DIR} # Don't repeat this step, it's just cd ./debian/output
     - apt-get update
     - apt install -y curl
-    - curl https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc
+    - curl -sS https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc
     - echo 'deb [arch=amd64,i386] http://mirror.one.com/mariadb/repo/10.2/debian sid main' > /etc/apt/sources.list.d/mariadb.list
     - apt-get update
     - apt-get install -y mariadb-server-10.2
@@ -812,14 +813,11 @@ mariadb.org-10.2 to mariadb-10.5 upgrade:
     - mysql --defaults-file=/etc/mysql/debian.cnf -e "SELECT Host,User,plugin,authentication_string FROM user;" mysql
     - mysql --defaults-file=/etc/mysql/debian.cnf -e "SELECT * FROM plugin;" mysql
     - echo 'SHOW DATABASES;' | mysql --defaults-file=/etc/mysql/debian.cnf
-    # Additional systemctl hack since there is no real systemctl in Docker
-    - ln -s /bin/true /bin/systemctl
     # Install MariaDB built in this commit
     - apt-get install -y ./*.deb || true # Allow to proceed so debug artifacts get collected
     # Verify installation of MariaDB built in this commit
     - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
     - mariadb --version # Client version
-    - service mysql restart # Needed due to systemctl hack and lack of real init support
     - service mysql status
     - mkdir -p debug # Ensure dir exists before using it
     - find /var/lib/mysql -ls > debug/var-lib-mysql.list || true # Ignore errors about "no such file or directory"
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index a6c3a616ed8..c8adb576864 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -2,23 +2,23 @@
 source-is-missing extra/wolfssl/wolfssl/doc/formats/html/html_changes/menu.js line length is 679 characters (>512)
 # Necessary for drop-in-place-replacement upgrades on mysql-server/-client
 # since package breaks/replaces these but at the same time also provides them
-version-substvar-for-external-package mariadb-client-core-10.5 -> mysql-client-5.5
-version-substvar-for-external-package mariadb-server-10.5 -> mysql-server
-version-substvar-for-external-package mariadb-server-10.5 -> mysql-server
+version-substvar-for-external-package mariadb-client-core-10.6 -> mysql-client-5.5
+version-substvar-for-external-package mariadb-server-10.6 -> mysql-server
+version-substvar-for-external-package mariadb-server-10.6 -> mysql-server
 version-substvar-for-external-package libmariadb-dev -> libmysqlclient-dev
 version-substvar-for-external-package libmariadb-dev -> libmysqld-dev
-version-substvar-for-external-package mariadb-server-10.5 -> mysql-client-5.5
-version-substvar-for-external-package mariadb-server-10.5 -> mysql-client-5.6
-version-substvar-for-external-package mariadb-server-10.5 -> mysql-client-5.7
-version-substvar-for-external-package mariadb-server-10.5 -> mysql-client-8.0
-version-substvar-for-external-package mariadb-client-10.5 -> mysql-client-core-5.1
-version-substvar-for-external-package mariadb-client-10.5 -> mysql-client-core-5.1
-version-substvar-for-external-package mariadb-client-10.5 -> mysql-client-core-5.5
-version-substvar-for-external-package mariadb-client-10.5 -> mysql-client-core-5.5
-version-substvar-for-external-package mariadb-client-10.5 -> mysql-client-core-5.6
-version-substvar-for-external-package mariadb-client-10.5 -> mysql-client-core-5.6
-version-substvar-for-external-package mariadb-client-10.5 -> mysql-client-core-5.7
-version-substvar-for-external-package mariadb-client-10.5 -> mysql-client-core-5.7
-version-substvar-for-external-package mariadb-client-10.5 -> mysql-client-core-8.0
-version-substvar-for-external-package mariadb-client-10.5 -> mysql-client-core-8.0
+version-substvar-for-external-package mariadb-server-10.6 -> mysql-client-5.5
+version-substvar-for-external-package mariadb-server-10.6 -> mysql-client-5.6
+version-substvar-for-external-package mariadb-server-10.6 -> mysql-client-5.7
+version-substvar-for-external-package mariadb-server-10.6 -> mysql-client-8.0
+version-substvar-for-external-package mariadb-client-10.6 -> mysql-client-core-5.1
+version-substvar-for-external-package mariadb-client-10.6 -> mysql-client-core-5.1
+version-substvar-for-external-package mariadb-client-10.6 -> mysql-client-core-5.5
+version-substvar-for-external-package mariadb-client-10.6 -> mysql-client-core-5.5
+version-substvar-for-external-package mariadb-client-10.6 -> mysql-client-core-5.6
+version-substvar-for-external-package mariadb-client-10.6 -> mysql-client-core-5.6
+version-substvar-for-external-package mariadb-client-10.6 -> mysql-client-core-5.7
+version-substvar-for-external-package mariadb-client-10.6 -> mysql-client-core-5.7
+version-substvar-for-external-package mariadb-client-10.6 -> mysql-client-core-8.0
+version-substvar-for-external-package mariadb-client-10.6 -> mysql-client-core-8.0
 version-substvar-for-external-package libmariadbd-dev -> libmariadbclient-dev
diff --git a/debian/tests/control b/debian/tests/control
index 45097079629..19675f2efdb 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -3,7 +3,7 @@ Tests: smoke
 # for its existence (see the list in debian/control), install it if available
 # and check in the test if it's funcational when it should be.
 # The plugin package also already depends on the other one.
-Depends: mariadb-plugin-rocksdb | mariadb-server-10.5
+Depends: mariadb-plugin-rocksdb | mariadb-server-10.6
 Restrictions: allow-stderr needs-root isolation-container
 
 Tests: upstream
diff --git a/debian/tests/smoke b/debian/tests/smoke
index 1fc2528666e..86664110f6e 100644
--- a/debian/tests/smoke
+++ b/debian/tests/smoke
@@ -4,7 +4,7 @@
 #
 # This test should be declared in debian/tests/control with a dependency
 # on the package that provides a configured MariaDB server (eg.
-# mariadb-server-10.5).
+# mariadb-server-10.6).
 #
 # This test should be declared in debian/tests/control with the
 # following restrictions:
@@ -81,7 +81,7 @@ if [ "$(dpkg-architecture -qDEB_HOST_ARCH_BITS)" != 32 ] &&
 
   LOG=/var/lib/mysql/#rocksdb/LOG
   # XXX: The server may only be started during the install of
-  #      mariadb-server-10.5, which happens before that of the plugin.
+  #      mariadb-server-10.6, which happens before that of the plugin.
   [ -e $LOG ] || mysql -e "INSTALL PLUGIN RocksDB SONAME 'ha_rocksdb';"
   # XXX: rocksdb_supported_compression_types variable does not report ZSTD.
   for a in LZ4 Snappy Zlib ZSTD; do