71 files changed, 514 insertions, 372 deletions

diff --git a/debian/additions/mariadb.conf.d/50-server.cnf b/debian/additions/mariadb.conf.d/50-server.cnf
index c5a26bd42b2..728ca23178b 100644
--- a/debian/additions/mariadb.conf.d/50-server.cnf
+++ b/debian/additions/mariadb.conf.d/50-server.cnf
@@ -108,7 +108,7 @@ collation-server      = utf8mb4_general_ci
 # you can put MariaDB-only options here
 [mariadb]
 
-# This group is only read by MariaDB-10.6 servers.
+# This group is only read by MariaDB-10.7 servers.
 # If you use the same .cnf file for MariaDB of different versions,
 # use this group for options that older servers don't understand
-[mariadb-10.6]
+[mariadb-10.7]
diff --git a/debian/additions/source_mariadb-10.6.py b/debian/additions/source_mariadb-10.7.py
index 43b1f35373e..d126a9a28d3 100644
--- a/debian/additions/source_mariadb-10.6.py
+++ b/debian/additions/source_mariadb-10.7.py
@@ -1,4 +1,4 @@
-'''apport package hook for mariadb-10.6
+'''apport package hook for mariadb-10.7
 
 (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.6', conffiles=None)
+    attach_conffiles(report, 'mariadb-server-10.7', 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 1cc215f1c82..09b06084647 100755
--- a/debian/autobake-deb.sh
+++ b/debian/autobake-deb.sh
@@ -17,6 +17,7 @@ set -e
 export DEB_BUILD_OPTIONS="nocheck $DEB_BUILD_OPTIONS"
 
 source ./VERSION
+
 # General CI optimizations to keep build output smaller
 if [[ $GITLAB_CI ]]
 then
@@ -34,7 +35,7 @@ then
   then
     cp -v storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.* debian/
     echo >> debian/control
-    cat storage/columnstore/columnstore/debian/control >> debian/control
+    sed "s/10.6/${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}/" <storage/columnstore/columnstore/debian/control >> debian/control
   fi
 fi
 
@@ -67,6 +68,12 @@ disable_pmem()
   sed '/-DWITH_PMEM=YES/d' -i debian/rules
 }
 
+disable_libfmt()
+{
+  # 0.7+ required
+  sed '/libfmt-dev/d' -i debian/control
+}
+
 architecture=$(dpkg-architecture -q DEB_BUILD_ARCH)
 
 # Parse release name and number from Linux standard base release
@@ -105,6 +112,7 @@ in
     disable_pmem
     ;&
   buster)
+    disable_libfmt
     replace_uring_with_aio
     if [ ! "$architecture" = amd64 ]
     then
@@ -134,6 +142,7 @@ in
     ;&
   focal)
     replace_uring_with_aio
+    disable_libfmt
     ;&
   impish|jammy|kinetic)
     # mariadb-plugin-rocksdb s390x not supported by us (yet)
diff --git a/debian/changelog b/debian/changelog
index 08065467bdc..59109117207 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-mariadb-10.6 (1:10.6.0) unstable; urgency=medium
+mariadb-10.7 (1:10.7.0) unstable; urgency=medium
 
   * Initial Release
 
- -- Otto Kekäläinen <otto@debian.org>  Thu, 14 May 2020 18:00:57 +0300
+ -- Vicențiu Ciorbaru <vicentiu@mariadb.org>  Thu, 18 Jun 2021 16:08:00 +0300
diff --git a/debian/control b/debian/control
index 7f0d88e991c..61000bd2432 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: mariadb-10.6
+Source: mariadb-10.7
 Section: database
 Priority: optional
 Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
@@ -18,14 +18,18 @@ Build-Depends: bison,
                libboost-regex-dev [amd64],
                libboost-system-dev [amd64],
                libboost-thread-dev [amd64],
+               libbz2-dev,
                libcrack2-dev (>= 2.9.0),
                libcurl4-openssl-dev | libcurl4-dev,
                libedit-dev,
                libedit-dev:native,
+               libfmt-dev (>= 7.0.0),
                libjemalloc-dev [linux-any],
                libjudy-dev,
                libkrb5-dev,
                liblz4-dev,
+               liblzma-dev,
+               liblzo2-dev,
                libncurses5-dev (>= 5.0-6~),
                libncurses5-dev:native (>= 5.0-6~),
                libnuma-dev [linux-any],
@@ -38,7 +42,7 @@ Build-Depends: bison,
                libsystemd-dev [linux-any],
                liburing-dev [linux-any],
                libxml2-dev,
-               libzstd-dev,
+               libzstd-dev (>= 1.1.3),
                lsb-release,
                perl:any,
                po-debconf,
@@ -259,7 +263,7 @@ Description: MariaDB common configuration files
  .
  This package includes configuration files common to all MariaDB programs.
 
-Package: mariadb-client-core-10.6
+Package: mariadb-client-core-10.7
 Architecture: any
 Depends: libmariadb3 (>= 10.5.4),
          mariadb-common (>= ${source:Version}),
@@ -271,7 +275,8 @@ Conflicts: mariadb-client-10.0,
            mariadb-client-10.3,
            mariadb-client-10.4,
            mariadb-client-10.5,
-           mariadb-client-10.6 (<< ${source:Version}),
+           mariadb-client-10.6,
+           mariadb-client-10.7 (<< ${source:Version}),
            mariadb-client-5.1,
            mariadb-client-5.2,
            mariadb-client-5.3,
@@ -282,6 +287,7 @@ Conflicts: mariadb-client-10.0,
            mariadb-client-core-10.3,
            mariadb-client-core-10.4,
            mariadb-client-core-10.5,
+           mariadb-client-core-10.6,
            mariadb-client-core-5.1,
            mariadb-client-core-5.2,
            mariadb-client-core-5.3,
@@ -304,7 +310,8 @@ Breaks: mariadb-server-10.0,
         mariadb-server-core-10.3,
         mariadb-server-core-10.4,
         mariadb-server-core-10.5,
-        mariadb-server-core-10.6 (<< ${source:Version}),
+        mariadb-server-core-10.6,
+        mariadb-server-core-10.7 (<< ${source:Version}),
         mysql-server-core-5.5,
         mysql-server-core-5.6,
         mysql-server-core-5.7,
@@ -318,7 +325,8 @@ Replaces: mariadb-client-10.0,
           mariadb-client-10.3,
           mariadb-client-10.4,
           mariadb-client-10.5,
-          mariadb-client-10.6 (<< ${source:Version}),
+          mariadb-client-10.6,
+          mariadb-client-10.7 (<< ${source:Version}),
           mariadb-client-5.1,
           mariadb-client-5.2,
           mariadb-client-5.3,
@@ -329,6 +337,7 @@ Replaces: mariadb-client-10.0,
           mariadb-client-core-10.3,
           mariadb-client-core-10.4,
           mariadb-client-core-10.5,
+          mariadb-client-core-10.6,
           mariadb-client-core-5.1,
           mariadb-client-core-5.2,
           mariadb-client-core-5.3,
@@ -341,7 +350,8 @@ Replaces: mariadb-client-10.0,
           mariadb-server-core-10.3,
           mariadb-server-core-10.4,
           mariadb-server-core-10.5,
-          mariadb-server-core-10.6 (<< ${source:Version}),
+          mariadb-server-core-10.6,
+          mariadb-server-core-10.7 (<< ${source:Version}),
           mysql-client (<< 5.0.51),
           mysql-client-5.0,
           mysql-client-5.1,
@@ -369,10 +379,11 @@ Description: MariaDB database core client binaries
  .
  This package includes the core client files, as used by Akonadi.
 
-Package: mariadb-client-10.6
+Package: mariadb-client-10.7
 Architecture: any
 Depends: debianutils (>=1.6),
-         mariadb-client-core-10.6 (>= ${source:Version}),
+         libconfig-inifiles-perl,
+         mariadb-client-core-10.7 (>= ${source:Version}),
          mariadb-common,
          ${misc:Depends},
          ${perl:Depends},
@@ -384,7 +395,8 @@ Conflicts: mariadb-client (<< ${source:Version}),
            mariadb-client-10.3,
            mariadb-client-10.4,
            mariadb-client-10.5,
-           mariadb-client-10.6 (<< ${source:Version}),
+           mariadb-client-10.6,
+           mariadb-client-10.7 (<< ${source:Version}),
            mariadb-client-5.1,
            mariadb-client-5.2,
            mariadb-client-5.3,
@@ -410,21 +422,24 @@ Breaks: mariadb-client-core-10.0,
         mariadb-client-core-10.3,
         mariadb-client-core-10.4,
         mariadb-client-core-10.5,
-        mariadb-client-core-10.6 (<< ${source:Version}),
+        mariadb-client-core-10.6,
+        mariadb-client-core-10.7 (<< ${source:Version}),
         mariadb-server-10.0,
         mariadb-server-10.1,
         mariadb-server-10.2,
         mariadb-server-10.3,
         mariadb-server-10.4,
         mariadb-server-10.5,
-        mariadb-server-10.6 (<< ${source:Version}),
+        mariadb-server-10.6,
+        mariadb-server-10.7 (<< ${source:Version}),
         mariadb-server-core-10.0,
         mariadb-server-core-10.1,
         mariadb-server-core-10.2,
         mariadb-server-core-10.3,
         mariadb-server-core-10.4,
         mariadb-server-core-10.5,
-        mariadb-server-core-10.6 (<< ${source:Version}),
+        mariadb-server-core-10.6,
+        mariadb-server-core-10.7 (<< ${source:Version}),
         mysql-server-5.5,
         mysql-server-5.6,
         mysql-server-5.7,
@@ -443,6 +458,7 @@ Replaces: mariadb-client (<< ${source:Version}),
           mariadb-client-10.3,
           mariadb-client-10.4,
           mariadb-client-10.5,
+          mariadb-client-10.6,
           mariadb-client-5.1,
           mariadb-client-5.2,
           mariadb-client-5.3,
@@ -453,21 +469,24 @@ Replaces: mariadb-client (<< ${source:Version}),
           mariadb-client-core-10.3,
           mariadb-client-core-10.4,
           mariadb-client-core-10.5,
-          mariadb-client-core-10.6 (<< ${source:Version}),
+          mariadb-client-core-10.6,
+          mariadb-client-core-10.7 (<< ${source:Version}),
           mariadb-server-10.0,
           mariadb-server-10.1,
           mariadb-server-10.2,
           mariadb-server-10.3,
           mariadb-server-10.4,
           mariadb-server-10.5,
-          mariadb-server-10.6 (<< ${source:Version}),
+          mariadb-server-10.6,
+          mariadb-server-10.7 (<< ${source:Version}),
           mariadb-server-core-10.0,
           mariadb-server-core-10.1,
           mariadb-server-core-10.2,
           mariadb-server-core-10.3,
           mariadb-server-core-10.4,
           mariadb-server-core-10.5,
-          mariadb-server-core-10.6 (<< ${source:Version}),
+          mariadb-server-core-10.6,
+          mariadb-server-core-10.7 (<< ${source:Version}),
           mysql-client (<< 5.0.51),
           mysql-client-5.0,
           mysql-client-5.1,
@@ -508,7 +527,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.6
+Package: mariadb-server-core-10.7
 Architecture: any
 Depends: mariadb-common (>= ${source:Version}),
          ${misc:Depends},
@@ -519,6 +538,7 @@ Conflicts: mariadb-server-core-10.0,
            mariadb-server-core-10.3,
            mariadb-server-core-10.4,
            mariadb-server-core-10.5,
+           mariadb-server-core-10.6,
            mariadb-server-core-5.1,
            mariadb-server-core-5.2,
            mariadb-server-core-5.3,
@@ -537,13 +557,15 @@ Breaks: mariadb-client-10.0,
         mariadb-client-10.3,
         mariadb-client-10.4,
         mariadb-client-10.5,
-        mariadb-client-10.6 (<< ${source:Version}),
+        mariadb-client-10.6,
+        mariadb-client-10.7 (<< ${source:Version}),
         mariadb-server-10.0,
         mariadb-server-10.1,
         mariadb-server-10.3,
         mariadb-server-10.4,
         mariadb-server-10.5,
-        mariadb-server-10.6 (<< ${source:Version}),
+        mariadb-server-10.6,
+        mariadb-server-10.7 (<< ${source:Version}),
         mysql-client-5.5,
         mysql-server-5.5,
         mysql-server-5.6,
@@ -558,13 +580,15 @@ Replaces: mariadb-client-10.0,
           mariadb-client-10.3,
           mariadb-client-10.4,
           mariadb-client-10.5,
-          mariadb-client-10.6 (<< ${source:Version}),
+          mariadb-client-10.6,
+          mariadb-client-10.7 (<< ${source:Version}),
           mariadb-server-10.0,
           mariadb-server-10.1,
           mariadb-server-10.3,
           mariadb-server-10.4,
           mariadb-server-10.5,
-          mariadb-server-10.6 (<< ${source:Version}),
+          mariadb-server-10.6,
+          mariadb-server-10.7 (<< ${source:Version}),
           mariadb-server-core-10.0,
           mariadb-server-core-10.1,
           mariadb-server-core-10.2,
@@ -601,7 +625,7 @@ Description: MariaDB database core server files
  .
  This package includes the core server files, as used by Akonadi.
 
-Package: mariadb-server-10.6
+Package: mariadb-server-10.7
 Architecture: any
 Suggests: mailx,
           mariadb-test,
@@ -616,8 +640,8 @@ Depends: galera-4 (>= 26.4),
          libdbi-perl,
          lsb-base (>= 3.0-10),
          lsof [linux-any],
-         mariadb-client-10.6 (>= ${source:Version}),
-         mariadb-server-core-10.6 (>= ${source:Version}),
+         mariadb-client-10.7 (>= ${source:Version}),
+         mariadb-server-core-10.7 (>= ${source:Version}),
          passwd,
          perl (>= 5.6),
          procps,
@@ -634,6 +658,7 @@ Conflicts: mariadb-server (<< ${source:Version}),
            mariadb-server-10.3,
            mariadb-server-10.4,
            mariadb-server-10.5,
+           mariadb-server-10.6,
            mariadb-server-5.1,
            mariadb-server-5.2,
            mariadb-server-5.3,
@@ -664,7 +689,8 @@ Replaces: handlersocket-mysql-5.5,
           libmariadbclient-dev (<< 5.5.0),
           libmariadbclient16,
           mariadb-client-10.5,
-          mariadb-client-10.6 (<< ${source:Version}),
+          mariadb-client-10.6,
+          mariadb-client-10.7 (<< ${source:Version}),
           mariadb-server (<< ${source:Version}),
           mariadb-server-10.0,
           mariadb-server-10.1,
@@ -672,6 +698,7 @@ Replaces: handlersocket-mysql-5.5,
           mariadb-server-10.3,
           mariadb-server-10.4,
           mariadb-server-10.5,
+          mariadb-server-10.6,
           mariadb-server-5.1,
           mariadb-server-5.2,
           mariadb-server-5.3,
@@ -705,11 +732,11 @@ Description: MariaDB database server binaries
 
 Package: mariadb-server
 Architecture: all
-Depends: mariadb-server-10.6 (>= ${source:Version}),
+Depends: mariadb-server-10.7 (>= ${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.6), as determined by the MariaDB
+ mariadb-server (currently mariadb-server-10.7), 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.
@@ -721,11 +748,11 @@ Description: MariaDB database server (metapackage depending on the latest versio
 
 Package: mariadb-client
 Architecture: all
-Depends: mariadb-client-10.6 (>= ${source:Version}),
+Depends: mariadb-client-10.7 (>= ${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.6), as determined by the MariaDB
+ mariadb-client (currently mariadb-client-10.7), 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.
 
@@ -737,7 +764,7 @@ Breaks: mariadb-backup-10.1,
 Replaces: mariadb-backup-10.1,
           mariadb-backup-10.2,
           mariadb-client-10.1
-Depends: mariadb-client-core-10.6 (= ${binary:Version}),
+Depends: mariadb-client-core-10.7 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Backup tool for MariaDB server
@@ -750,7 +777,7 @@ Description: Backup tool for MariaDB server
 Package: mariadb-plugin-connect
 Architecture: any
 Depends: libxml2,
-         mariadb-server-10.6 (= ${server:Version}),
+         mariadb-server-10.7 (= ${server:Version}),
          unixodbc,
          ${misc:Depends},
          ${shlibs:Depends}
@@ -773,7 +800,7 @@ Description: Connect storage engine for MariaDB
 Package: mariadb-plugin-s3
 Architecture: any
 Depends: libcurl4,
-         mariadb-server-10.6 (= ${server:Version}),
+         mariadb-server-10.7 (= ${server:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Amazon S3 archival storage engine for MariaDB
@@ -783,7 +810,7 @@ Description: Amazon S3 archival storage engine for MariaDB
 
 Package: mariadb-plugin-rocksdb
 Architecture: amd64 arm64 mips64el ppc64el
-Depends: mariadb-server-10.6 (= ${server:Version}),
+Depends: mariadb-server-10.7 (= ${server:Version}),
          python3,
          rocksdb-tools,
          ${misc:Depends},
@@ -803,7 +830,7 @@ Description: RocksDB storage engine for MariaDB
 Package: mariadb-plugin-oqgraph
 Architecture: any
 Depends: libjudydebian1,
-         mariadb-server-10.6 (= ${server:Version}),
+         mariadb-server-10.7 (= ${server:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-oqgraph-engine-10.0,
@@ -823,7 +850,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.6 (= ${server:Version}),
+Depends: mariadb-server-10.7 (= ${server:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-server-10.0,
@@ -843,7 +870,7 @@ Description: Mroonga storage engine for MariaDB
 
 Package: mariadb-plugin-spider
 Architecture: any
-Depends: mariadb-server-10.6 (= ${server:Version}),
+Depends: mariadb-server-10.7 (= ${server:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-server-10.0,
@@ -865,7 +892,7 @@ Description: Spider storage engine for MariaDB
 Package: mariadb-plugin-gssapi-server
 Architecture: any
 Depends: libgssapi-krb5-2,
-         mariadb-server-10.6,
+         mariadb-server-10.7,
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-gssapi-server-10.1,
@@ -886,7 +913,7 @@ Package: mariadb-plugin-gssapi-client
 Architecture: any
 Multi-Arch: same
 Depends: libgssapi-krb5-2,
-         mariadb-client-10.6 (= ${binary:Version}),
+         mariadb-client-10.7 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-gssapi-client-10.1,
@@ -906,7 +933,7 @@ Description: GSSAPI authentication plugin for MariaDB client
 Package: mariadb-plugin-cracklib-password-check
 Architecture: any
 Depends: libcrack2 (>= 2.9.0),
-         mariadb-server-10.6,
+         mariadb-server-10.7,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: CrackLib Password Validation Plugin for MariaDB
@@ -915,10 +942,80 @@ Description: CrackLib Password Validation Plugin for MariaDB
  .
  Install and configure this to enforce stronger passwords for MariaDB users.
 
+Package: mariadb-plugin-provider-bzip2
+Architecture: any
+Depends: mariadb-server-10.7,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: BZip2 compression support in the server and storage engines
+ The various MariaDB storage engines, such as InnoDB, RocksDB, Mroonga,
+ can use different compression libraries.
+ .
+ Plugin provides BZip2 (https://sourceware.org/bzip2/) compression
+ .
+ Note that these affect InnoDB and Mroonga only;
+ RocksDB still uses the compression algorithms from its own library
+
+Package: mariadb-plugin-provider-lz4
+Architecture: any
+Depends: mariadb-server-10.7,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: LZ4 compression support in the server and storage engines
+ The various MariaDB storage engines, such as InnoDB, RocksDB, Mroonga,
+ can use different compression libraries.
+ .
+ Plugin provides LZ4 (http://lz4.github.io/lz4/) compression
+ .
+ Note that these affect InnoDB and Mroonga only;
+ RocksDB still uses the compression algorithms from its own library
+
+Package: mariadb-plugin-provider-lzma
+Architecture: any
+Depends: mariadb-server-10.7,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: LZMA compression support in the server and storage engines
+ The various MariaDB storage engines, such as InnoDB, RocksDB, Mroonga,
+ can use different compression libraries.
+ .
+ Plugin provides LZMA (https://tukaani.org/lzma/) compression
+ .
+ Note that these affect InnoDB and Mroonga only;
+ RocksDB still uses the compression algorithms from its own library
+
+Package: mariadb-plugin-provider-lzo
+Architecture: any
+Depends: mariadb-server-10.7,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: LZO compression support in the server and storage engines
+ The various MariaDB storage engines, such as InnoDB, RocksDB, Mroonga,
+ can use different compression libraries.
+ .
+ Plugin provides LZO (http://www.oberhumer.com/opensource/lzo/) compression
+ .
+ Note that these affect InnoDB and Mroonga only;
+ RocksDB still uses the compression algorithms from its own library
+
+Package: mariadb-plugin-provider-snappy
+Architecture: any
+Depends: mariadb-server-10.7,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: Snappy compression support in the server and storage engines
+ The various MariaDB storage engines, such as InnoDB, RocksDB, Mroonga,
+ can use different compression libraries.
+ .
+ Plugin provides Snappy (https://github.com/google/snappy) compression
+ .
+ Note that these affect InnoDB and Mroonga only;
+ RocksDB still uses the compression algorithms from its own library
+
 Package: mariadb-test
 Architecture: any
-Depends: mariadb-client-10.6 (= ${binary:Version}),
-         mariadb-server-10.6 (= ${server:Version}),
+Depends: mariadb-client-10.7 (= ${binary:Version}),
+         mariadb-server-10.7 (= ${server:Version}),
          mariadb-test-data (= ${source:Version}),
          virtual-mysql-testsuite,
          ${misc:Depends},
diff --git a/debian/mariadb-client-10.6.README.Debian b/debian/mariadb-client-10.7.README.Debian
index 64f0f509951..64f0f509951 100644
--- a/debian/mariadb-client-10.6.README.Debian
+++ b/debian/mariadb-client-10.7.README.Debian
diff --git a/debian/mariadb-client-10.6.docs b/debian/mariadb-client-10.7.docs
index c09092629c3..c09092629c3 100644
--- a/debian/mariadb-client-10.6.docs
+++ b/debian/mariadb-client-10.7.docs
diff --git a/debian/mariadb-client-10.6.install b/debian/mariadb-client-10.7.install
index 3a92ded15b6..3a92ded15b6 100644
--- a/debian/mariadb-client-10.6.install
+++ b/debian/mariadb-client-10.7.install
diff --git a/debian/mariadb-client-10.6.links b/debian/mariadb-client-10.7.links
index bc42197629b..bc42197629b 100644
--- a/debian/mariadb-client-10.6.links
+++ b/debian/mariadb-client-10.7.links
diff --git a/debian/mariadb-client-10.6.manpages b/debian/mariadb-client-10.7.manpages
index 8735caeea8b..8735caeea8b 100644
--- a/debian/mariadb-client-10.6.manpages
+++ b/debian/mariadb-client-10.7.manpages
diff --git a/debian/mariadb-client-10.6.menu b/debian/mariadb-client-10.7.menu
index 90280215b8b..edd489cf316 100644
--- a/debian/mariadb-client-10.6.menu
+++ b/debian/mariadb-client-10.7.menu
@@ -1,3 +1,3 @@
 # According to /usr/share/menu/ policy 1.4, not /usr/share/doc/debian-policy/
-?package(mariadb-client-10.6):needs="text" section="Applications/Data Management"\
+?package(mariadb-client-10.7):needs="text" section="Applications/Data Management"\
   title="Innotop" command="/usr/bin/innotop"
diff --git a/debian/mariadb-client-core-10.6.install b/debian/mariadb-client-core-10.7.install
index 421b62d2a1a..421b62d2a1a 100644
--- a/debian/mariadb-client-core-10.6.install
+++ b/debian/mariadb-client-core-10.7.install
diff --git a/debian/mariadb-client-core-10.6.links b/debian/mariadb-client-core-10.7.links
index 5134dd814b5..5134dd814b5 100644
--- a/debian/mariadb-client-core-10.6.links
+++ b/debian/mariadb-client-core-10.7.links
diff --git a/debian/mariadb-plugin-provider-bzip2.install b/debian/mariadb-plugin-provider-bzip2.install
new file mode 100644
index 00000000000..75a73c384a7
--- /dev/null
+++ b/debian/mariadb-plugin-provider-bzip2.install
@@ -0,0 +1,2 @@
+etc/mysql/mariadb.conf.d/provider_bzip2.cnf
+usr/lib/mysql/plugin/provider_bzip2.so
diff --git a/debian/mariadb-plugin-provider-bzip2.lintian-overrides b/debian/mariadb-plugin-provider-bzip2.lintian-overrides
new file mode 100644
index 00000000000..563c05a3a6b
--- /dev/null
+++ b/debian/mariadb-plugin-provider-bzip2.lintian-overrides
@@ -0,0 +1,3 @@
+# It's intentional that bzip2 compression plugin doesn't have symbols from libc
+# More info https://jira.mariadb.org/browse/MDEV-28120
+library-not-linked-against-libc usr/lib/mysql/plugin/provider_bzip2.so
\ No newline at end of file
diff --git a/debian/mariadb-plugin-provider-lz4.install b/debian/mariadb-plugin-provider-lz4.install
new file mode 100644
index 00000000000..a3ba1d77bb3
--- /dev/null
+++ b/debian/mariadb-plugin-provider-lz4.install
@@ -0,0 +1,2 @@
+etc/mysql/mariadb.conf.d/provider_lz4.cnf
+usr/lib/mysql/plugin/provider_lz4.so
diff --git a/debian/mariadb-plugin-provider-lz4.lintian-overrides b/debian/mariadb-plugin-provider-lz4.lintian-overrides
new file mode 100644
index 00000000000..3f7d7e9ecfb
--- /dev/null
+++ b/debian/mariadb-plugin-provider-lz4.lintian-overrides
@@ -0,0 +1,3 @@
+# It's intentional that LZ4 compression plugin doesn't have symbols from libc
+# More info https://jira.mariadb.org/browse/MDEV-28120
+library-not-linked-against-libc usr/lib/mysql/plugin/provider_lz4.so
\ No newline at end of file
diff --git a/debian/mariadb-plugin-provider-lzma.install b/debian/mariadb-plugin-provider-lzma.install
new file mode 100644
index 00000000000..4a4138b45c6
--- /dev/null
+++ b/debian/mariadb-plugin-provider-lzma.install
@@ -0,0 +1,2 @@
+etc/mysql/mariadb.conf.d/provider_lzma.cnf
+usr/lib/mysql/plugin/provider_lzma.so
diff --git a/debian/mariadb-plugin-provider-lzma.lintian-overrides b/debian/mariadb-plugin-provider-lzma.lintian-overrides
new file mode 100644
index 00000000000..94eafa766a4
--- /dev/null
+++ b/debian/mariadb-plugin-provider-lzma.lintian-overrides
@@ -0,0 +1,3 @@
+# It's intentional that LZMA compression plugin doesn't have symbols from libc
+# More info https://jira.mariadb.org/browse/MDEV-28120
+library-not-linked-against-libc usr/lib/mysql/plugin/provider_lzma.so
\ No newline at end of file
diff --git a/debian/mariadb-plugin-provider-lzo.install b/debian/mariadb-plugin-provider-lzo.install
new file mode 100644
index 00000000000..2bf4c091ddc
--- /dev/null
+++ b/debian/mariadb-plugin-provider-lzo.install
@@ -0,0 +1,2 @@
+etc/mysql/mariadb.conf.d/provider_lzo.cnf
+usr/lib/mysql/plugin/provider_lzo.so
diff --git a/debian/mariadb-plugin-provider-lzo.lintian-overrides b/debian/mariadb-plugin-provider-lzo.lintian-overrides
new file mode 100644
index 00000000000..8184923cf9a
--- /dev/null
+++ b/debian/mariadb-plugin-provider-lzo.lintian-overrides
@@ -0,0 +1,3 @@
+# It's intentional that LZO compression plugin doesn't have symbols from libc
+# More info https://jira.mariadb.org/browse/MDEV-28120
+library-not-linked-against-libc usr/lib/mysql/plugin/provider_lzo.so
\ No newline at end of file
diff --git a/debian/mariadb-plugin-provider-snappy.install b/debian/mariadb-plugin-provider-snappy.install
new file mode 100644
index 00000000000..26c929c89ba
--- /dev/null
+++ b/debian/mariadb-plugin-provider-snappy.install
@@ -0,0 +1,2 @@
+etc/mysql/mariadb.conf.d/provider_snappy.cnf
+usr/lib/mysql/plugin/provider_snappy.so
diff --git a/debian/mariadb-plugin-provider-snappy.lintian-overrides b/debian/mariadb-plugin-provider-snappy.lintian-overrides
new file mode 100644
index 00000000000..6c76162573d
--- /dev/null
+++ b/debian/mariadb-plugin-provider-snappy.lintian-overrides
@@ -0,0 +1,3 @@
+# It's intentional that Snappy compression plugin doesn't have symbols from libc
+# More info https://jira.mariadb.org/browse/MDEV-28120
+library-not-linked-against-libc usr/lib/mysql/plugin/provider_snappy.so
\ No newline at end of file
diff --git a/debian/mariadb-server-10.6.README.Debian b/debian/mariadb-server-10.7.README.Debian
index 6042249a706..6042249a706 100644
--- a/debian/mariadb-server-10.6.README.Debian
+++ b/debian/mariadb-server-10.7.README.Debian
diff --git a/debian/mariadb-server-10.6.config b/debian/mariadb-server-10.7.config
index 27e2e9f4929..f47b147ee62 100644
--- a/debian/mariadb-server-10.6.config
+++ b/debian/mariadb-server-10.7.config
@@ -9,6 +9,6 @@ ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
 
 # Beware that there are two ypwhich one of them needs the 2>/dev/null!
 if test -n "`which ypwhich 2>/dev/null`"  &&  ypwhich >/dev/null 2>&1; then
-  db_input high mariadb-server-10.6/nis_warning || true
+  db_input high mariadb-server-10.7/nis_warning || true
   db_go
 fi
diff --git a/debian/mariadb-server-10.6.dirs b/debian/mariadb-server-10.7.dirs
index 5057fe806c3..5057fe806c3 100644
--- a/debian/mariadb-server-10.6.dirs
+++ b/debian/mariadb-server-10.7.dirs
diff --git a/debian/mariadb-server-10.6.install b/debian/mariadb-server-10.7.install
index 4d15f5d8e54..ea17c087953 100644
--- a/debian/mariadb-server-10.6.install
+++ b/debian/mariadb-server-10.7.install
@@ -3,7 +3,7 @@ debian/additions/debian-start.inc.sh usr/share/mysql
 debian/additions/echo_stderr usr/share/mysql
 debian/additions/mariadb.conf.d/50-mysqld_safe.cnf etc/mysql/mariadb.conf.d
 debian/additions/mariadb.conf.d/50-server.cnf etc/mysql/mariadb.conf.d
-debian/additions/source_mariadb-10.6.py usr/share/apport/package-hooks
+debian/additions/source_mariadb-10.7.py usr/share/apport/package-hooks
 etc/apparmor.d/usr.sbin.mariadbd
 etc/security/user_map.conf
 lib/*/security/pam_user_map.so
@@ -45,6 +45,7 @@ usr/lib/mysql/plugin/ha_sphinx.so
 usr/lib/mysql/plugin/handlersocket.so
 usr/lib/mysql/plugin/locales.so
 usr/lib/mysql/plugin/metadata_lock_info.so
+usr/lib/mysql/plugin/password_reuse_check.so
 usr/lib/mysql/plugin/query_cache_info.so
 usr/lib/mysql/plugin/query_response_time.so
 usr/lib/mysql/plugin/server_audit.so
@@ -52,7 +53,7 @@ usr/lib/mysql/plugin/simple_password_check.so
 usr/lib/mysql/plugin/sql_errlog.so
 usr/lib/mysql/plugin/type_mysql_json.so
 usr/lib/mysql/plugin/wsrep_info.so
-usr/share/doc/mariadb-server-10.6/mariadbd.sym.gz
+usr/share/doc/mariadb-server-10.7/mariadbd.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.6.links b/debian/mariadb-server-10.7.links
index 9cc3a436ba8..9cc3a436ba8 100644
--- a/debian/mariadb-server-10.6.links
+++ b/debian/mariadb-server-10.7.links
diff --git a/debian/mariadb-server-10.6.logcheck.ignore.paranoid b/debian/mariadb-server-10.7.logcheck.ignore.paranoid
index 407d4063270..407d4063270 100644
--- a/debian/mariadb-server-10.6.logcheck.ignore.paranoid
+++ b/debian/mariadb-server-10.7.logcheck.ignore.paranoid
diff --git a/debian/mariadb-server-10.6.logcheck.ignore.server b/debian/mariadb-server-10.7.logcheck.ignore.server
index a64fc54e15c..a64fc54e15c 100644
--- a/debian/mariadb-server-10.6.logcheck.ignore.server
+++ b/debian/mariadb-server-10.7.logcheck.ignore.server
diff --git a/debian/mariadb-server-10.6.logcheck.ignore.workstation b/debian/mariadb-server-10.7.logcheck.ignore.workstation
index a64fc54e15c..a64fc54e15c 100644
--- a/debian/mariadb-server-10.6.logcheck.ignore.workstation
+++ b/debian/mariadb-server-10.7.logcheck.ignore.workstation
diff --git a/debian/mariadb-server-10.6.mariadb.init b/debian/mariadb-server-10.7.mariadb.init
index b92282dedce..5cad48b9a9f 100644
--- a/debian/mariadb-server-10.6.mariadb.init
+++ b/debian/mariadb-server-10.7.mariadb.init
@@ -174,7 +174,7 @@ case "${1:-''}" in
 
   if ! mariadbd_status check_dead warn; then
     log_end_msg 1
-    log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-10.6/README.Debian.gz!"
+    log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-10.7/README.Debian.gz!"
     exit -1
   else
     log_end_msg 0
diff --git a/debian/mariadb-server-10.6.mysql-server.logrotate b/debian/mariadb-server-10.7.mysql-server.logrotate
index 11e4480c427..11e4480c427 100644
--- a/debian/mariadb-server-10.6.mysql-server.logrotate
+++ b/debian/mariadb-server-10.7.mysql-server.logrotate
diff --git a/debian/mariadb-server-10.6.mysql.default b/debian/mariadb-server-10.7.mysql.default
index 36079edecb2..36079edecb2 100644
--- a/debian/mariadb-server-10.6.mysql.default
+++ b/debian/mariadb-server-10.7.mysql.default
diff --git a/debian/mariadb-server-10.6.postinst b/debian/mariadb-server-10.7.postinst
index 93a1e4e8b87..93a1e4e8b87 100644
--- a/debian/mariadb-server-10.6.postinst
+++ b/debian/mariadb-server-10.7.postinst
diff --git a/debian/mariadb-server-10.6.postrm b/debian/mariadb-server-10.7.postrm
index 94ce91db31d..94ce91db31d 100644
--- a/debian/mariadb-server-10.6.postrm
+++ b/debian/mariadb-server-10.7.postrm
diff --git a/debian/mariadb-server-10.6.preinst b/debian/mariadb-server-10.7.preinst
index 79c6ccc8500..79c6ccc8500 100644
--- a/debian/mariadb-server-10.6.preinst
+++ b/debian/mariadb-server-10.7.preinst
diff --git a/debian/mariadb-server-10.6.prerm b/debian/mariadb-server-10.7.prerm
index 8fd172da9d2..8fd172da9d2 100644
--- a/debian/mariadb-server-10.6.prerm
+++ b/debian/mariadb-server-10.7.prerm
diff --git a/debian/mariadb-server-10.6.templates b/debian/mariadb-server-10.7.templates
index 32e908c71e9..916baf0d483 100644
--- a/debian/mariadb-server-10.6.templates
+++ b/debian/mariadb-server-10.7.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.6/old_data_directory_saved
+Template: mariadb-server-10.7/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.6/nis_warning
+Template: mariadb-server-10.7/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.6/postrm_remove_databases
+Template: mariadb-server-10.7/postrm_remove_databases
 Type: boolean
 Default: false
 _Description: Remove all MariaDB databases?
diff --git a/debian/mariadb-server-10.6.triggers b/debian/mariadb-server-10.7.triggers
index d1f5f5e14f1..d1f5f5e14f1 100644
--- a/debian/mariadb-server-10.6.triggers
+++ b/debian/mariadb-server-10.7.triggers
diff --git a/debian/mariadb-server-core-10.6.install b/debian/mariadb-server-core-10.7.install
index def95268512..def95268512 100644
--- a/debian/mariadb-server-core-10.6.install
+++ b/debian/mariadb-server-core-10.7.install
diff --git a/debian/mariadb-server-core-10.6.links b/debian/mariadb-server-core-10.7.links
index c2be98f38fb..c2be98f38fb 100644
--- a/debian/mariadb-server-core-10.6.links
+++ b/debian/mariadb-server-core-10.7.links
diff --git a/debian/not-installed b/debian/not-installed
index 6924c9ad1a5..ff05d1827ef 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -16,15 +16,15 @@ usr/lib/*/libdbbc.a # ColumnStore header file
 usr/lib/*/libidbboot.a # ColumnStore header file
 usr/lib/*/libprocessor.a # ColumnStore header file
 usr/lib/*/libwe_xml.a # ColumnStore header file
-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/doc/mariadb-server-10.7/COPYING
+usr/share/doc/mariadb-server-10.7/COPYING.AGPLv3
+usr/share/doc/mariadb-server-10.7/COPYING.GPLv2
+usr/share/doc/mariadb-server-10.7/COPYING.thirdparty
+usr/share/doc/mariadb-server-10.7/CREDITS
+usr/share/doc/mariadb-server-10.7/EXCEPTIONS-CLIENT
+usr/share/doc/mariadb-server-10.7/INSTALL-BINARY
+usr/share/doc/mariadb-server-10.7/PATENTS
+usr/share/doc/mariadb-server-10.7/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 17bbe40ee92..d96402785cc 100644
--- a/debian/po/POTFILES.in
+++ b/debian/po/POTFILES.in
@@ -1 +1 @@
-[type: gettext/rfc822deb] mariadb-server-10.6.templates
+[type: gettext/rfc822deb] mariadb-server-10.7.templates
diff --git a/debian/po/ar.po b/debian/po/ar.po
index 8512209efbb..b4a2ff0aab3 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.6@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.7@packages.debian.org\n"
 "POT-Creation-Date: 2019-07-23 19:16-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.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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.6.templates:2001
+#: ../mariadb-server-10.7.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.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "ملاحظة هامة لمستخدمي NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.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.6.templates:3001
+#: ../mariadb-server-10.7.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.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "إزالة جميع قواعد بيانات MariaDB؟"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.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.6.templates:4001
+#: ../mariadb-server-10.7.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, "
diff --git a/debian/po/ca.po b/debian/po/ca.po
index d9c69e19983..8796ca196a8 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -1,12 +1,12 @@
 # mariadb (debconf) translation to Catalan.
-# his file is distributed under the same license as the mariadb-10.6 package.
+# his file is distributed under the same license as the mariadb-10.7 package.
 # Aleix Badia i Bosch <abadia@ica.es> 2004
 # Innocent De Marchi <tangram.peces@gmail.com> 2017
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mariadb-10.6\n"
-"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
+"Project-Id-Version: mariadb-10.7\n"
+"Report-Msgid-Bugs-To: mariadb-10.7@packages.debian.org\n"
 "POT-Creation-Date: 2019-07-23 19:16-0300\n"
 "PO-Revision-Date: 2017-03-20 17:55+0100\n"
 "Last-Translator: Innocent De Marchi <tangram.peces@gmail.com>\n"
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr "El directori de dades antigues es desarà a una nova localització"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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.6.templates:2001
+#: ../mariadb-server-10.7.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."
@@ -47,7 +47,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
@@ -56,13 +56,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Nota important pels usuaris de «NIS/YP»"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -72,7 +72,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -82,13 +82,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Eliminar totes les bases de dades MariaDB?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -98,7 +98,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.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, "
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 8176d86457b..573fc645663 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -13,8 +13,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mariadb-10.6\n"
-"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
+"Project-Id-Version: mariadb-10.7\n"
+"Report-Msgid-Bugs-To: mariadb-10.7@packages.debian.org\n"
 "POT-Creation-Date: 2019-07-23 19:16-0300\n"
 "PO-Revision-Date: 2020-10-18 17:13+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
@@ -26,13 +26,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr "Starý adresář s daty bude uložen na novém místě."
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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.6.templates:2001
+#: ../mariadb-server-10.7.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."
@@ -54,7 +54,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
@@ -63,13 +63,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.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.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -79,7 +79,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -88,13 +88,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Odstranit všechny MariaDB databáze?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -104,7 +104,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.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, "
diff --git a/debian/po/da.po b/debian/po/da.po
index 4de2e4e7057..aa45b277904 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -1,13 +1,13 @@
-# Danish translation mariadb-10.6.
-# Copyright (C) 2014 mariadb-10.6 og nedenstående oversættere.
-# This file is distributed under the same license as the mariadb-10.6 package.
+# Danish translation mariadb-10.7.
+# Copyright (C) 2014 mariadb-10.7 og nedenstående oversættere.
+# This file is distributed under the same license as the mariadb-10.7 package.
 # Claus Hindsgaul <claus.hindsgaul@gmail.com>, 2005, 2006, 2007.
 # Joe Hansen <joedalton2@yahoo.dk>, 2014, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mariadb-10.6\n"
-"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
+"Project-Id-Version: mariadb-10.7\n"
+"Report-Msgid-Bugs-To: mariadb-10.7@packages.debian.org\n"
 "POT-Creation-Date: 2019-07-23 19:16-0300\n"
 "PO-Revision-Date: 2016-07-09 22:41+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr "Den gamle datamappe vil blive gemt på en ny placering"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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.6.templates:2001
+#: ../mariadb-server-10.7.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."
@@ -47,7 +47,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
@@ -56,13 +56,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Vigtig oplysning til NIS/YP-brugere"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -72,7 +72,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -82,13 +82,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Fjern alle MariaDB-databaser?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -98,7 +98,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.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, "
diff --git a/debian/po/de.po b/debian/po/de.po
index 2228a07e27d..fdbd3f2986a 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -1,4 +1,4 @@
-# German translation of mariadb-10.6 10.0.13-1
+# German translation of mariadb-10.7 10.0.13-1
 # Alwin Meschede <ameschede@gmx.de>, 2006, 2007.
 # Thomas Mueller <thomas.mueller@tmit.eu>, 2009.
 # Chris Leick <c.leick@vollbio.de>, 2014-2016.
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mariadb 10.0.25-1\n"
-"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.7@packages.debian.org\n"
 "POT-Creation-Date: 2019-07-23 19:16-0300\n"
 "PO-Revision-Date: 2016-05-12 22:39+0100\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr "Das alte Datenverzeichnis wird an einer neuen Stelle gespeichert"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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.6.templates:2001
+#: ../mariadb-server-10.7.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."
@@ -47,7 +47,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
@@ -56,13 +56,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Wichtige Anmerkung für NIS/YP-Benutzer!"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -72,7 +72,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -82,13 +82,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Alle MariaDB-Datenbanken entfernen?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -98,7 +98,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.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, "
diff --git a/debian/po/es.po b/debian/po/es.po
index db5a8bbf7a6..82f1a8ed576 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.6@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.7@packages.debian.org\n"
 "POT-Creation-Date: 2019-07-23 19:16-0300\n"
 "PO-Revision-Date: 2016-04-30 21:26+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
@@ -54,13 +54,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr "Se guardará el directorio antiguo de datos a la nueva ubicación"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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 "
@@ -72,7 +72,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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."
@@ -82,7 +82,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
@@ -91,13 +91,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Nota importante para los usuarios de NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -107,7 +107,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -117,13 +117,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "¿Desea eliminar todas las bases de datos MariaDB?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -133,7 +133,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.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, "
diff --git a/debian/po/eu.po b/debian/po/eu.po
index 191d92b615e..67e07070a3d 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.6@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.7@packages.debian.org\n"
 "POT-Creation-Date: 2019-07-23 19:16-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.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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.6.templates:2001
+#: ../mariadb-server-10.7.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.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "NIS/YP erabiltzaileentzat ohar garrantzitsua"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.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.6.templates:3001
+#: ../mariadb-server-10.7.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.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Ezabatu MariaDB datubase guztiak?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.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.6.templates:4001
+#: ../mariadb-server-10.7.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, "
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 16e310b8c6a..b787b265ea3 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -1,11 +1,11 @@
-# Finnish translations for mariadb-10.6 package
-# This file is distributed under the same license as the mariadb-10.6 package.
+# Finnish translations for mariadb-10.7 package
+# This file is distributed under the same license as the mariadb-10.7 package.
 # Antti Järvinen <antti.jarvinen@katiska.org>, 2017.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mariadb-10.6\n"
-"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
+"Project-Id-Version: mariadb-10.7\n"
+"Report-Msgid-Bugs-To: mariadb-10.7@packages.debian.org\n"
 "POT-Creation-Date: 2019-07-23 19:16-0300\n"
 "PO-Revision-Date: 2017-03-15 22:36+0200\n"
 "Last-Translator: antti.jarvinen@katiska.org\n"
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr "Vanha datahakemisto tullaan tallentamaan uuteen paikkaan"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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.6.templates:2001
+#: ../mariadb-server-10.7.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."
@@ -47,7 +47,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
@@ -56,13 +56,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Merkittävä huomio NIS/YP -käyttäjille"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -72,7 +72,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -80,13 +80,13 @@ msgstr "Tarkista myös hakemiston /var/lib/mysql omistaja ja oikeudet:"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Poistetaanko kaikki MariaDB-tietokannat?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -95,7 +95,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.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, "
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 1604203696b..ade489bae0f 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -1,6 +1,6 @@
-# Translation of mariadb-10.6 debconf templates to French
+# Translation of mariadb-10.7 debconf templates to French
 # Copyright (C) 2004-2016 Debian French l10n team <debian-l10n-french@lists.debian.org>
-# This file is distributed under the same license as the mariadb-10.6 packages.
+# This file is distributed under the same license as the mariadb-10.7 packages.
 #
 # Translators:
 # Christian Perrier <bubulle@debian.org>, 2004, 2006, 2007, 2009, 2013.
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
-"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.7@packages.debian.org\n"
 "POT-Creation-Date: 2019-07-23 19:16-0300\n"
 "PO-Revision-Date: 2016-12-31 18:35+0100\n"
 "Last-Translator: Baptiste Jammet <baptiste@mailoo.org>\n"
@@ -23,13 +23,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr "L'ancien répertoire de données sera sauvegardé à un nouvel emplacement"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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.6.templates:2001
+#: ../mariadb-server-10.7.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."
@@ -51,7 +51,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
@@ -60,13 +60,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Note importante pour les utilisateurs NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -76,7 +76,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.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.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Faut-il supprimer toutes les bases de données MariaDB ?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -102,7 +102,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.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, "
diff --git a/debian/po/gl.po b/debian/po/gl.po
index d84a745a732..a18097f76cd 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.6@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.7@packages.debian.org\n"
 "POT-Creation-Date: 2019-07-23 19:16-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.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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.6.templates:2001
+#: ../mariadb-server-10.7.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.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Nota importante para os usuarios de NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.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.6.templates:3001
+#: ../mariadb-server-10.7.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.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "¿Eliminar tódalas bases de datos de MariaDB?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.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.6.templates:4001
+#: ../mariadb-server-10.7.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, "
diff --git a/debian/po/it.po b/debian/po/it.po
index 54b9e980b1c..eeef6960313 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -1,11 +1,11 @@
-# Italian (it) translation of debconf templates for mariadb-10.6
-# This file is distributed under the same license as the mariadb-10.6 package.
+# Italian (it) translation of debconf templates for mariadb-10.7
+# This file is distributed under the same license as the mariadb-10.7 package.
 # Luca Monducci <luca.mo@tiscali.it>, 2006-2017.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mariadb-10.6 10.0.13 Italian debconf templates\n"
-"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
+"Project-Id-Version: mariadb-10.7 10.0.13 Italian debconf templates\n"
+"Report-Msgid-Bugs-To: mariadb-10.7@packages.debian.org\n"
 "POT-Creation-Date: 2019-07-23 19:16-0300\n"
 "PO-Revision-Date: 2017-083-20 20:29+0100\n"
 "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
@@ -17,13 +17,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr "La vecchia directory data verrà salvata in una nuova posizione"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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.6.templates:2001
+#: ../mariadb-server-10.7.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,7 +45,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
@@ -54,13 +54,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Nota importante per gli utenti NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.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.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -80,13 +80,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Eliminare tutti i database MariaDB?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -96,7 +96,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.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, "
diff --git a/debian/po/ja.po b/debian/po/ja.po
index c7a3bea42ce..a2a8583843c 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -15,8 +15,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mariadb-10.6 10.0.32-1\n"
-"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
+"Project-Id-Version: mariadb-10.7 10.0.32-1\n"
+"Report-Msgid-Bugs-To: mariadb-10.7@packages.debian.org\n"
 "POT-Creation-Date: 2019-07-23 19:16-0300\n"
 "PO-Revision-Date: 2016-05-01 11:27+0900\n"
 "Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n"
@@ -30,13 +30,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr "古いデータディレクトリは、新しい場所に保存されます"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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 "
@@ -48,7 +48,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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."
@@ -58,7 +58,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
@@ -67,13 +67,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "NIS/YP ユーザへの重要な注意"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -83,7 +83,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -91,13 +91,13 @@ msgstr "/var/lib/mysql の所有者権限をチェックする必要もありま
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "すべての MariaDB データベースを削除しますか?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -107,7 +107,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.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, "
diff --git a/debian/po/nb.po b/debian/po/nb.po
index b11a70c3a0e..a3a9e069486 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.6@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.7@packages.debian.org\n"
 "POT-Creation-Date: 2019-07-23 19:16-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.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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.6.templates:2001
+#: ../mariadb-server-10.7.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.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.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.6.templates:3001
+#: ../mariadb-server-10.7.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.6.templates:3001
+#: ../mariadb-server-10.7.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.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.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.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 #, fuzzy
 #| msgid ""
 #| "The script is about to remove the data directory /var/lib/mysql. If it is "
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 90e6ea767bb..00ab55777c6 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -1,13 +1,13 @@
 # Dutch mariadb-10 po-debconf translation,
 # Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the mariadb-10.6 package.
+# This file is distributed under the same license as the mariadb-10.7 package.
 # Vincent Zweije <zweije@xs4all.nl>, 2006.
 # Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2014, 2016, 2018.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mariadb-10.2.7-1\n"
-"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.7@packages.debian.org\n"
 "POT-Creation-Date: 2019-07-23 19:16-0300\n"
 "PO-Revision-Date: 2018-03-29 21:25+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
@@ -21,13 +21,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr "De oude data-map zal op een nieuwe locatie bewaard worden"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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 "
@@ -39,7 +39,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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,7 +49,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
@@ -58,13 +58,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Belangrijke opmerking voor gebruikers van NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -74,7 +74,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -84,13 +84,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Wilt u alle MariaDB-databases verwijderen?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -100,7 +100,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.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, "
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 4df8e3540a8..8c7823c8edf 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -6,8 +6,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mariadb-10.6\n"
-"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
+"Project-Id-Version: mariadb-10.7\n"
+"Report-Msgid-Bugs-To: mariadb-10.7@packages.debian.org\n"
 "POT-Creation-Date: 2019-07-23 19:16-0300\n"
 "PO-Revision-Date: 2017-08-06 10:00+0100\n"
 "Last-Translator: Rui Branco <ruipb@debianpt.org>\n"
@@ -20,13 +20,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr "O antigo directório de data será guardado num novo local"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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 "
@@ -38,7 +38,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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."
@@ -48,7 +48,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
@@ -57,13 +57,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Nota importante para os utilizadores de NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.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.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -82,13 +82,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Remover todas as bases de dados MariaDB?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -98,7 +98,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.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, "
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index cf8127236e5..d0a4c6db8fe 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -1,12 +1,12 @@
-# Debconf translations for mariadb-10.6.
-# This file is distributed under the same license as the mariadb-10.6 package.
+# Debconf translations for mariadb-10.7.
+# This file is distributed under the same license as the mariadb-10.7 package.
 # André Luís Lopes, <andrelop@debian.org>, 2005-2007.
 # Adriano Rafael Gomes <adrianorg@arg.eti.br>, 2015-2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mariadb-10.6\n"
-"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
+"Project-Id-Version: mariadb-10.7\n"
+"Report-Msgid-Bugs-To: mariadb-10.7@packages.debian.org\n"
 "POT-Creation-Date: 2019-07-23 19:16-0300\n"
 "PO-Revision-Date: 2016-04-30 16:16-0300\n"
 "Last-Translator: Adriano Rafael Gomes <adrianorg@arg.eti.br>\n"
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr "O diretório de dados antigo será salvo em novo local"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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.6.templates:2001
+#: ../mariadb-server-10.7.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."
@@ -47,7 +47,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
@@ -56,13 +56,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Aviso importante para usuários NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -72,7 +72,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -82,13 +82,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Remover todas as bases de dados do MariaDB?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -98,7 +98,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.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, "
diff --git a/debian/po/ro.po b/debian/po/ro.po
index 869a5efddd2..6fda31dc508 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.6@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.7@packages.debian.org\n"
 "POT-Creation-Date: 2019-07-23 19:16-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.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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.6.templates:2001
+#: ../mariadb-server-10.7.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.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.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.6.templates:3001
+#: ../mariadb-server-10.7.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.6.templates:3001
+#: ../mariadb-server-10.7.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.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.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.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 #, fuzzy
 #| msgid ""
 #| "The script is about to remove the data directory /var/lib/mysql. If it is "
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 01152031369..ecdc8e658f7 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -6,8 +6,8 @@
 # Yuri Kozlov <yuray@komyakino.ru>, 2009, 2014, 2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: mariadb-10.6 10.0.25-1\n"
-"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
+"Project-Id-Version: mariadb-10.7 10.0.25-1\n"
+"Report-Msgid-Bugs-To: mariadb-10.7@packages.debian.org\n"
 "POT-Creation-Date: 2019-07-23 19:16-0300\n"
 "PO-Revision-Date: 2016-05-04 18:56+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
@@ -22,13 +22,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr "Каталог со старыми данными будет сохранён в новом месте"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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 "
@@ -40,7 +40,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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."
@@ -51,7 +51,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
@@ -60,13 +60,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Важное замечание для пользователей NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -76,7 +76,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -84,13 +84,13 @@ msgstr "Также проверьте права доступа и владел�
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Удалить все базы данных MariaDB?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.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.6.templates:4001
+#: ../mariadb-server-10.7.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, "
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 0c44b9923df..4ac8f477339 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -1,13 +1,13 @@
-# Translation of mariadb-10.6 debconf template to Swedish
+# Translation of mariadb-10.7 debconf template to Swedish
 # Copyright (C) 2017 Martin Bagge <brother@bsnet.se>
-# This file is distributed under the same license as the mariadb-10.6 package.
+# This file is distributed under the same license as the mariadb-10.7 package.
 #
 # Andreas Henriksson <andreas@fatal.se>, 2007
 # Martin Bagge <brother@bsnet.se>, 2009, 2015, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.0.21-3\n"
-"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
+"Report-Msgid-Bugs-To: mariadb-10.7@packages.debian.org\n"
 "POT-Creation-Date: 2019-07-23 19:16-0300\n"
 "PO-Revision-Date: 2017-03-23 09:20+0100\n"
 "Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n"
@@ -20,13 +20,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr "Den gamla data-katalogen kommer att sparas till en ny plats"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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 "
@@ -38,7 +38,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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."
@@ -48,7 +48,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
@@ -57,13 +57,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Viktig information för NIS/YP-användare"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.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.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -83,13 +83,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Ta bort alla MariaDB-databaser?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.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.6.templates:4001
+#: ../mariadb-server-10.7.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, "
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 73febcc0174..26d3231f0cd 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -1,13 +1,13 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the mariadb-10.6 package.
+# This file is distributed under the same license as the mariadb-10.7 package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: mariadb-10.6\n"
-"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
+"Project-Id-Version: mariadb-10.7\n"
+"Report-Msgid-Bugs-To: mariadb-10.7@packages.debian.org\n"
 "POT-Creation-Date: 2019-07-23 19:16-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.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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.6.templates:2001
+#: ../mariadb-server-10.7.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.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.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.6.templates:3001
+#: ../mariadb-server-10.7.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.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.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.6.templates:4001
+#: ../mariadb-server-10.7.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, "
diff --git a/debian/po/tr.po b/debian/po/tr.po
index 9d292dad46c..2df83c2b502 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mariadb-10.6\n"
-"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
+"Project-Id-Version: mariadb-10.7\n"
+"Report-Msgid-Bugs-To: mariadb-10.7@packages.debian.org\n"
 "POT-Creation-Date: 2019-07-23 19:16-0300\n"
 "PO-Revision-Date: 2017-03-16 13:16+0300\n"
 "Last-Translator: Atila KOÇ <koc@artielektronik.com.tr>\n"
@@ -20,13 +20,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr "Eski veritabanı dizini yeni konumuna kaydedilecektir"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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 "
@@ -38,7 +38,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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."
@@ -48,20 +48,20 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr "Gerektiğinde verinizi elle (ör. mysqldump ile) içe/dışa aktarın."
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "NIS/YP kullanıcıları için önemli not"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.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.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -81,13 +81,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Tüm MariaDB veritabanları kaldırılsın mı?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -96,7 +96,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.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, "
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 3aa7e3f3d25..6ff1185b81c 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -1,12 +1,12 @@
-# Vietnamese translations for mariadb-10.6 package
-# Bản dịch Tiếng Việt dành cho gói mariadb-10.6.
-# This file is distributed under the same license as the mariadb-10.6 package.
+# Vietnamese translations for mariadb-10.7 package
+# Bản dịch Tiếng Việt dành cho gói mariadb-10.7.
+# This file is distributed under the same license as the mariadb-10.7 package.
 # Trần Ngọc Quân <vnwildman@gmail.com>, 2017.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mariadb-10.6\n"
-"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
+"Project-Id-Version: mariadb-10.7\n"
+"Report-Msgid-Bugs-To: mariadb-10.7@packages.debian.org\n"
 "POT-Creation-Date: 2019-07-23 19:16-0300\n"
 "PO-Revision-Date: 2017-03-18 13:32+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
@@ -20,13 +20,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid "The old data directory will be saved at new location"
 msgstr "Thư mục dữ liệu cũ sẽ được lưu tại vị trí mới"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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 "
@@ -38,7 +38,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.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."
@@ -48,7 +48,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:2001
+#: ../mariadb-server-10.7.templates:2001
 msgid ""
 "Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
@@ -57,13 +57,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Chú ý quan trọng cho người dùng NIS/YP"
 
 #. Type: note
 #. Description
-#: ../mariadb-server-10.6.templates:3001
+#: ../mariadb-server-10.7.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.6.templates:3001
+#: ../mariadb-server-10.7.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -82,13 +82,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid "Remove all MariaDB databases?"
 msgstr "Xóa bỏ mọi cơ sở dữ liệu MariaDB chứ?"
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
@@ -98,7 +98,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../mariadb-server-10.6.templates:4001
+#: ../mariadb-server-10.7.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, "
diff --git a/debian/rules b/debian/rules
index 7dcc9a2ba3c..3e20af9f853 100755
--- a/debian/rules
+++ b/debian/rules
@@ -139,12 +139,12 @@ 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.6.mariadb.service
-	cp $(BUILDDIR)/support-files/mariadb.socket debian/mariadb-server-10.6.mariadb.socket
-	cp $(BUILDDIR)/support-files/mariadb-extra.socket debian/mariadb-server-10.6.mariadb-extra.socket
-	cp $(BUILDDIR)/support-files/mariadb@.service debian/mariadb-server-10.6.mariadb@.service
-	cp $(BUILDDIR)/support-files/mariadb@.socket debian/mariadb-server-10.6.mariadb@.socket
-	cp $(BUILDDIR)/support-files/mariadb-extra@.socket debian/mariadb-server-10.6.mariadb-extra@.socket
+	cp $(BUILDDIR)/support-files/mariadb.service debian/mariadb-server-10.7.mariadb.service
+	cp $(BUILDDIR)/support-files/mariadb.socket debian/mariadb-server-10.7.mariadb.socket
+	cp $(BUILDDIR)/support-files/mariadb-extra.socket debian/mariadb-server-10.7.mariadb-extra.socket
+	cp $(BUILDDIR)/support-files/mariadb@.service debian/mariadb-server-10.7.mariadb@.service
+	cp $(BUILDDIR)/support-files/mariadb@.socket debian/mariadb-server-10.7.mariadb@.socket
+	cp $(BUILDDIR)/support-files/mariadb-extra@.socket debian/mariadb-server-10.7.mariadb-extra@.socket
 endif
 
 	# Run 'make install' without output since it is uninteresting and
@@ -163,7 +163,7 @@ endif
 
 	# nm numeric soft is not enough, therefore extra sort in command
 	# to satisfy Debian reproducible build requirements
-	nm --defined-only $(BUILDDIR)/sql/mariadbd | LC_ALL=C sort | gzip -n -9 > $(TMP)/usr/share/doc/mariadb-server-10.6/mariadbd.sym.gz
+	nm --defined-only $(BUILDDIR)/sql/mariadbd | LC_ALL=C sort | gzip -n -9 > $(TMP)/usr/share/doc/mariadb-server-10.7/mariadbd.sym.gz
 
 	# Rename and install AppArmor profile
 	install -D -m 644 debian/apparmor-profile $(TMP)/etc/apparmor.d/usr.sbin.mariadbd
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
index 1efde56d70d..3e777b8432c 100644
--- a/debian/salsa-ci.yml
+++ b/debian/salsa-ci.yml
@@ -237,7 +237,7 @@ fresh install:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
 
-mariadb-10.6 Sid upgrade:
+mariadb-10.7 Sid upgrade:
   stage: upgrade in Sid
   needs:
     - job: build
@@ -258,7 +258,7 @@ mariadb-10.6 Sid upgrade:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
 
-mariadb-10.5 Bullseye to mariadb-10.6 upgrade:
+mariadb-10.5 Bullseye to mariadb-10.7 upgrade:
   stage: upgrade from Bullseye
   needs:
     - job: build
@@ -286,7 +286,7 @@ mariadb-10.5 Bullseye to mariadb-10.6 upgrade:
 
 # Upgrade of libcrypt.so.1 no longer possible from Buster to Sid,
 # so test upgrade only inside Buster (https://bugs.debian.org/993755)
-mariadb-10.3 to mariadb-10.6 upgrade in Buster:
+mariadb-10.3 to mariadb-10.7 upgrade in Buster:
   stage: upgrade extras
   needs:
     - job: build buster-backports
@@ -515,7 +515,7 @@ default-libmysqlclient-dev upgrade in Buster:
 
 # 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 Sid to mariadb-10.6 upgrade:
+mysql-8.0 Sid to mariadb-10.7 upgrade:
   stage: upgrade in Sid
   needs:
     - job: build
@@ -554,7 +554,7 @@ mysql-8.0 Sid to mariadb-10.6 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 Focal to mariadb-10.6 upgrade in Buster:
+mysql-8.0 Focal to mariadb-10.7 upgrade in Buster:
   stage: upgrade extras
   needs:
     - job: build buster-backports
@@ -587,7 +587,7 @@ mysql-8.0 Focal to mariadb-10.6 upgrade in Buster:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
 
-mariadb.org-10.6 to mariadb-10.6 upgrade:
+mariadb.org-10.6 to mariadb-10.7 upgrade:
   stage: upgrade extras
   needs:
     - job: build
@@ -622,7 +622,7 @@ mariadb.org-10.6 to mariadb-10.6 upgrade:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
 
-mariadb.org-10.5 to mariadb-10.6 upgrade:
+mariadb.org-10.5 to mariadb-10.7 upgrade:
   stage: upgrade extras
   needs:
     - job: build
@@ -652,7 +652,7 @@ mariadb.org-10.5 to mariadb-10.6 upgrade:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
 
-mariadb.org-10.4 to mariadb-10.6 upgrade:
+mariadb.org-10.4 to mariadb-10.7 upgrade:
   stage: upgrade extras
   needs:
     - job: build
@@ -685,7 +685,7 @@ mariadb.org-10.4 to mariadb-10.6 upgrade:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
 
-mariadb.org-10.3 to mariadb-10.6 upgrade:
+mariadb.org-10.3 to mariadb-10.7 upgrade:
   stage: upgrade extras
   needs:
     - job: build
@@ -716,7 +716,7 @@ mariadb.org-10.3 to mariadb-10.6 upgrade:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
 
-mariadb.org-10.2 to mariadb-10.6 upgrade:
+mariadb.org-10.2 to mariadb-10.7 upgrade:
   stage: upgrade extras
   needs:
     - job: build
@@ -755,7 +755,7 @@ mariadb.org-10.2 to mariadb-10.6 upgrade:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
 
-mysql.com-5.7 to mariadb-10.6 upgrade in Buster:
+mysql.com-5.7 to mariadb-10.7 upgrade in Buster:
   stage: upgrade extras
   needs:
     - job: build buster-backports
@@ -786,7 +786,7 @@ mysql.com-5.7 to mariadb-10.6 upgrade in Buster:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
 
-percona-xtradb-5.7 to mariadb-10.6 upgrade in Buster (MDEV-22679):
+percona-xtradb-5.7 to mariadb-10.7 upgrade in Buster (MDEV-22679):
   stage: upgrade extras
   needs:
     - job: build buster-backports
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 4a4671e0c9e..ac70670cf50 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,13 +1,13 @@
 # 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.6 -> mysql-client-5.5
-version-substvar-for-external-package mariadb-server-10.6 -> mysql-server
+version-substvar-for-external-package mariadb-client-core-10.7 -> mysql-client-5.5
+version-substvar-for-external-package mariadb-server-10.7 -> 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.6 -> mysql-client-5.*
-version-substvar-for-external-package mariadb-server-10.6 -> mysql-client-8.*
-version-substvar-for-external-package mariadb-client-10.6 -> mysql-client-core-5.*
-version-substvar-for-external-package mariadb-client-10.6 -> mysql-client-core-8.*
+version-substvar-for-external-package mariadb-server-10.7 -> mysql-client-5.*
+version-substvar-for-external-package mariadb-server-10.7 -> mysql-client-8.*
+version-substvar-for-external-package mariadb-client-10.7 -> mysql-client-core-5.*
+version-substvar-for-external-package mariadb-client-10.7 -> mysql-client-core-8.*
 version-substvar-for-external-package libmariadbd-dev -> libmariadbclient-dev
 # ColumnStore not used in Debian, safe to ignore. Reported upstream in https://jira.mariadb.org/browse/MDEV-24124
 source-is-missing storage/columnstore/columnstore/utils/jemalloc/libjemalloc.so.2
diff --git a/debian/tests/control b/debian/tests/control
index 68067071c6b..1aae1ecf5bd 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -3,7 +3,12 @@ Tests: smoke
 # for its existence (see the list in debian/control), install it if available
 # and check in the test if it's functional when it should be.
 # The plugin package also already depends on the other one.
-Depends: mariadb-plugin-rocksdb | mariadb-server-10.6
+Depends: mariadb-plugin-rocksdb | mariadb-server-10.7,
+         mariadb-plugin-provider-bzip2,
+         mariadb-plugin-provider-lz4,
+         mariadb-plugin-provider-lzma,
+         mariadb-plugin-provider-lzo,
+         mariadb-plugin-provider-snappy
 Restrictions: allow-stderr needs-root isolation-container
 
 Tests: upstream
diff --git a/debian/tests/smoke b/debian/tests/smoke
index e5d50496bdb..9838bb90081 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.6).
+# mariadb-server-10.7).
 #
 # This test should be declared in debian/tests/control with the
 # following restrictions:
@@ -38,6 +38,11 @@ else
   # If systemd (and systemctl) is available, but the service did not start, then
   # this smoke test is supposed to fail if next commands don't work.
   echo "Found systemctl, continuing smoke test.."
+  # Compression plugins are separated from main server package
+  # to own packages (for example LZ4 package mariadb-plugin-provider-lz4)
+  # and they are installed after mariadb-server.
+  # which means that they don't exist if MariaDB is not restarted
+  systemctl restart mariadb
 fi
 
 mysql <<EOT
@@ -71,10 +76,10 @@ EOT
 # but disabled  with '#' the options that are not available in this binary build
 mariadb <<EOT
 SET GLOBAL innodb_compression_algorithm=lz4;
-#SET GLOBAL innodb_compression_algorithm=lzo;
-#SET GLOBAL innodb_compression_algorithm=lzma;
-#SET GLOBAL innodb_compression_algorithm=bzip2;
-#SET GLOBAL innodb_compression_algorithm=snappy;
+SET GLOBAL innodb_compression_algorithm=lzo;
+SET GLOBAL innodb_compression_algorithm=lzma;
+SET GLOBAL innodb_compression_algorithm=bzip2;
+SET GLOBAL innodb_compression_algorithm=snappy;
 SET GLOBAL innodb_compression_algorithm=zlib;
 SET GLOBAL innodb_compression_algorithm=none;
 EOT
@@ -88,7 +93,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.6, which happens before that of the plugin.
+  #      mariadb-server-10.7, 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.