Merge pull request #251 from ottok/ok-debpkg-10.2

MDEV-6284 - Partially merge downstream Debian/Ubuntu packaging into upstream MariaDB
2026-01-06 05:22:24 +03:00 · 2016-11-01 13:39:09 +02:00
parent 71e11bce34 c912d05fab
commit 23cb94f04c
90 changed files with 2087 additions and 1877 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -435,12 +435,6 @@ CONFIGURE_FILE(
    ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in
    ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)

-IF(DEB)
-  CONFIGURE_FILE(
-    ${CMAKE_SOURCE_DIR}/debian/mariadb-server-10.2.files.in
-    ${CMAKE_SOURCE_DIR}/debian/mariadb-server-10.2.files)
-ENDIF(DEB)
-
 # Handle the "INFO_*" files.
 INCLUDE(${CMAKE_BINARY_DIR}/info_macros.cmake)
 # Source: This can be done during the cmake phase, all information is
--- a/cmake/systemd.cmake
+++ b/cmake/systemd.cmake
@@ -56,12 +56,6 @@ MACRO(CHECK_SYSTEMD)
         AND HAVE_SYSTEMD_SD_NOTIFY AND HAVE_SYSTEMD_SD_NOTIFYF)
        ADD_DEFINITIONS(-DHAVE_SYSTEMD)
        SET(SYSTEMD_SCRIPTS mariadb-service-convert galera_new_cluster galera_recovery)
-        SET(SYSTEMD_DEB_FILES "usr/bin/mariadb-service-convert
-                               usr/bin/galera_new_cluster
-                               usr/bin/galera_recovery
-                               ${INSTALL_SYSTEMD_UNITDIR}/mariadb.service
-                               ${INSTALL_SYSTEMD_UNITDIR}/mariadb@.service
-                               ${INSTALL_SYSTEMD_UNITDIR}/mariadb@bootstrap.service.d/use_galera_new_cluster.conf")
        IF(DEB)
          SET(SYSTEMD_EXECSTARTPRE "ExecStartPre=/usr/bin/install -m 755 -o mysql -g root -d /var/run/mysqld")
          SET(SYSTEMD_EXECSTARTPOST "ExecStartPost=/etc/mysql/debian-start")
--- a/debian/additions/debian-start
+++ b/debian/additions/debian-start
@@ -1,27 +1,32 @@
 #!/bin/bash
 #
 # This script is executed by "/etc/init.d/mysql" on every (re)start.
-# 
+#
 # Changes to this file will be preserved when updating the Debian package.
 #

 source /usr/share/mysql/debian-start.inc.sh

+if [ -f /etc/default/mysql ]; then
+  . /etc/default/mysql
+fi
+
 MYSQL="/usr/bin/mysql --defaults-file=/etc/mysql/debian.cnf"
 MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
 MYUPGRADE="/usr/bin/mysql_upgrade --defaults-extra-file=/etc/mysql/debian.cnf"
 MYCHECK="/usr/bin/mysqlcheck --defaults-file=/etc/mysql/debian.cnf"
 MYCHECK_SUBJECT="WARNING: mysqlcheck has found corrupt tables"
 MYCHECK_PARAMS="--all-databases --fast --silent"
-MYCHECK_RCPT="root"
+MYCHECK_RCPT="${MYCHECK_RCPT:-root}"
+
+## Checking for corrupt, not cleanly closed (only for MyISAM and Aria engines) and upgrade needing tables.

 # The following commands should be run when the server is up but in background
 # where they do not block the server start and in one shell instance so that
 # they run sequentially. They are supposed not to echo anything to stdout.
 # If you want to disable the check for crashed tables comment
-# "check_for_crashed_tables" out.  
+# "check_for_crashed_tables" out.
 # (There may be no output to stdout inside the background process!)
-echo "Checking for corrupt, not cleanly closed and upgrade needing tables."

 # Need to ignore SIGHUP, as otherwise a SIGHUP can sometimes abort the upgrade
 # process in the middle.
--- a/debian/additions/debian-start.inc.sh
+++ b/debian/additions/debian-start.inc.sh
@@ -3,7 +3,7 @@
 # This file is included by /etc/mysql/debian-start
 #

-## Check all unclosed tables.
+## Check MyISAM and Aria unclosed tables.
 # - Requires the server to be up.
 # - Is supposed to run silently in background. 
 function check_for_crashed_tables() {
@@ -11,20 +11,27 @@ function check_for_crashed_tables() {
  set -u

  # But do it in the background to not stall the boot process.
-  logger -p daemon.info -i -t$0 "Triggering myisam-recover for all MyISAM tables"
+  logger -p daemon.info -i -t$0 "Triggering myisam-recover for all MyISAM tables and aria-recover for all Aria tables"

  # Checking for $? is unreliable so the size of the output is checked.
  # Some table handlers like HEAP do not support CHECK TABLE.
  tempfile=`tempfile`
-  # We have to use xargs in this case, because a for loop barfs on the 
-  # spaces in the thing to be looped over. 
+
+  # We have to use xargs in this case, because a for loop barfs on the
+  # spaces in the thing to be looped over.
+
+  # If a crashed table is encountered, the "mysql" command will return with a status different from 0
+  set +e
+
  LC_ALL=C $MYSQL --skip-column-names --batch -e  '
      select concat('\''select count(*) into @discard from `'\'',
                    TABLE_SCHEMA, '\''`.`'\'', TABLE_NAME, '\''`'\'') 
-      from information_schema.TABLES where ENGINE='\''MyISAM'\' | \
+      from information_schema.TABLES where TABLE_SCHEMA<>'\''INFORMATION_SCHEMA'\'' and TABLE_SCHEMA<>'\''PERFORMANCE_SCHEMA'\'' and ( ENGINE='\''MyISAM'\'' or ENGINE='\''Aria'\'' )' | \
    xargs -i $MYSQL --skip-column-names --silent --batch \
-                    --force -e "{}" >$tempfile 
-  if [ -s $tempfile ]; then
+                    --force -e "{}" &>$tempfile
+  set -e
+
+  if [ -s "$tempfile" ]; then
    (
      /bin/echo -e "\n" \
        "Improperly closed tables are also reported if clients are accessing\n" \
--- a/debian/additions/echo_stderr
+++ b/debian/additions/echo_stderr
--- a/debian/additions/mariadb.cnf
+++ b/debian/additions/mariadb.cnf
@@ -15,3 +15,5 @@
 #collation-server      = utf8_general_ci 
 #character_set_server   = utf8 
 #collation_server       = utf8_general_ci 
+# Import all .cnf files from configuration directory
+!includedir /etc/mysql/mariadb.conf.d/
--- a/debian/autobake-deb.sh
+++ b/debian/autobake-deb.sh
@@ -21,62 +21,80 @@ then
  export DEB_BUILD_OPTIONS="nocheck"
 fi

+# Don't include test suite package on Travis-CI to make the build time shorter
+if [[ $TRAVIS ]]
+then
+  sed '/Package: mariadb-test-data/,+26d' -i debian/control
+  sed '/Package: mariadb-test/,+34d' -i debian/control
+fi
+
 export MARIADB_OPTIONAL_DEBS=""

 # Find major.minor version.
 #
 source ./VERSION
 UPSTREAM="${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}"
-RELEASE_EXTRA=""
-
-RELEASE_NAME=""
 PATCHLEVEL="+maria"
 LOGSTRING="MariaDB build"

 # Look up distro-version specific stuff.
+# Always keep the actual packaging as up-to-date as possible following the latest
+# Debian policy and targetting Debian Sid. Then case-by-case run in autobake-deb.sh
+# tests for backwards compatibility and strip away parts on older builders.

 CODENAME="$(lsb_release -sc)"

-# Add libcrack2 (>= 2.9.0) as a build dependency if available in the distribution
-# This matches Debian Jessie, Stretch and Ubuntu Trusty, Wily, Xenial, Yakkety
-# Update check when version 2.10 or newer is available.
-if apt-cache madison libcrack2-dev | grep 'libcrack2-dev *| *2\.9' >/dev/null 2>&1
+# If libcrack2 (>= 2.9.0) is not available (before Debian Jessie and Ubuntu Trusty)
+# clean away the cracklib stanzas so the package can build without them.
+if ! apt-cache madison libcrack2-dev | grep 'libcrack2-dev *| *2\.9' >/dev/null 2>&1
 then
-  sed 's/Standards-Version/,libcrack2-dev (>= 2.9.0)\nStandards-Version/' debian/control
-  cat <<EOT >> debian/control
-
-Package: mariadb-cracklib-password-check-10.2
-Architecture: any
-Depends: libcrack2 (>= 2.9.0),
-         mariadb-server-10.2,
-         \${misc:Depends},
-         \${shlibs:Depends}
-Description: CrackLib Password Validation Plugin for MariaDB
- This password validation plugin uses cracklib to allow only
- sufficiently secure (as defined by cracklib) user passwords in MariaDB.
-EOT
+  sed '/libcrack2-dev/d' -i debian/control
+  sed '/Package: mariadb-plugin-cracklib/,+10d' -i debian/control
 fi

-# Add libpcre3-dev (>= 2:8.35-3.2~) as a build dependency if available in the distribution
-# This matches Debian Jessie, Stretch and Ubuntu Wily, Xenial, Yakkety
+# If libpcre3-dev (>= 2:8.35-3.2~) is not available (before Debian Jessie or Ubuntu Wily)
+# clean away the PCRE3 stanzas so the package can build without them.
 # Update check when version 2:8.40 or newer is available.
-if apt-cache madison libpcre3-dev | grep 'libpcre3-dev *| *2:8\.3[2-9]' >/dev/null 2>&1
+if ! apt-cache madison libpcre3-dev | grep 'libpcre3-dev *| *2:8\.3[2-9]' >/dev/null 2>&1
 then
-  sed 's/Standards-Version/,libpcre3-dev (>= 2:8.35-3.2~)\nStandards-Version/' debian/control
+  sed '/libpcre3-dev/d' -i debian/control
 fi

+# If libsystemd-dev is not available (before Debian Jessie or Ubuntu Wily)
+# clean away the systemd stanzas so the package can build without them.
+if ! apt-cache madison libsystemd-dev | grep 'libsystemd-dev' >/dev/null 2>&1
+then
+  sed '/dh-systemd/d' -i debian/control
+  sed '/libsystemd-dev/d' -i debian/control
+  sed 's/ --with systemd//' -i debian/rules
+  sed '/systemd/d' -i debian/rules
+  sed '/\.service/d' -i debian/rules
+  sed '/galera_new_cluster/d' -i debian/mariadb-server-10.2.install
+  sed '/galera_recovery/d' -i debian/mariadb-server-10.2.install
+  sed '/mariadb-service-convert/d' -i debian/mariadb-server-10.2.install
+fi
+
+# On Travis-CI, the log must stay under 4MB so make the build less verbose
+if [[ $TRAVIS ]]
+then
+  sed -i -e '/Add support for verbose builds/,+2d' debian/rules
+fi
+
+
 # Adjust changelog, add new version.
 #
 echo "Incrementing changelog and starting build scripts"

-dch -b -D ${CODENAME} -v "${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}1~${CODENAME}" "Automatic build with ${LOGSTRING}."
+dch -b -D ${CODENAME} -v "${UPSTREAM}${PATCHLEVEL}~${CODENAME}" "Automatic build with ${LOGSTRING}."

-echo "Creating package version ${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}1~${CODENAME} ... "
+echo "Creating package version ${UPSTREAM}${PATCHLEVEL}~${CODENAME} ... "

 # Build the package.
 # Pass -I so that .git and other unnecessary temporary and source control files
 # will be ignored by dpkg-source when createing the tar.gz source package
-fakeroot dpkg-buildpackage -us -uc -I
+# Use -b to build binary only packages as there is no need to waste time on
+# generating the source package.
+fakeroot dpkg-buildpackage -us -uc -I -b

 [ -e debian/autorm-file ] && rm -vf `cat debian/autorm-file`

--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
--- a/debian/control
+++ b/debian/control
@@ -2,22 +2,25 @@ Source: mariadb-10.2
 Section: database
 Priority: optional
 Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
-Uploaders: MariaDB Developers <maria-developers@lists.launchpad.net>
 Build-Depends: bison,
               chrpath,
               cmake (>= 2.7),
-               debhelper,
+               debhelper (>= 9),
               dh-apparmor,
+               dh-systemd,
               dpatch,
-               libaio-dev,
+               libaio-dev [linux-any],
               libboost-dev,
+               libcrack2-dev (>= 2.9.0),
               libjemalloc-dev (>= 3.0.0~) [linux-any],
               libjudy-dev,
               libkrb5-dev,
               libncurses5-dev (>= 5.0-6~),
               libpam0g-dev,
+               libpcre3-dev (>= 2:8.35-3.2~),
               libreadline-gplv2-dev,
               libssl-dev,
+               libsystemd-dev,
               libxml2-dev,
               libnuma-dev,
               lsb-release,
@@ -34,10 +37,7 @@ Vcs-Browser: https://github.com/MariaDB/server/
 Package: libmariadbclient18
 Architecture: any
 Section: libs
-Depends: libmysqlclient18 (= ${binary:Version}),
-         mariadb-common,
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: mariadb-common, ${misc:Depends}, ${shlibs:Depends}
 Conflicts: mariadb-galera-server-10.0 (<< 10.0.5),
           mariadb-galera-server-5.5 (<< 5.5.33),
           mariadb-server-10.0 (<< 10.0.5),
@@ -71,9 +71,12 @@ Description: Virtual package to satisfy external depends
 Package: libmariadbd-dev
 Architecture: any
 Section: libdevel
-Depends: libmariadbclient-dev (>= ${binary:Version}), ${misc:Depends}
 Provides: libmysqld-dev
-Conflicts: libmysqld-dev
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libmariadbclient-dev (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Breaks: libmysqld-dev
 Replaces: libmysqld-dev
 Description: MariaDB embedded database, development files
 MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
@@ -81,7 +84,7 @@ Description: MariaDB embedded database, development files
 language in the world. The main goals of MariaDB are speed, robustness and
 ease of use.
 .
- This package includes the embedded server library and header files.
+ This package includes the embedded server library development and header files.

 Package: libmariadbclient-dev
 Architecture: any
@@ -137,11 +140,6 @@ Depends: libmariadbclient18 (>= ${source:Version}),
         mariadb-common (>= ${source:Version}),
         ${misc:Depends},
         ${shlibs:Depends}
-Provides: mysql-client-core,
-          mysql-client-core-5.1,
-          mysql-client-core-5.5,
-          mysql-client-core-5.6,
-          virtual-mysql-client-core
 Conflicts: mariadb-client-10.0,
           mariadb-client-10.1,
           mariadb-client-5.1,
@@ -161,6 +159,7 @@ Conflicts: mariadb-client-10.0,
           mysql-client-core-5.1,
           mysql-client-core-5.5,
           mysql-client-core-5.6,
+           mysql-client-core-5.7,
           virtual-mysql-client-core
 Replaces: mariadb-client-10.0,
          mariadb-client-10.1,
@@ -181,6 +180,13 @@ Replaces: mariadb-client-10.0,
          mysql-client-core-5.1,
          mysql-client-core-5.5,
          mysql-client-core-5.6,
+          mysql-client-core-5.7,
+          virtual-mysql-client-core
+Provides: mysql-client-core,
+          mysql-client-core-5.1,
+          mysql-client-core-5.5,
+          mysql-client-core-5.6,
+          mysql-client-core-5.7,
          virtual-mysql-client-core
 Description: MariaDB database core client binaries
 MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
@@ -193,21 +199,12 @@ Description: MariaDB database core client binaries
 Package: mariadb-client-10.2
 Architecture: any
 Depends: debianutils (>=1.6),
-         libdbd-mysql-perl (>= 1.2202),
-         libdbi-perl,
         libmariadbclient18 (>= ${source:Version}),
         mariadb-client-core-10.2 (>= ${source:Version}),
         mariadb-common,
         ${misc:Depends},
         ${perl:Depends},
         ${shlibs:Depends}
-Suggests: libterm-readkey-perl
-Provides: mysql-client,
-          mysql-client-4.1,
-          mysql-client-5.1,
-          mysql-client-5.5,
-          mysql-client-5.6,
-          virtual-mysql-client
 Conflicts: mariadb-client (<< ${source:Version}),
           mariadb-client-10.0,
           mariadb-client-10.1,
@@ -220,6 +217,7 @@ Conflicts: mariadb-client (<< ${source:Version}),
           mysql-client-5.1,
           mysql-client-5.5,
           mysql-client-5.6,
+           mysql-client-5.7,
           virtual-mysql-client
 Replaces: mariadb-client (<< ${source:Version}),
          mariadb-client-10.0,
@@ -233,7 +231,16 @@ Replaces: mariadb-client (<< ${source:Version}),
          mysql-client-5.1,
          mysql-client-5.5,
          mysql-client-5.6,
+          mysql-client-5.7,
          virtual-mysql-client
+Provides: mysql-client,
+          mysql-client-4.1,
+          mysql-client-5.1,
+          mysql-client-5.5,
+          mysql-client-5.6,
+          mysql-client-5.7,
+          virtual-mysql-client
+Recommends: libdbd-mysql-perl (>= 1.2202), libdbi-perl, libterm-readkey-perl
 Description: MariaDB database client binaries
 MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
 server. SQL (Structured Query Language) is the most popular database query
@@ -249,11 +256,6 @@ Depends: libmariadbclient18 (>= ${binary:Version}),
         mariadb-common (>= ${source:Version}),
         ${misc:Depends},
         ${shlibs:Depends}
-Provides: mysql-server-core,
-          mysql-server-core-5.1,
-          mysql-server-core-5.5,
-          mysql-server-core-5.6,
-          virtual-mysql-server-core
 Conflicts: mariadb-server-core-10.0,
           mariadb-server-core-10.1,
           mariadb-server-core-5.1,
@@ -265,8 +267,11 @@ Conflicts: mariadb-server-core-10.0,
           mysql-server-core-5.1,
           mysql-server-core-5.5,
           mysql-server-core-5.6,
+           mysql-server-core-5.7,
           virtual-mysql-server-core
-Replaces: mariadb-server-core-10.0,
+Breaks: mariadb-server-10.2 (<< ${source:Version})
+Replaces: mariadb-server-10.2 (<< ${source:Version}),
+          mariadb-server-core-10.0,
          mariadb-server-core-10.1,
          mariadb-server-core-5.1,
          mariadb-server-core-5.2,
@@ -277,6 +282,13 @@ Replaces: mariadb-server-core-10.0,
          mysql-server-core-5.1,
          mysql-server-core-5.5,
          mysql-server-core-5.6,
+          mysql-server-core-5.7,
+          virtual-mysql-server-core
+Provides: mysql-server-core,
+          mysql-server-core-5.1,
+          mysql-server-core-5.5,
+          mysql-server-core-5.6,
+          mysql-server-core-5.7,
          virtual-mysql-server-core
 Description: MariaDB database core server files
 MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
@@ -286,44 +298,15 @@ Description: MariaDB database core server files
 .
 This package includes the core server files, as used by Akonadi.

-Package: mariadb-test-10.2
-Architecture: any
-Depends: mariadb-client-10.2 (= ${binary:Version}),
-         mariadb-server-10.2 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Suggests: patch
-Conflicts: mariadb-galera-server-5.5 (<< 5.5.33),
-           mariadb-server-5.5 (<< 5.5.33),
-           mariadb-test (<< ${source:Version}),
-           mariadb-test-10.0,
-           mariadb-test-10.1,
-           mariadb-test-5.1,
-           mariadb-test-5.2,
-           mariadb-test-5.3,
-           virtual-mysql-testsuite
-Replaces: mariadb-test (<< ${source:Version}),
-          mariadb-test-10.0,
-          mariadb-test-10.1,
-          mariadb-test-5.1,
-          mariadb-test-5.2,
-          mariadb-test-5.3,
-          virtual-mysql-testsuite
-Provides: virtual-mysql-testsuite
-Description: MariaDB database regression test suite
- MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
- .
- This package includes the regression test suite.
-
 Package: mariadb-server-10.2
 Architecture: any
 Suggests: mailx, mariadb-test, netcat-openbsd, tinyca
 Recommends: libhtml-template-perl
-Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
-Depends: galera-3 (>=25.3),
+Pre-Depends: adduser (>= 3.40), debconf, mariadb-common (>= ${source:Version})
+Depends: bsdutils,
+         coreutils,
+         findutils,
+         galera-3 (>=25.3),
         gawk,
         iproute,
         libdbi-perl,
@@ -338,7 +321,6 @@ Depends: galera-3 (>=25.3),
         socat,
         ${misc:Depends},
         ${shlibs:Depends}
-Provides: mariadb-server, mysql-server, virtual-mysql-server
 Conflicts: mariadb-server (<< ${source:Version}),
           mariadb-server-10.0,
           mariadb-server-10.1,
@@ -347,6 +329,7 @@ Conflicts: mariadb-server (<< ${source:Version}),
           mariadb-server-5.3,
           mariadb-server-5.5,
           mariadb-tokudb-engine-10.0,
+           mariadb-tokudb-engine-10.1,
           mariadb-tokudb-engine-5.5,
           mysql-server (<< ${source:Version}),
           mysql-server-4.1,
@@ -354,6 +337,7 @@ Conflicts: mariadb-server (<< ${source:Version}),
           mysql-server-5.1,
           mysql-server-5.5,
           mysql-server-5.6,
+           mysql-server-5.7,
           virtual-mysql-server
 Replaces: libmariadbclient-dev (<< 5.5.0),
          libmariadbclient16 (<< 5.3.4),
@@ -365,6 +349,7 @@ Replaces: libmariadbclient-dev (<< 5.5.0),
          mariadb-server-5.3,
          mariadb-server-5.5,
          mariadb-tokudb-engine-10.0,
+          mariadb-tokudb-engine-10.1,
          mariadb-tokudb-engine-5.5,
          mysql-server (<< ${source:Version}),
          mysql-server-4.1,
@@ -372,7 +357,9 @@ Replaces: libmariadbclient-dev (<< 5.5.0),
          mysql-server-5.1,
          mysql-server-5.5,
          mysql-server-5.6,
+          mysql-server-5.7,
          virtual-mysql-server
+Provides: virtual-mysql-server
 Description: MariaDB database server binaries
 MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
 server. SQL (Structured Query Language) is the most popular database query
@@ -383,7 +370,7 @@ Description: MariaDB database server binaries

 Package: mariadb-server
 Architecture: all
-Depends: mariadb-server-10.2 (= ${source:Version}), ${misc:Depends}
+Depends: mariadb-server-10.2 (>= ${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.2), as determined by the MariaDB
@@ -398,7 +385,7 @@ Description: MariaDB database server (metapackage depending on the latest versio

 Package: mariadb-client
 Architecture: all
-Depends: mariadb-client-10.2 (= ${source:Version}), ${misc:Depends}
+Depends: mariadb-client-10.2 (>= ${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.2), as determined by the MariaDB
@@ -406,50 +393,179 @@ Description: MariaDB database client (metapackage depending on the latest versio
 you want, as this is the one considered to be in the best shape.

 Package: mariadb-test
-Architecture: all
-Depends: mariadb-test-10.2 (= ${source:Version}), ${misc:Depends}
-Description: MariaDB database regression test suite (metapackage for the latest version)
- This is an empty package that depends on the current "best" version of
- mariadb-test (currently mariadb-test-10.2), as determined by the MariaDB
- maintainers.
+Architecture: any
+Depends: mariadb-client-10.2 (= ${binary:Version}),
+         mariadb-server-10.2 (= ${binary:Version}),
+         mariadb-test-data (= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Breaks: mariadb-test-10.0,
+        mariadb-test-10.1,
+        mariadb-test-5.5,
+        mariadb-server-5.5,
+        mysql-testsuite,
+        mysql-testsuite-5.5,
+        mysql-testsuite-5.6,
+        mysql-testsuite-5.7,
+        virtual-mysql-testsuite
+Replaces: mariadb-test-10.0,
+          mariadb-test-10.1,
+          mariadb-test-5.5,
+          mariadb-server-5.5,
+          mysql-testsuite,
+          mysql-testsuite-5.5,
+          mysql-testsuite-5.6,
+          mysql-testsuite-5.7,
+          virtual-mysql-testsuite
+Provides: virtual-mysql-testsuite
+Suggests: patch
+Description: MariaDB database regression test suite
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ server. SQL (Structured Query Language) is the most popular database query
+ language in the world. The main goals of MariaDB are speed, robustness and
+ ease of use.
+ .
+ This package includes the regression test suite.

-Package: mariadb-connect-engine-10.2
+Package: mariadb-test-data
+Architecture: all
+Depends: ${misc:Depends}
+Breaks: mariadb-test-10.0,
+        mariadb-test-10.1,
+        mariadb-test-5.5,
+        mariadb-test-data-10.0,
+        mysql-testsuite,
+        mysql-testsuite-5.5,
+        mysql-testsuite-5.6,
+        mysql-testsuite-5.7
+Replaces: mariadb-test-10.0,
+          mariadb-test-10.1,
+          mariadb-test-5.5,
+          mariadb-test-data-10.0,
+          mysql-testsuite,
+          mysql-testsuite-5.5,
+          mysql-testsuite-5.6,
+          mysql-testsuite-5.7
+Description: MariaDB database regression test suite - data files
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ server. SQL (Structured Query Language) is the most popular database query
+ language in the world. The main goals of MariaDB are speed, robustness and
+ ease of use.
+ .
+ This package has the architecture independent data files for the test suite.
+
+Package: mariadb-plugin-connect
 Architecture: any
 Depends: libxml2,
         mariadb-server-10.2,
         unixodbc,
         ${misc:Depends},
         ${shlibs:Depends}
+Breaks: mariadb-connect-engine-10.1, mariadb-connect-engine-10.2
+Replaces: mariadb-connect-engine-10.1, mariadb-connect-engine-10.2
 Description: Connect storage engine for MariaDB
 Connect engine supports a number of file formats (dbf, xml, txt, bin, etc),
 connections to ODBC tables and remote MySQL tables, as well as a number of
 other interesting features.
 This package contains the Connect plugin for MariaDB.

-Package: mariadb-oqgraph-engine-10.2
+Package: mariadb-plugin-oqgraph
 Architecture: any
 Depends: libjudydebian1, mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
+Breaks: mariadb-oqgraph-engine-10.1, mariadb-oqgraph-engine-10.2
+Replaces: mariadb-oqgraph-engine-10.1, mariadb-oqgraph-engine-10.2
 Description: OQGraph storage engine for MariaDB
 The OQGraph engine is a computation engine plugin for handling hierarchies
 (trees) and graphs (friend-of-a-friend, etc) cleanly through standard SQL.
 This package contains the OQGraph plugin for MariaDB.

-Package: mariadb-gssapi-server-10.2
+Package: mariadb-plugin-tokudb
+Architecture: any
+Depends: mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
+Breaks: mariadb-server-10.0 (<< ${source:Version}),
+        mariadb-server-10.1 (<< ${source:Version}),
+        mariadb-server-10.2 (<< ${source:Version})
+Replaces: mariadb-server-10.0 (<< ${source:Version}),
+          mariadb-server-10.1 (<< ${source:Version}),
+          mariadb-server-10.2 (<< ${source:Version})
+Description: TokuDB storage engine for MariaDB
+ The TokuDB storage engine is for use in high-performance and write-intensive
+ environments, offering increased compression and better performance based
+ on fractal indexes.
+ This package contains the TokuDB plugin for MariaDB.
+
+Package: mariadb-plugin-mroonga
+Architecture: any
+Depends: mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
+Breaks: mariadb-server-10.0 (<< ${source:Version}),
+        mariadb-server-10.1 (<< ${source:Version}),
+        mariadb-server-10.2 (<< ${source:Version})
+Replaces: mariadb-server-10.0 (<< ${source:Version}),
+          mariadb-server-10.1 (<< ${source:Version}),
+          mariadb-server-10.2 (<< ${source:Version})
+Description: Mroonga storage engine for MariaDB
+ Mroonga (formerly named Groonga Storage Engine) is a storage engine that
+ provides fast CJK-ready full text searching using column store.
+ This package contains the Mroonga plugin for MariaDB.
+
+Package: mariadb-plugin-cassandra
+Architecture: any
+Depends: mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
+Breaks: mariadb-server-10.0 (<< ${source:Version}),
+        mariadb-server-10.1 (<< ${source:Version}),
+        mariadb-server-10.2 (<< ${source:Version})
+Replaces: mariadb-server-10.0 (<< ${source:Version}),
+          mariadb-server-10.1 (<< ${source:Version}),
+          mariadb-server-10.2 (<< ${source:Version})
+Description: Cassandra storage engine for MariaDB
+ The Cassandra Storage Engine allows access to data in a Cassandra cluster from
+ MariaDB, combining the best of SQL and no-SQL worlds. Cassandra SE (storage
+ engine) makes Cassandra's column family appear as a table in MariaDB that you
+ can insert to, update, and select from. You can write joins against this table,
+ it is possible to join data that's stored in MariaDB with data that's stored in
+ Cassandra.
+
+Package: mariadb-plugin-spider
+Architecture: any
+Depends: mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
+Breaks: mariadb-server-10.0 (<< ${source:Version}),
+        mariadb-server-10.1 (<< ${source:Version}),
+        mariadb-server-10.2 (<< ${source:Version})
+Replaces: mariadb-server-10.0 (<< ${source:Version}),
+          mariadb-server-10.1 (<< ${source:Version}),
+          mariadb-server-10.2 (<< ${source:Version})
+Description: Spider storage engine for MariaDB
+ The Spider storage engine with built-in sharding features. It supports
+ partitioning and xa transactions, and allows tables of different MariaDB
+ instances to be handled as if they were on the same insctance. It refers to one
+ possible implementation of ISO/IEC 9075-9:2008 SQL/MED.
+
+Package: mariadb-plugin-gssapi-server
 Architecture: any
 Depends: libgssapi-krb5-2,
         mariadb-server-10.2,
         ${misc:Depends},
         ${shlibs:Depends}
-Conflicts: mariadb-gssapi-server-10.1
-Replaces: mariadb-gssapi-server-10.1
+Breaks: mariadb-gssapi-server-10.1, mariadb-gssapi-server-10.2
+Replaces: mariadb-gssapi-server-10.1, mariadb-gssapi-server-10.2
 Description: GSSAPI authentication plugin for MariaDB server

-Package: mariadb-gssapi-client-10.2
+Package: mariadb-plugin-gssapi-client
 Architecture: any
 Depends: libgssapi-krb5-2,
         mariadb-client-10.2,
         ${misc:Depends},
         ${shlibs:Depends}
-Conflicts: mariadb-gssapi-client-10.1
-Replaces: mariadb-gssapi-client-10.1
+Breaks: mariadb-gssapi-client-10.1, mariadb-gssapi-client-10.2
+Replaces: mariadb-gssapi-client-10.1, mariadb-gssapi-client-10.2
 Description: GSSAPI authentication plugin for MariaDB client
+
+Package: mariadb-plugin-cracklib-password-check
+Architecture: any
+Depends: libcrack2 (>= 2.9.0),
+         mariadb-server-10.2,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: CrackLib Password Validation Plugin for MariaDB
+ This password validation plugin uses cracklib to allow only
+ sufficiently secure (as defined by cracklib) user passwords in MariaDB.
--- a/debian/libmariadbclient-dev.README.Maintainer
+++ b/debian/libmariadbclient-dev.README.Maintainer
@@ -1,4 +1,3 @@
 The examples directory includes files that might be needed by some
 developers:
- header files not installed by default
 - the example file udf_example.c
--- a/debian/libmariadbclient-dev.dirs
+++ b/debian/libmariadbclient-dev.dirs
@@ -1,2 +0,0 @@
-usr/include/
-usr/lib/
--- a/debian/libmariadbclient-dev.files
+++ b/debian/libmariadbclient-dev.files
@@ -1,8 +0,0 @@
-usr/bin/mysql_config
-usr/include/mysql
-usr/include/mariadb
-usr/lib/mariadb/libmariadbclient.a
-usr/lib/libmysqlservices.a
-usr/share/aclocal/mysql.m4
-usr/share/pkgconfig/mariadb.pc
-usr/share/man/man1/mysql_config.1
--- a/debian/libmariadbclient-dev.install
+++ b/debian/libmariadbclient-dev.install
@@ -0,0 +1,8 @@
+usr/bin/mysql_config
+usr/include/mariadb
+usr/include/mysql/*
+usr/lib/*/libmariadb.so
+usr/lib/*/libmariadbclient.a
+usr/lib/*/libmysqlservices.a
+usr/share/aclocal/mysql.m4
+usr/share/pkgconfig/mariadb.pc
--- a/debian/libmariadbclient-dev.manpages
+++ b/debian/libmariadbclient-dev.manpages
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man1/mysql_config.1
--- a/debian/libmariadbclient18.dirs
+++ b/debian/libmariadbclient18.dirs
@@ -1 +0,0 @@
-usr/lib/
--- a/debian/libmariadbclient18.install
+++ b/debian/libmariadbclient18.install
@@ -1,3 +1,3 @@
 usr/lib/mariadb/libmariadb.so.*
-usr/lib/mysql/plugin/mysql_clear_password.so
 usr/lib/mysql/plugin/dialog.so
+usr/lib/mysql/plugin/mysql_clear_password.so
--- a/debian/libmariadbd-dev.files
+++ b/debian/libmariadbd-dev.files
@@ -1,2 +0,0 @@
-usr/lib/mysql/*.a
-usr/lib/mysql/*.la
--- a/debian/libmariadbd-dev.install
+++ b/debian/libmariadbd-dev.install
@@ -0,0 +1,2 @@
+usr/lib/*/libmysqld.a
+usr/lib/*/libmysqld.so
--- a/debian/libmariadbd18.install
+++ b/debian/libmariadbd18.install
@@ -0,0 +1 @@
+usr/lib/*/libmysqld.so.18
--- a/debian/mariadb-client-10.2.README.Debian
+++ b/debian/mariadb-client-10.2.README.Debian
@@ -1,4 +1,4 @@
 FAQ:

-Q: My <tab> completion is gone, why?
+Q: My <tab> completition is gone, why?
 A: You have "no-auto-rehash" in the "[mysql]" section of /etc/mysql/my.cnf!
--- a/debian/mariadb-client-10.2.dirs
+++ b/debian/mariadb-client-10.2.dirs
@@ -1,3 +0,0 @@
-usr/bin/
-usr/share/man/man1/
-usr/share/perl5/
--- a/debian/mariadb-client-10.2.files
+++ b/debian/mariadb-client-10.2.files
@@ -1,25 +0,0 @@
-usr/bin/innochecksum
-usr/bin/innotop
-usr/bin/mysqlaccess
-usr/bin/mysqladmin
-usr/bin/mysqldump
-usr/bin/mysqldumpslow
-usr/bin/mysql_find_rows
-usr/bin/mysql_fix_extensions
-usr/bin/mysqlimport
-usr/bin/mysqlreport
-usr/bin/mysqlshow
-usr/bin/mysqlslap
-usr/bin/mysql_waitpid
-usr/share/man/man1/innotop.1
-usr/share/man/man1/mysqlaccess.1
-usr/share/man/man1/mysqladmin.1
-usr/share/man/man1/mysqldump.1
-usr/share/man/man1/mysqldumpslow.1
-usr/share/man/man1/mysql_find_rows.1
-usr/share/man/man1/mysql_fix_extensions.1
-usr/share/man/man1/mysqlimport.1
-usr/share/man/man1/mysqlreport.1
-usr/share/man/man1/mysqlshow.1
-usr/share/man/man1/mysqlslap.1
-usr/share/man/man1/mysql_waitpid.1
--- a/debian/mariadb-client-10.2.install
+++ b/debian/mariadb-client-10.2.install
@@ -0,0 +1,12 @@
+debian/additions/innotop/innotop usr/bin/
+debian/additions/mysqlreport usr/bin/
+usr/bin/mysql_find_rows
+usr/bin/mysql_fix_extensions
+usr/bin/mysql_waitpid
+usr/bin/mysqlaccess
+usr/bin/mysqladmin
+usr/bin/mysqldump
+usr/bin/mysqldumpslow
+usr/bin/mysqlimport
+usr/bin/mysqlshow
+usr/bin/mysqlslap
--- a/debian/mariadb-client-10.2.manpages
+++ b/debian/mariadb-client-10.2.manpages
@@ -0,0 +1,12 @@
+debian/additions/innotop/innotop.1
+debian/tmp/usr/share/man/man1/mysqlaccess.1
+debian/tmp/usr/share/man/man1/mysqladmin.1
+debian/tmp/usr/share/man/man1/mysqldump.1
+debian/tmp/usr/share/man/man1/mysqldumpslow.1
+debian/tmp/usr/share/man/man1/mysql_find_rows.1
+debian/tmp/usr/share/man/man1/mysql_fix_extensions.1
+debian/tmp/usr/share/man/man1/mysqlimport.1
+debian/additions/mysqlreport.1
+debian/tmp/usr/share/man/man1/mysqlshow.1
+debian/tmp/usr/share/man/man1/mysqlslap.1
+debian/tmp/usr/share/man/man1/mysql_waitpid.1
--- a/debian/mariadb-client-10.2.menu
+++ b/debian/mariadb-client-10.2.menu
@@ -1,3 +1,3 @@
 # According to /usr/share/menu/ policy 1.4, not /usr/share/doc/debian-policy/
-?package(innotop):needs="text" section="Applications/Data Management"\
-  title="innotop" command="/usr/bin/innotop"
+?package(mariadb-client-10.2):needs="text" section="Applications/Data Management"\
+  title="Innotop" command="/usr/bin/innotop"
--- a/debian/mariadb-client-core-10.2.files
+++ b/debian/mariadb-client-core-10.2.files
@@ -1,4 +0,0 @@
-usr/bin/mysql
-usr/bin/mysqlcheck
-usr/share/man/man1/mysql.1
-usr/share/man/man1/mysqlcheck.1
--- a/debian/mariadb-client-core-10.2.install
+++ b/debian/mariadb-client-core-10.2.install
@@ -0,0 +1,2 @@
+usr/bin/mysql
+usr/bin/mysqlcheck
--- a/debian/mariadb-client-core-10.2.manpages
+++ b/debian/mariadb-client-core-10.2.manpages
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/man/man1/mysql.1
+debian/tmp/usr/share/man/man1/mysqlcheck.1
--- a/debian/mariadb-common.dirs
+++ b/debian/mariadb-common.dirs
@@ -0,0 +1 @@
+etc/mysql/mariadb.conf.d/
--- a/debian/mariadb-common.files
+++ b/debian/mariadb-common.files
@@ -1 +0,0 @@
-etc/mysql/conf.d/mariadb.cnf
--- a/debian/mariadb-common.install
+++ b/debian/mariadb-common.install
@@ -0,0 +1 @@
+debian/additions/mariadb.cnf etc/mysql/conf.d
--- a/debian/mariadb-oqgraph-engine-10.2.files
+++ b/debian/mariadb-oqgraph-engine-10.2.files
@@ -1 +0,0 @@
-usr/lib/mysql/plugin/ha_oqgraph.so
--- a/debian/mariadb-plugin-cassandra.install
+++ b/debian/mariadb-plugin-cassandra.install
@@ -0,0 +1,2 @@
+etc/mysql/conf.d/cassandra.cnf etc/mysql/mariadb.conf.d
+usr/lib/mysql/plugin/ha_cassandra.so
--- a/debian/mariadb-connect-engine-10.2.files
+++ b/debian/mariadb-connect-engine-10.2.files
@@ -1,2 +1,2 @@
-usr/lib/mysql/plugin/ha_connect.so
 etc/mysql/conf.d/connect.cnf
+usr/lib/mysql/plugin/ha_connect.so
--- a/debian/mariadb-plugin-cracklib-password-check.install
+++ b/debian/mariadb-plugin-cracklib-password-check.install
--- a/debian/mariadb-plugin-gssapi-client.install
+++ b/debian/mariadb-plugin-gssapi-client.install
--- a/debian/mariadb-plugin-gssapi-server.install
+++ b/debian/mariadb-plugin-gssapi-server.install
--- a/debian/mariadb-plugin-mroonga.install
+++ b/debian/mariadb-plugin-mroonga.install
@@ -0,0 +1,3 @@
+usr/lib/mysql/plugin/ha_mroonga.so
+usr/share/mysql/mroonga/install.sql
+usr/share/mysql/mroonga/uninstall.sql
--- a/debian/mariadb-plugin-mroonga.postinst
+++ b/debian/mariadb-plugin-mroonga.postinst
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+# Install Mroonga
+# No user or password parameter is required with new MariaDB that
+# has unix socket authentication support by default.
+mysql --defaults-file=/etc/mysql/debian.cnf < /usr/share/mysql/mroonga/install.sql || true
+# Always exit with success instead of leaving dpkg in a broken state
+
+
+#DEBHELPER#
--- a/debian/mariadb-plugin-mroonga.prerm
+++ b/debian/mariadb-plugin-mroonga.prerm
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+# Install Mroonga
+# No user or password parameter is required with new MariaDB that
+# has unix socket authentication support by default.
+mysql --defaults-file=/etc/mysql/debian.cnf < /usr/share/mysql/mroonga/uninstall.sql || true
+# Always exit with success instead of leaving dpkg in a broken state
+
+
+#DEBHELPER#
--- a/debian/mariadb-plugin-oqgraph.install
+++ b/debian/mariadb-plugin-oqgraph.install
@@ -0,0 +1,2 @@
+etc/mysql/conf.d/oqgraph.cnf etc/mysql/mariadb.conf.d
+usr/lib/mysql/plugin/ha_oqgraph.so
--- a/debian/mariadb-plugin-spider.install
+++ b/debian/mariadb-plugin-spider.install
@@ -0,0 +1,2 @@
+usr/lib/mysql/plugin/ha_spider.so
+usr/share/mysql/install_spider.sql
--- a/debian/mariadb-plugin-spider.postinst
+++ b/debian/mariadb-plugin-spider.postinst
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+# Install Spider
+# No user or password parameter is required with new MariaDB that
+# has unix socket authentication support by default.
+mysql --defaults-file=/etc/mysql/debian.cnf < /usr/share/mysql/install_spider.sql || true
+# Always exit with success instead of leaving dpkg in a broken state
+
+
+#DEBHELPER#
--- a/debian/mariadb-plugin-tokudb.install
+++ b/debian/mariadb-plugin-tokudb.install
@@ -0,0 +1,4 @@
+etc/mysql/conf.d/tokudb.cnf etc/mysql/mariadb.conf.d
+usr/bin/tokuftdump
+usr/lib/mysql/plugin/ha_tokudb.so
+usr/share/doc/mariadb-server-10.2/README.md usr/share/doc/mariadb-plugin-tokudb/README.md
--- a/debian/mariadb-server-10.2.config
+++ b/debian/mariadb-server-10.2.config
@@ -1,18 +1,17 @@
-#!/bin/bash -e
+#!/bin/bash
+
+set -e

 . /usr/share/debconf/confmodule

 if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
 ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }

-CNF=/etc/mysql/my.cnf
-
 # 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 mysql-server-5.1/nis_warning || true
+  db_input high mariadb-server-10.0/nis_warning || true
  db_go
 fi
-
 # only ask this question on fresh installs, during "reconfiguration" and when 
 # not upgrading from an existing 5.0 installation.
 # there is also an additional check for empty root passwords in the
--- a/debian/mariadb-server-10.2.dirs
+++ b/debian/mariadb-server-10.2.dirs
@@ -1,10 +1 @@
-etc/init.d
-etc/logrotate.d
-etc/mysql/conf.d
-usr/bin
-usr/sbin
-usr/share/man/man8
-usr/share/mysql
-usr/share/doc/mariadb-server-10.2
-var/run/mysqld
 var/lib/mysql-upgrade
--- a/debian/mariadb-server-10.2.files.in
+++ b/debian/mariadb-server-10.2.files.in
@@ -1,47 +1,25 @@
-usr/lib/mysql/plugin/auth_pam.so
-usr/lib/mysql/plugin/auth_socket.so
-usr/lib/mysql/plugin/file_key_management.so
-usr/lib/mysql/plugin/ha_archive.so
-usr/lib/mysql/plugin/ha_blackhole.so
-usr/lib/mysql/plugin/ha_federated.so
-usr/lib/mysql/plugin/ha_federatedx.so
-usr/lib/mysql/plugin/ha_mroonga.so
-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/query_cache_info.so
-usr/lib/mysql/plugin/query_response_time.so
-usr/lib/mysql/plugin/semisync_master.so
-usr/lib/mysql/plugin/semisync_slave.so
-usr/lib/mysql/plugin/server_audit.so
-usr/lib/mysql/plugin/simple_password_check.so
-usr/lib/mysql/plugin/sql_errlog.so
-usr/lib/mysql/plugin/wsrep_info.so
-usr/lib/mysql/plugin/user_variables.so
-usr/lib/libhsclient.so.*
+debian/additions/debian-start etc/mysql
+debian/additions/debian-start.inc.sh usr/share/mysql
+debian/additions/echo_stderr usr/share/mysql
+debian/additions/mysqld_safe_syslog.cnf etc/mysql/conf.d
 etc/apparmor.d/usr.sbin.mysqld
-usr/share/apport/package-hooks/source_mariadb-10.2.py
-etc/mysql/debian-start
-etc/mysql/conf.d/mysqld_safe_syslog.cnf
-usr/bin/msql2mysql
-usr/bin/my_print_defaults
-usr/bin/myisamchk
-usr/bin/myisam_ftdump
-usr/bin/myisamlog
-usr/bin/myisampack
-usr/bin/aria_pack
-usr/bin/aria_read_log
-usr/bin/aria_ftdump
 usr/bin/aria_chk
 usr/bin/aria_dump_log
+usr/bin/aria_ftdump
+usr/bin/aria_pack
+usr/bin/aria_read_log
+usr/bin/msql2mysql
+usr/bin/my_print_defaults
+usr/bin/myisam_ftdump
+usr/bin/myisamchk
+usr/bin/myisamlog
+usr/bin/myisampack
 usr/bin/mysql_convert_table_format
 usr/bin/mysql_install_db
 usr/bin/mysql_plugin
 usr/bin/mysql_secure_installation
 usr/bin/mysql_setpermission
 usr/bin/mysql_tzinfo_to_sql
-usr/bin/mysql_upgrade
 usr/bin/mysqlbinlog
 usr/bin/mysqld_multi
 usr/bin/mysqld_safe
@@ -55,43 +33,37 @@ usr/bin/wsrep_sst_mysqldump
 usr/bin/wsrep_sst_rsync
 usr/bin/wsrep_sst_xtrabackup
 usr/bin/wsrep_sst_xtrabackup-v2
+usr/lib/mysql/plugin/auth_pam.so
+usr/lib/mysql/plugin/auth_socket.so
+usr/lib/mysql/plugin/file_key_management.so
+usr/lib/mysql/plugin/ha_archive.so
+usr/lib/mysql/plugin/ha_blackhole.so
+usr/lib/mysql/plugin/ha_federated.so
+usr/lib/mysql/plugin/ha_federatedx.so
+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/query_cache_info.so
+usr/lib/mysql/plugin/query_response_time.so
+usr/lib/mysql/plugin/semisync_master.so
+usr/lib/mysql/plugin/semisync_slave.so
+usr/lib/mysql/plugin/server_audit.so
+usr/lib/mysql/plugin/simple_password_check.so
+usr/lib/mysql/plugin/sql_errlog.so
+usr/lib/mysql/plugin/user_variables.so
+usr/lib/mysql/plugin/wsrep_info.so
+usr/share/apport/package-hooks/source_mariadb-10.2.py
 usr/share/doc/mariadb-server-10.2/mysqld.sym.gz
-usr/share/doc/mariadb-server-10.2/INFO_SRC
-usr/share/doc/mariadb-server-10.2/INFO_BIN
-usr/share/man/man1/msql2mysql.1
-usr/share/man/man1/myisamchk.1
-usr/share/man/man1/myisam_ftdump.1
-usr/share/man/man1/myisamlog.1
-usr/share/man/man1/myisampack.1
-usr/share/man/man1/my_print_defaults.1
-usr/share/man/man1/mysqlbinlog.1
-usr/share/man/man1/mysql_convert_table_format.1
-usr/share/man/man1/mysqld_multi.1
-usr/share/man/man1/mysqld_safe.1
-usr/share/man/man1/mysqlhotcopy.1
-usr/share/man/man1/mysql_install_db.1
-usr/share/man/man1/mysql_secure_installation.1
-usr/share/man/man1/mysql_setpermission.1
-usr/share/man/man1/mysql_upgrade.1
-usr/share/man/man1/perror.1
-usr/share/man/man1/replace.1
-usr/share/man/man1/resolveip.1
-usr/share/man/man1/resolve_stack_dump.1
-usr/share/man/man1/innochecksum.1
-usr/share/man/man1/mysql_tzinfo_to_sql.1
-usr/share/mysql/debian-start.inc.sh
-usr/share/mysql/echo_stderr
 usr/share/mysql/errmsg-utf8.txt
 usr/share/mysql/fill_help_tables.sql
 usr/share/mysql/maria_add_gis_sp_bootstrap.sql
-usr/share/mysql/mroonga/install.sql
-usr/share/mysql/mroonga/uninstall.sql
-usr/share/mysql/mysql_system_tables_data.sql
-usr/share/mysql/mysql_system_tables.sql
 usr/share/mysql/mysql_performance_tables.sql
+usr/share/mysql/mysql_system_tables.sql
+usr/share/mysql/mysql_system_tables_data.sql
 usr/share/mysql/mysql_test_data_timezone.sql
 usr/share/mysql/wsrep_notify
-@CASSANDRA_DEB_FILES@
-@SPIDER_DEB_FILES@
-@TOKUDB_DEB_FILES@
-@SYSTEMD_DEB_FILES@
+usr/bin/galera_new_cluster
+usr/bin/galera_recovery
+usr/bin/mariadb-service-convert
+lib/systemd/system/mariadb@bootstrap.service.d/use_galera_new_cluster.conf
--- a/debian/mariadb-server-10.2.manpages
+++ b/debian/mariadb-server-10.2.manpages
@@ -0,0 +1,25 @@
+debian/tmp/usr/share/man/man1/aria_chk.1
+debian/tmp/usr/share/man/man1/aria_dump_log.1
+debian/tmp/usr/share/man/man1/aria_ftdump.1
+debian/tmp/usr/share/man/man1/aria_pack.1
+debian/tmp/usr/share/man/man1/aria_read_log.1
+debian/tmp/usr/share/man/man1/msql2mysql.1
+debian/tmp/usr/share/man/man1/myisamchk.1
+debian/tmp/usr/share/man/man1/myisam_ftdump.1
+debian/tmp/usr/share/man/man1/myisamlog.1
+debian/tmp/usr/share/man/man1/myisampack.1
+debian/tmp/usr/share/man/man1/my_print_defaults.1
+debian/tmp/usr/share/man/man1/mysqlbinlog.1
+debian/tmp/usr/share/man/man1/mysql_convert_table_format.1
+debian/tmp/usr/share/man/man1/mysqld_multi.1
+debian/tmp/usr/share/man/man1/mysqld_safe.1
+debian/tmp/usr/share/man/man1/mysqlhotcopy.1
+debian/tmp/usr/share/man/man1/mysql_install_db.1
+debian/tmp/usr/share/man/man1/mysql_plugin.1
+debian/tmp/usr/share/man/man1/mysql_secure_installation.1
+debian/tmp/usr/share/man/man1/mysql_setpermission.1
+debian/tmp/usr/share/man/man1/mysql_tzinfo_to_sql.1
+debian/tmp/usr/share/man/man1/perror.1
+debian/tmp/usr/share/man/man1/replace.1
+debian/tmp/usr/share/man/man1/resolveip.1
+debian/tmp/usr/share/man/man1/resolve_stack_dump.1
--- a/debian/mariadb-server-10.2.mysql-server.logrotate
+++ b/debian/mariadb-server-10.2.mysql-server.logrotate
@@ -1,8 +1,8 @@
-# - I put everything in one block and added sharedscripts, so that mysql gets 
+# - I put everything in one block and added sharedscripts, so that mysql gets
 #   flush-logs'd only once.
 #   Else the binary logs would automatically increase by n times every day.
 # - The error log is obsolete, messages go to syslog now.
-/var/log/mysql.log /var/log/mysql/mysql.log /var/log/mysql/mariadb-slow.log {
+/var/log/mysql/mysql.log /var/log/mysql/mysql-slow.log /var/log/mysql/mariadb-slow.log /var/log/mysql/error.log {
 	daily
 	rotate 7
 	missingok
@@ -11,7 +11,6 @@
 	sharedscripts
 	postrotate
          test -x /usr/bin/mysqladmin || exit 0
-
          if [ -f `my_print_defaults --mysqld | grep -oP "pid-file=\K[^$]+"` ]; then
            # If this fails, check debian.conf!
            mysqladmin --defaults-file=/etc/mysql/debian.cnf flush-logs
--- a/debian/mariadb-server-10.2.mysql.default
+++ b/debian/mariadb-server-10.2.mysql.default
@@ -0,0 +1,8 @@
+# The delay in seconds the init script waits for the server to be up and running after having started "mysqld_safe" to run the "/etc/mysql/debian-start" script.
+# If the server is still not responding after the delay, the script won't be executed and an error will be thrown on the syslog.
+# Default: 30
+#MYSQLD_STARTUP_TIMEOUT=30
+
+# The email recipient(s) of the output of the check for crashed and improperly closed MyISAM and Aria tables done at each server start by the "/etc/mysql/debian-start" script.
+# Default: root
+#MYCHECK_RCPT="root"
--- a/debian/mariadb-server-10.2.mysql.init
+++ b/debian/mariadb-server-10.2.mysql.init
@@ -22,12 +22,16 @@ test -x /usr/sbin/mysqld || exit 0
 . /lib/lsb/init-functions

 SELF=$(cd $(dirname $0); pwd -P)/$(basename $0)
-CONF=/etc/mysql/my.cnf
+
 MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"

-# priority can be overridden and "-s" adds output to stderr
+# priority can be overriden and "-s" adds output to stderr
 ERR_LOGGER="logger -p daemon.err -t /etc/init.d/mysql -i"

+if [ -f /etc/default/mysql ]; then
+  . /etc/default/mysql
+fi
+
 # Safeguard (relative paths, core dumps..)
 cd /
 umask 077
@@ -37,18 +41,15 @@ umask 077
 # so break my scripts.
 export HOME=/etc/mysql/

-# Source default config file.
-[ -r /etc/default/mariadb ] && . /etc/default/mariadb
-
 ## Fetch a particular option from mysql's invocation.
 #
 # Usage: void mysqld_get_param option
 mysqld_get_param() {
-	/usr/sbin/mysqld --print-defaults \
-		| tr " " "\n" \
-		| grep -- "--$1" \
-		| tail -n 1 \
-		| cut -d= -f2
+  /usr/sbin/mysqld --print-defaults \
+    | tr " " "\n" \
+    | grep -- "--$1" \
+    | tail -n 1 \
+    | cut -d= -f2
 }

 ## Do some sanity checks before even trying to start mysqld.
@@ -75,21 +76,21 @@ sanity_checks() {
 #
 # Usage: boolean mysqld_status [check_alive|check_dead] [warn|nowarn]
 mysqld_status () {
-    ping_output=`$MYADMIN ping 2>&1`; ping_alive=$(( ! $? ))
+  ping_output=`$MYADMIN ping 2>&1`; ping_alive=$(( ! $? ))

-    ps_alive=0
-    pidfile=`mysqld_get_param pid-file`
-    if [ -f "$pidfile" ] && ps `cat $pidfile` >/dev/null 2>&1; then ps_alive=1; fi
-    
-    if [ "$1" = "check_alive"  -a  $ping_alive = 1 ] ||
-       [ "$1" = "check_dead"   -a  $ping_alive = 0  -a  $ps_alive = 0 ]; then
-	return 0 # EXIT_SUCCESS
-    else
-  	if [ "$2" = "warn" ]; then
-  	    echo -e "$ps_alive processes alive and '$MYADMIN ping' resulted in\n$ping_output\n" | $ERR_LOGGER -p daemon.debug
-	fi
-  	return 1 # EXIT_FAILURE
+  ps_alive=0
+  pidfile=`mysqld_get_param pid-file`
+  if [ -f "$pidfile" ] && ps `cat $pidfile` >/dev/null 2>&1; then ps_alive=1; fi
+
+  if [ "$1" = "check_alive"  -a  $ping_alive = 1 ] ||
+     [ "$1" = "check_dead"   -a  $ping_alive = 0  -a  $ps_alive = 0 ]; then
+    return 0 # EXIT_SUCCESS
+  else
+    if [ "$2" = "warn" ]; then
+      echo -e "$ps_alive processes alive and '$MYADMIN ping' resulted in\n$ping_output\n" | $ERR_LOGGER -p daemon.debug
    fi
+  return 1 # EXIT_FAILURE
+  fi
 }

 #
@@ -97,101 +98,96 @@ mysqld_status () {
 #

 case "${1:-''}" in
+
  'start')
-	sanity_checks;
-	# Start daemon
-	log_daemon_msg "Starting MariaDB database server" "mysqld"
-	if mysqld_status check_alive nowarn; then
-	   log_progress_msg "already running"
-	   log_end_msg 0
-	else
-	    # Could be removed during boot
-	    test -e /var/run/mysqld || install -m 755 -o mysql -g root -d /var/run/mysqld
+  sanity_checks;
+  # Start daemon
+  log_daemon_msg "Starting MariaDB database server" "mysqld"
+  if mysqld_status check_alive nowarn; then
+   log_progress_msg "already running"
+   log_end_msg 0
+  else
+    # Could be removed during boot
+    test -e /var/run/mysqld || install -m 755 -o mysql -g root -d /var/run/mysqld

-	    # Start MariaDB! 
-  	    /usr/bin/mysqld_safe "${@:2}" > /dev/null 2>&1 &
+    # Start MariaDB!
+    /usr/bin/mysqld_safe "${@:2}" 2>&1 >/dev/null | $ERR_LOGGER &

-	    # 6s was reported in #352070 to be too little
-	    for i in $(seq 1 "${MYSQLD_STARTUP_TIMEOUT:-60}"); do
-                sleep 1
-	        if mysqld_status check_alive nowarn ; then break; fi
-		log_progress_msg "."
-	    done
-	    if mysqld_status check_alive warn; then
-                log_end_msg 0
-	        # Now start mysqlcheck or whatever the admin wants.
-	        output=$(/etc/mysql/debian-start)
-		[ -n "$output" ] && log_action_msg "$output"
-	    else
-	        log_end_msg 1
-		log_failure_msg "Please take a look at the syslog"
-	    fi
-	fi
-	;;
+    for i in $(seq 1 "${MYSQLD_STARTUP_TIMEOUT:-30}"); do
+      sleep 1
+      if mysqld_status check_alive nowarn ; then break; fi
+      log_progress_msg "."
+    done
+    if mysqld_status check_alive warn; then
+      log_end_msg 0
+      # Now start mysqlcheck or whatever the admin wants.
+      output=$(/etc/mysql/debian-start)
+      if [ -n "$output" ]; then
+        log_action_msg "$output"
+      fi
+    else
+      log_end_msg 1
+      log_failure_msg "Please take a look at the syslog"
+    fi
+  fi
+  ;;

  'stop')
-	# * As a passwordless mysqladmin (e.g. via ~/.my.cnf) must be possible
-	# at least for cron, we can rely on it here, too. (although we have 
-	# to specify it explicit as e.g. sudo environments points to the normal
-	# users home and not /root)
-	log_daemon_msg "Stopping MariaDB database server" "mysqld"
-	if ! mysqld_status check_dead nowarn; then
-	  set +e
-	  shutdown_out=`$MYADMIN shutdown 2>&1`; r=$?
-	  set -e
-	  if [ "$r" -ne 0 ]; then
-	    log_end_msg 1
-	    [ "$VERBOSE" != "no" ] && log_failure_msg "Error: $shutdown_out"
-	    log_daemon_msg "Killing MariaDB database server by signal" "mysqld"
-	    killall -15 mysqld
-            server_down=
-	    for i in `seq 1 600`; do
-              sleep 1
-              if mysqld_status check_dead nowarn; then server_down=1; break; fi
-            done
-          if test -z "$server_down"; then killall -9 mysqld; fi
-	  fi
-        fi
+  # * As a passwordless mysqladmin (e.g. via ~/.my.cnf) must be possible
+  # at least for cron, we can rely on it here, too. (although we have
+  # to specify it explicit as e.g. sudo environments points to the normal
+  # users home and not /root)
+  log_daemon_msg "Stopping MariaDB database server" "mysqld"
+  if ! mysqld_status check_dead nowarn; then
+    set +e
+    shutdown_out=`$MYADMIN shutdown 2>&1`; r=$?
+    set -e
+    if [ "$r" -ne 0 ]; then
+      log_end_msg 1
+      [ "$VERBOSE" != "no" ] && log_failure_msg "Error: $shutdown_out"
+      log_daemon_msg "Killing MariaDB database server by signal" "mysqld"
+      killall -15 mysqld
+      server_down=
+      for i in `seq 1 600`; do
+        sleep 1
+        if mysqld_status check_dead nowarn; then server_down=1; break; fi
+      done
+      if test -z "$server_down"; then killall -9 mysqld; fi
+    fi
+  fi

-        if ! mysqld_status check_dead warn; then
-	  log_end_msg 1
-	  log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-10.2/README.Debian.gz!"
-	  exit -1
-	else
-	  log_end_msg 0
-        fi
-	;;
+  if ! mysqld_status check_dead warn; then
+    log_end_msg 1
+    log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-10.2/README.Debian.gz!"
+    exit -1
+  else
+    log_end_msg 0
+  fi
+  ;;

  'restart')
-	set +e; $SELF stop; set -e
-	$SELF start 
-	;;
+  set +e; $SELF stop; set -e
+  shift
+  $SELF start "${@}"
+  ;;

  'reload'|'force-reload')
-  	log_daemon_msg "Reloading MariaDB database server" "mysqld"
-	$MYADMIN reload
-	log_end_msg 0
-	;;
+  log_daemon_msg "Reloading MariaDB database server" "mysqld"
+  $MYADMIN reload
+  log_end_msg 0
+  ;;

  'status')
-	if mysqld_status check_alive nowarn; then
-	  log_action_msg "$($MYADMIN version)"
-	else
-	  log_action_msg "MariaDB is stopped."
-	  exit 3
-	fi
-  	;;
-
-  'bootstrap')
-	# Bootstrap the cluster, start the first node
-	# that initiates the cluster
-	log_daemon_msg "Bootstrapping the cluster" "mysqld"
-	$SELF start "${@:2}" --wsrep-new-cluster
-	;;
+  if mysqld_status check_alive nowarn; then
+    log_action_msg "$($MYADMIN version)"
+  else
+    log_action_msg "MariaDB is stopped."
+    exit 3
+  fi
+  ;;

  *)
-	echo "Usage: $SELF start|stop|restart|reload|force-reload|status|bootstrap"
-	exit 1
-	;;
+  echo "Usage: $SELF start|stop|restart|reload|force-reload|status"
+  exit 1
+  ;;
 esac
-
--- a/debian/mariadb-server-10.2.postinst
+++ b/debian/mariadb-server-10.2.postinst
@@ -4,7 +4,7 @@

 if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
 ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
- 
+
 export PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin

 # This command can be used as pipe to syslog. With "-s" it also logs to stderr.
@@ -55,83 +55,95 @@ EOF
 # In case the server wasn't running at all it should be ok if the stop
 # script fails. I can't tell at this point because of the cleaned /var/run.
 set +e; invoke stop; set -e
-    
+
 case "$1" in
  configure)
-    mysql_datadir=/usr/share/mysql
-    mysql_statedir=/var/lib/mysql
+    mysql_statedir=/usr/share/mysql
+    mysql_datadir=/var/lib/mysql
+    mysql_logdir=/var/log/mysql
    mysql_rundir=/var/run/mysqld
-    mysql_logdir=/var/log
    mysql_cfgdir=/etc/mysql
-    mysql_newlogdir=/var/log/mysql
    mysql_upgradedir=/var/lib/mysql-upgrade

-    # first things first, if the following symlink exists, it is a preserved
-    # copy the old data dir from a mysql upgrade that would have otherwise
-    # been replaced by an empty mysql dir.  this should restore it.
+    # If the following symlink exists, it is a preserved copy the old data dir
+    # created by the preinst script during a upgrade that would have otherwise
+    # been replaced by an empty mysql dir.  This should restore it.
    for dir in DATADIR LOGDIR; do
-        if [ "$dir" = "DATADIR" ]; then targetdir=$mysql_statedir; else targetdir=$mysql_newlogdir; fi
-        savelink="$mysql_upgradedir/$dir.link"
-        if [ -L "$savelink" ]; then
-            # If the targetdir was a symlink before we upgraded it is supposed
-            # to be either still be present or not existing anymore now.
-            if [ -L "$targetdir" ]; then
-                rm "$savelink"
-            elif [ ! -d "$targetdir" ]; then
-                mv "$savelink" "$targetdir"
-            else
-                # this should never even happen, but just in case...
-                mysql_tmp=`mktemp -d -t mysql-symlink-restore-XXXXXX`
-                echo "this is very strange!  see $mysql_tmp/README..." >&2
-                mv "$targetdir" "$mysql_tmp"
-                cat << EOF > "$mysql_tmp/README"

-if you're reading this, it's most likely because you had replaced /var/lib/mysql
+      if [ "$dir" = "DATADIR" ]; then
+        targetdir=$mysql_datadir
+      else
+        targetdir=$mysql_logdir
+      fi
+
+      savelink="$mysql_upgradedir/$dir.link"
+      if [ -L "$savelink" ]; then
+        # If the targetdir was a symlink before we upgraded it is supposed
+        # to be either still be present or not existing anymore now.
+        if [ -L "$targetdir" ]; then
+          rm "$savelink"
+        elif [ ! -d "$targetdir" ]; then
+          mv "$savelink" "$targetdir"
+        else
+          # this should never even happen, but just in case...
+          mysql_tmp=`mktemp -d -t mysql-symlink-restore-XXXXXX`
+          echo "this is very strange!  see $mysql_tmp/README..." >&2
+          mv "$targetdir" "$mysql_tmp"
+          cat << EOF > "$mysql_tmp/README"
+
+Ff you're reading this, it's most likely because you had replaced /var/lib/mysql
 with a symlink, then upgraded to a new version of mysql, and then dpkg
-removed your symlink (see #182747 and others).  the mysql packages noticed
-that this happened, and as a workaround have restored it.  however, because
+removed your symlink (see #182747 and others). The mysql packages noticed
+that this happened, and as a workaround have restored it. However, because
 /var/lib/mysql seems to have been re-created in the meantime, and because
-we don't want to rm -rf something we don't know as much about, we're going
-to leave this unexpected directory here.  if your database looks normal,
+we don't want to rm -rf something we don't know as much about, we are going
+to leave this unexpected directory here. If your database looks normal,
 and this is not a symlink to your database, you should be able to blow
 this all away.

 EOF
-            fi
        fi
-	rmdir $mysql_upgradedir 2>/dev/null || true
+      fi
+	    rmdir $mysql_upgradedir 2>/dev/null || true
+
    done
-    
+
    # Ensure the existence and right permissions for the database and
    # log files.
-    if [ ! -d "$mysql_statedir/mysql" -a ! -L "$mysql_statedir/mysql" ]; then
-      # Debian: beware of the bashisms...
-      /bin/bash /usr/bin/mysql_install_db --rpm --user=mysql --disable-log-bin 2>&1 | $ERR_LOGGER
-    fi
-    if [ ! -d "$mysql_newlogdir"      -a ! -L "$mysql_newlogdir"      ]; then mkdir "$mysql_newlogdir"; fi
+    if [ ! -d "$mysql_statedir" -a ! -L "$mysql_statedir" ]; then mkdir "$mysql_statedir"; fi
+    if [ ! -d "$mysql_datadir"  -a ! -L "$mysql_datadir" ]; then mkdir "$mysql_datadir" ; fi
+    if [ ! -d "$mysql_logdir"   -a ! -L "$mysql_logdir"  ]; then mkdir "$mysql_logdir"  ; fi
    # When creating an ext3 jounal on an already mounted filesystem like e.g.
    # /var/lib/mysql, you get a .journal file that is not modifyable by chown.
-    # The mysql_datadir must not be writable by the mysql user under any
+    # The mysql_statedir must not be writable by the mysql user under any
    # circumstances as it contains scripts that are executed by root.
    set +e
-    chown -R 0:0 $mysql_datadir
-    chown -R mysql $mysql_statedir
-    chown -R mysql $mysql_rundir
-    chown -R mysql:adm $mysql_newlogdir;	chmod 2750 $mysql_newlogdir;
-    for i in log err; do
-      touch             $mysql_logdir/mysql.$i
-      chown mysql:adm   $mysql_logdir/mysql.$i
-      chmod 0640        $mysql_logdir/mysql.$i
-    done
+    chown -R 0:0 $mysql_statedir
+    chown -R mysql $mysql_datadir
+    chown -R mysql:adm $mysql_logdir
+    chmod 2750 $mysql_logdir
    set -e

    # This is important to avoid dataloss when there is a removed
    # mysql-server version from Woody lying around which used the same
    # data directory and then somewhen gets purged by the admin.
-    db_set mysql-server/postrm_remove_database false || true
+    db_set mariadb-server/postrm_remove_database false || true
+
+    # Clean up old flags before setting new one
+    rm -f $mysql_datadir/debian-*.flag
+    # Flag data dir to avoid downgrades
+    touch $mysql_datadir/debian-10.2.flag
+
+    # initiate databases. Output is not allowed by debconf :-(
+    # This will fail if we are upgrading an existing database; in this case
+    # mysql_upgrade, called from the /etc/init.d/mysql start script, will
+    # handle things.
+    # Debian: beware of the bashisms...
+    # Debian: can safely run on upgrades with existing databases
+    set +e
+    bash /usr/bin/mysql_install_db --rpm --cross-bootstrap --user=mysql --disable-log-bin 2>&1 | $ERR_LOGGER
+    set -e

-    # To avoid downgrades.
-    touch $mysql_statedir/debian-10.2.flag
    
    ## On every reconfiguration the maintenance user is recreated.
    #
--- a/debian/mariadb-server-10.2.postrm
+++ b/debian/mariadb-server-10.2.postrm
@@ -1,9 +1,6 @@
 #!/bin/bash -e

-# It is possible that Debconf has already been removed, too.
-if [ -f /usr/share/debconf/confmodule ]; then
-  . /usr/share/debconf/confmodule
-fi
+. /usr/share/debconf/confmodule

 if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
 ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
@@ -46,41 +43,36 @@ esac
 #
 # - Do NOT purge logs or data if another mysql-sever* package is installed (#307473)
 # - Remove the mysql user only after all his owned files are purged.
-#   
+#
 if [ "$1" = "purge" -a ! \( -x /usr/sbin/mysqld -o -L /usr/sbin/mysqld \) ]; then
  # we remove the mysql user only after all his owned files are purged
  rm -f /var/log/mysql.{log,err}{,.0,.[1234567].gz}
  rm -rf /var/log/mysql

-  db_input high mysql-server-5.1/postrm_remove_databases || true
+  db_input high mariadb-server-10.2/postrm_remove_databases || true
  db_go || true
-  db_get mysql-server-5.1/postrm_remove_databases || true
+  db_get mariadb-server-10.2/postrm_remove_databases || true
  if [ "$RET" = "true" ]; then
    # never remove the debian.cnf when the databases are still existing
    # else we ran into big trouble on the next install!
    rm -f /etc/mysql/debian.cnf
-    rm -rf /var/lib/mysql
-    rm -rf /var/run/mysqld
+    # Remove all contents from /var/lib/mysql except if it's a
+    # directory with file system data. See #829491 for details and
+    # #608938 for potential mysql-server leftovers which erroneously
+    # had been renamed.
+    find /var/lib/mysql -mindepth 1 \
+         -not -path '*/lost+found/*'     -not -name 'lost+found' \
+         -not -path '*/lost@002bfound/*' -not -name 'lost@002bfound' \
+         -delete
+    # "|| true" still needed as rmdir still exits with non-zero if
+    # /var/lib/mysql is a mount point
+    rmdir --ignore-fail-on-non-empty /var/lib/mysql || true
+    rm -rf /var/run/mysqld # this directory is created by the init script, don't leave behind
    userdel mysql || true
  fi

-  # (normally) Automatically added by dh_installinit
-  if [ "$1" = "purge" ] ; then
-        update-rc.d mysql remove >/dev/null || exit 0
-  fi
-  # (normally) End automatically added section
 fi

-# (normally) Automatically added by dh_installdebconf
-if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then
-        . /usr/share/debconf/confmodule
-        db_purge
-fi
-# (normally) End automatically added section
-
-if [ "$1" = "purge" ] ; then
-     rm -f /etc/apparmor.d/force-complain/usr.sbin.mysqld >/dev/null 2>&1 || true
-fi
-# no DEBHELPER here, "update-rc.d remove" fails if mysql-server-5.1 is installed
+#DEBHELPER#

 exit 0
--- a/debian/mariadb-server-10.2.preinst
+++ b/debian/mariadb-server-10.2.preinst
@@ -14,9 +14,8 @@ ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }

 export PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin
 MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
-DATADIR=/var/lib/mysql
-LOGDIR=/var/log/mysql
-UPGRADEDIR=/var/lib/mysql-upgrade
+mysql_datadir=/var/lib/mysql
+mysql_upgradedir=/var/lib/mysql-upgrade

 # Try to stop the server in a sane way. If it does not success let the admin
 # do it himself. No database directories should be removed while the server
@@ -33,13 +32,13 @@ stop_server() {
    $cmd
    errno=$?
    set -e
-   
+
    # 0=ok, 100=no init script (fresh install)
    if [ "$errno" != 0 -a "$errno" != 100 ]; then
      echo "${cmd/ */} returned $errno" 1>&2
      echo "There is a MySQL server running, but we failed in our attempts to stop it." 1>&2
      echo "Stop it yourself and try again!" 1>&2
-      db_stop  	
+      db_stop
      exit 1
    fi
 }
@@ -47,31 +46,80 @@ stop_server() {
 ################################ main() ##########################

 this_version=10.2
+max_upgradeable_version=5.6

-# Safe the user from stupidities.
-show_downgrade_warning=0
-for i in `ls $DATADIR/debian-*.flag 2>/dev/null`; do
-  found_version=`echo $i | sed 's/.*debian-\([0-9\.]\+\).flag/\1/'`
-  if dpkg --compare-versions "$this_version" '<<' "$found_version"; then
-    show_downgrade_warning=1
-    break;
+# Check if a flag file is found that indicates a previous MariaDB or MySQL
+# version was installed. If multiple flags are found, check which one was
+# the biggest version number.
+for flag in $mysql_datadir/debian-*.flag
+do
+
+  # The for loop leaves $flag as the query string if there are no results,
+  # so the check below is needed to stop further processing when there are
+  # no real results.
+  if [ $flag = "$mysql_datadir/debian-*.flag" ]
+  then
+    break
  fi
+
+  flag_version=`echo $flag | sed 's/.*debian-\([0-9\.]\+\).flag/\1/'`
+
+  # Initialize value if empty
+  if [ -z "$found_version" ]
+  then
+    found_version=$flag_version
+  fi
+
+  # Update value if now bigger then before
+  if dpkg --compare-versions "$flag_version" '>>' "$found_version"
+  then
+    found_version=$flag_version
+  fi
+
 done
-if [ "$show_downgrade_warning" = 1 ]; then
-  db_fset mariadb-server-$this_version/really_downgrade seen false || true
-  db_input medium mariadb-server-$this_version/really_downgrade || true
-  db_go
-  db_get mariadb-server-$this_version/really_downgrade || true
-  if [ "$RET" = "true" ]; then
-    rm -f $DATADIR/debian-*.flag
-    touch $DATADIR/debian-$this_version.flag
-  else
-    echo "Aborting downgrade from (at least) $found_version to $this_version." 1>&2
-    echo "If are sure you want to downgrade to $this_version, remove the file" 1>&2
-    echo "$DATADIR/debian-*.flag and try installing again." 1>&2
-    db_stop
-    exit 1
+
+
+# If an upgrade is detected, proceed with it automatically without
+# requiring any user interaction.
+#
+# However, if the user attempts to downgrade, warn about the incompatibility.
+# Downgrade is detected if the flag version is bigger than $this_version
+# (e.g. 10.1 > 10.0) or the flag version is smaller than 10.0 but bigger
+# than $max_upgradeable_version.
+if [ ! -z "$found_version" ]
+then
+
+  echo "$mysql_datadir: found previous version $found_version"
+
+  if dpkg --compare-versions "$found_version" '>>' "$this_version"
+  then
+    downgrade_detected=true
  fi
+
+  if dpkg --compare-versions "$found_version" '>>' "$max_upgradeable_version" \
+  && dpkg --compare-versions "$found_version" '<<' "10.0"
+  then
+    downgrade_detected=true
+  fi
+
+fi
+
+
+# Don't abort dpkg if downgrade is detected (as was done previously).
+# Instead simply move the old datadir and create a new for this_version.
+if [ ! -z "$downgrade_detected" ]
+then
+  db_input critical mariadb-server-10.2/old_data_directory_saved || true
+  db_go
+  echo "The file $mysql_datadir/debian-$found_version.flag indicates a" 1>&2
+  echo "version that cannot automatically be upgraded. Therefore the" 1>&2
+  echo "previous data directory will be renamed to $mysql_datadir-$found_version and" 1>&2
+  echo "a new data directory will be initialized at $mysql_datadir." 1>&2
+  echo "Please manually export/import your data (e.g. with mysqldump) if needed." 1>&2
+  mv -f $mysql_datadir $mysql_datadir-$found_version
+  # Also move away the old debian.cnf file that included credentials that are
+  # no longer valid
+  mv -f /etc/mysql/debian.cnf /etc/mysql/debian.cnf-$found_version
 fi

 # to be sure
@@ -86,9 +134,9 @@ fi

 #
 # Now we have to ensure the following state:
-# /etc/passwd: mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false
+# /etc/passwd: mysql:x:100:101:MySQL Server:/nonexistent:/bin/false
 # /etc/group:  mysql:x:101:
-# 
+#
 # Sadly there could any state be present on the system so we have to
 # modify everything carefully i.e. not doing a chown before creating
 # the user etc...
@@ -107,7 +155,8 @@ if ! getent passwd mysql >/dev/null; then
 	  --system \
          --disabled-login \
 	  --ingroup mysql \
-	  --home $DATADIR \
+	  --no-create-home \
+	  --home /nonexistent \
 	  --gecos "MySQL Server" \
 	  --shell /bin/false \
 	  mysql  >/dev/null
@@ -121,47 +170,36 @@ set -e
 for dir in DATADIR LOGDIR; do
    checkdir=`eval echo "$"$dir`
    if [ -L "$checkdir" ]; then
-	mkdir -p "$UPGRADEDIR"
-	cp -d "$checkdir" "$UPGRADEDIR/$dir.link"
+	mkdir -p "$mysql_upgradedir"
+	cp -dT "$checkdir" "$mysql_upgradedir/$dir.link"
    fi
 done

 # creating mysql home directory
-if [ ! -d $DATADIR -a ! -L $DATADIR ]; then
- 	mkdir $DATADIR
+if [ ! -d $mysql_datadir -a ! -L $mysql_datadir ]; then
+ 	mkdir $mysql_datadir
 fi

 # checking disc space
-if LC_ALL=C BLOCKSIZE= df --portability $DATADIR/. | tail -n 1 | awk '{ exit ($4>1000) }'; then
-  echo "ERROR: There's not enough space in $DATADIR/" 1>&2
+if LC_ALL=C BLOCKSIZE= df --portability $mysql_datadir/. | tail -n 1 | awk '{ exit ($4>1000) }'; then
+  echo "ERROR: There's not enough space in $mysql_datadir/" 1>&2
  db_stop
  exit 1
 fi

 # Since the home directory was created before putting the user into
-# the mysql group and moreover we cannot guarantee that the 
+# the mysql group and moreover we cannot guarantee that the
 # permissions were correctly *before* calling this script, we fix them now.
 # In case we use NIS and no mysql user is present then this script should
 # better fail now than later..
 # The "set +e" is necessary as e.g. a ".journal" of a ext3 partition is
 # not chgrp'able (#318435).
 set +e
-chown mysql:mysql $DATADIR
-find $DATADIR -follow -not -group mysql -print0 2>/dev/null \
+chown mysql:mysql $mysql_datadir
+find $mysql_datadir -follow -not -group mysql -print0 2>/dev/null \
  | xargs -0 --no-run-if-empty chgrp mysql
 set -e

-# Some files below /etc/ were possibly in the mysql-server-5.0/etch package
-# before. They get overwritten by current ones to avoid unnecessary dpkg questions.
-while read md5 file; do
-  if [ "`md5sum $file 2>/dev/null`" = "$md5  $file" ]; then
-    cp /usr/share/mysql-common/internal-use-only/`echo $file | sed 's<>/<2F>_<EFBFBD>g'` $file
-  fi
-done <<EOT
-6691f2fdc5c6d27ff0260eb79813e1bc  /etc/init.d/mysql
-b53b9552d44661361d39157c3c7c51d3  /etc/logrotate.d/mysql-server
-57f3e58f72582ca55100dc1ba0f1a8ae  /etc/mysql/debian-start
-EOT

 db_stop

--- a/debian/mariadb-server-10.2.prerm
+++ b/debian/mariadb-server-10.2.prerm
@@ -1,4 +1,6 @@
-#!/bin/bash -e
+#!/bin/bash
+
+set -e

 . /usr/share/debconf/confmodule

--- a/debian/mariadb-server-10.2.templates
+++ b/debian/mariadb-server-10.2.templates
@@ -7,19 +7,19 @@
 # Even minor modifications require translation updates and such
 # changes should be coordinated with translators and reviewers.

-Template: mariadb-server-10.2/really_downgrade
-Type: boolean
-Default: false
-_Description: Really proceed with downgrade?
+Template: mariadb-server-10.2/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.
+ The number indicates a database binary format version that cannot automatically
+ be upgraded (or downgraded).
 .
- Such a file is an indication that a mariadb-server package with a higher
- version has been installed previously.
+ Therefore the previous data directory will be renamed to /var/lib/mysql-* and
+ a new data directory will be initialized at /var/lib/mysql.
 .
- There is no guarantee that the version you're currently installing
- will be able to use the current databases.
+ Please manually export/import your data (e.g. with mysqldump) if needed.

-Template: mysql-server-5.1/nis_warning
+Template: mariadb-server-10.2/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: mysql-server-5.1/postrm_remove_databases
+Template: mariadb-server-10.2/postrm_remove_databases
 Type: boolean
 Default: false
 _Description: Remove all MariaDB databases?
@@ -44,13 +44,6 @@ _Description: Remove all MariaDB databases?
 recent version or if a different mariadb-server package is already
 using it, the data should be kept.

-Template: mysql-server-5.1/start_on_boot
-Type: boolean
-Default: true
-_Description: Start the MariaDB server on boot?
- The MariaDB server can be launched automatically at boot time or manually
- with the '/etc/init.d/mysql start' command.
-
 Template: mysql-server/root_password
 Type: password
 _Description: New password for the MariaDB "root" user:
--- a/debian/mariadb-server-core-10.2.install
+++ b/debian/mariadb-server-core-10.2.install
@@ -1,5 +1,6 @@
+usr/bin/innochecksum
+usr/bin/mysql_upgrade
 usr/sbin/mysqld
-usr/share/man/man8/mysqld.8
 usr/share/mysql/charsets
 usr/share/mysql/czech
 usr/share/mysql/danish
--- a/debian/mariadb-server-core-10.2.manpages
+++ b/debian/mariadb-server-core-10.2.manpages
@@ -0,0 +1,3 @@
+debian/tmp/usr/share/man/man8/mysqld.8
+debian/tmp/usr/share/man/man1/innochecksum.1
+debian/tmp/usr/share/man/man1/mysql_upgrade.1
--- a/debian/mariadb-test-10.2.dirs
+++ b/debian/mariadb-test-10.2.dirs
@@ -1,80 +0,0 @@
-usr/bin
-usr/share/man/man1
-usr/share/mysql/mysql-test
-usr/share/mysql/mysql-test/extra
-usr/share/mysql/mysql-test/extra/binlog_tests
-usr/share/mysql/mysql-test/extra/rpl_tests
-usr/share/mysql/mysql-test/lib
-usr/share/mysql/mysql-test/lib/My
-usr/share/mysql/mysql-test/lib/My/SafeProcess
-usr/share/mysql/mysql-test/lib/My/File
-usr/share/mysql/mysql-test/lib/v1
-usr/share/mysql/mysql-test/lib/v1/My
-usr/share/mysql/mysql-test/collections
-usr/share/mysql/mysql-test/t
-usr/share/mysql/mysql-test/r
-usr/share/mysql/mysql-test/include
-usr/share/mysql/mysql-test/suite
-usr/share/mysql/mysql-test/suite/parts
-usr/share/mysql/mysql-test/suite/parts/inc
-usr/share/mysql/mysql-test/suite/parts/t
-usr/share/mysql/mysql-test/suite/parts/r
-usr/share/mysql/mysql-test/suite/bugs
-usr/share/mysql/mysql-test/suite/bugs/t
-usr/share/mysql/mysql-test/suite/bugs/r
-usr/share/mysql/mysql-test/suite/bugs/data
-usr/share/mysql/mysql-test/suite/rpl
-usr/share/mysql/mysql-test/suite/rpl/t
-usr/share/mysql/mysql-test/suite/rpl/r
-usr/share/mysql/mysql-test/suite/rpl/include
-usr/share/mysql/mysql-test/suite/innodb
-usr/share/mysql/mysql-test/suite/innodb/t
-usr/share/mysql/mysql-test/suite/innodb/r
-usr/share/mysql/mysql-test/suite/innodb/include
-usr/share/mysql/mysql-test/suite/manual
-usr/share/mysql/mysql-test/suite/manual/t
-usr/share/mysql/mysql-test/suite/manual/r
-usr/share/mysql/mysql-test/suite/stress
-usr/share/mysql/mysql-test/suite/stress/t
-usr/share/mysql/mysql-test/suite/stress/r
-usr/share/mysql/mysql-test/suite/stress/include
-usr/share/mysql/mysql-test/suite/jp
-usr/share/mysql/mysql-test/suite/jp/t
-usr/share/mysql/mysql-test/suite/jp/r
-usr/share/mysql/mysql-test/suite/jp/include
-usr/share/mysql/mysql-test/suite/jp/std_data
-usr/share/mysql/mysql-test/suite/maria
-usr/share/mysql/mysql-test/suite/funcs_2
-usr/share/mysql/mysql-test/suite/funcs_2/lib
-usr/share/mysql/mysql-test/suite/funcs_2/t
-usr/share/mysql/mysql-test/suite/funcs_2/charset
-usr/share/mysql/mysql-test/suite/funcs_2/r
-usr/share/mysql/mysql-test/suite/funcs_2/include
-usr/share/mysql/mysql-test/suite/funcs_2/data
-usr/share/mysql/mysql-test/suite/binlog
-usr/share/mysql/mysql-test/suite/binlog/t
-usr/share/mysql/mysql-test/suite/binlog/r
-usr/share/mysql/mysql-test/suite/binlog/std_data
-usr/share/mysql/mysql-test/suite/federated
-usr/share/mysql/mysql-test/suite/funcs_1
-usr/share/mysql/mysql-test/suite/funcs_1/cursors
-usr/share/mysql/mysql-test/suite/funcs_1/bitdata
-usr/share/mysql/mysql-test/suite/funcs_1/views
-usr/share/mysql/mysql-test/suite/funcs_1/storedproc
-usr/share/mysql/mysql-test/suite/funcs_1/triggers
-usr/share/mysql/mysql-test/suite/funcs_1/lib
-usr/share/mysql/mysql-test/suite/funcs_1/t
-usr/share/mysql/mysql-test/suite/funcs_1/r
-usr/share/mysql/mysql-test/suite/funcs_1/include
-usr/share/mysql/mysql-test/suite/funcs_1/datadict
-usr/share/mysql/mysql-test/suite/vcol
-usr/share/mysql/mysql-test/suite/vcol/inc
-usr/share/mysql/mysql-test/suite/vcol/t
-usr/share/mysql/mysql-test/suite/vcol/r
-usr/share/mysql/mysql-test/suite/oqgraph
-usr/share/mysql/mysql-test/suite/oqgraph/t
-usr/share/mysql/mysql-test/suite/oqgraph/r
-usr/share/mysql/mysql-test/suite/oqgraph/include
-usr/share/mysql/mysql-test/std_data
-usr/share/mysql/mysql-test/std_data/parts
-usr/share/mysql/mysql-test/std_data/funcs_1
--- a/debian/mariadb-test-data.install
+++ b/debian/mariadb-test-data.install
@@ -0,0 +1,9 @@
+usr/share/mysql/mysql-test/collections
+usr/share/mysql/mysql-test/extra
+usr/share/mysql/mysql-test/include
+usr/share/mysql/mysql-test/plugin
+usr/share/mysql/mysql-test/r
+usr/share/mysql/mysql-test/std_data
+usr/share/mysql/mysql-test/suite
+usr/share/mysql/mysql-test/t
+usr/share/mysql/mysql-test/unstable-tests
--- a/debian/mariadb-test-10.2.files
+++ b/debian/mariadb-test-10.2.files
@@ -1,23 +1,28 @@
-usr/lib/mysql/plugin/debug_key_management.so
-usr/lib/mysql/plugin/example_key_management.so
-usr/lib/mysql/plugin/dialog_examples.so
-usr/lib/mysql/plugin/auth_test_plugin.so
-usr/lib/mysql/plugin/qa_auth_interface.so
-usr/lib/mysql/plugin/qa_auth_server.so
-usr/lib/mysql/plugin/qa_auth_client.so
-usr/lib/mysql/plugin/auth_0x0100.so
-usr/lib/mysql/plugin/mypluglib.so
-usr/lib/mysql/plugin/ha_test_sql_discovery.so
-usr/lib/mysql/plugin/ha_example.so
-usr/lib/mysql/plugin/daemon_example.ini
-usr/lib/mysql/plugin/libdaemon_example.so
-usr/lib/mysql/plugin/adt_null.so
 usr/bin/mysql_client_test
 usr/bin/mysql_client_test_embedded
-usr/bin/mysqltest_embedded
-usr/share/man/man1/mysql_client_test.1
-usr/share/man/man1/mysql_client_test_embedded.1
 usr/bin/mysqltest
-usr/share/man/man1/mysqltest.1
-usr/share/man/man1/mysqltest_embedded.1
-usr/share/mysql/mysql-test
+usr/bin/mysqltest_embedded
+usr/lib/mysql/plugin/adt_null.so
+usr/lib/mysql/plugin/auth_0x0100.so
+usr/lib/mysql/plugin/auth_test_plugin.so
+usr/lib/mysql/plugin/daemon_example.ini
+usr/lib/mysql/plugin/debug_key_management.so
+usr/lib/mysql/plugin/dialog_examples.so
+usr/lib/mysql/plugin/example_key_management.so
+usr/lib/mysql/plugin/ha_example.so
+usr/lib/mysql/plugin/ha_test_sql_discovery.so
+usr/lib/mysql/plugin/libdaemon_example.so
+usr/lib/mysql/plugin/mypluglib.so
+usr/lib/mysql/plugin/qa_auth_client.so
+usr/lib/mysql/plugin/qa_auth_interface.so
+usr/lib/mysql/plugin/qa_auth_server.so
+usr/share/mysql/mysql-test/README
+usr/share/mysql/mysql-test/README.gcov
+usr/share/mysql/mysql-test/README.stress
+usr/share/mysql/mysql-test/disabled.def
+usr/share/mysql/mysql-test/lib
+usr/share/mysql/mysql-test/mysql-stress-test.pl
+usr/share/mysql/mysql-test/mysql-test-run.pl
+usr/share/mysql/mysql-test/purify.supp
+usr/share/mysql/mysql-test/suite.pm
+usr/share/mysql/mysql-test/valgrind.supp
--- a/debian/mariadb-test-10.2.links
+++ b/debian/mariadb-test-10.2.links
--- a/debian/mariadb-test.manpages
+++ b/debian/mariadb-test.manpages
@@ -0,0 +1,4 @@
+debian/tmp/usr/share/man/man1/mysql_client_test.1
+debian/tmp/usr/share/man/man1/mysql_client_test_embedded.1
+debian/tmp/usr/share/man/man1/mysqltest.1
+debian/tmp/usr/share/man/man1/mysqltest_embedded.1
--- a/debian/mysql-common.files
+++ b/debian/mysql-common.files
@@ -1,2 +0,0 @@
-etc/mysql/my.cnf
-usr/share/mysql-common/internal-use-only
--- a/debian/mysql-common.install
+++ b/debian/mysql-common.install
@@ -0,0 +1,2 @@
+debian/additions/my.cnf etc/mysql
+usr/share/mysql-common/internal-use-only
--- a/debian/po/ar.po
+++ b/debian/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: templates\n"
 "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
-"POT-Creation-Date: 2012-01-12 13:08+0100\n"
+"POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2007-05-01 13:04+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -25,40 +25,35 @@ msgstr ""
 ": n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 ": n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
-msgid "Really proceed with downgrade?"
-msgstr "هل فعلاً تريد التثبيط؟"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
-msgstr "هناك ملف مسمى /var/lib/mysql/debian-*.flag موجود على هذا النظام."
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Such file is an indication that a mariadb-server package with a higher "
-#| "version has been installed earlier."
-msgid ""
-"Such a file is an indication that a mariadb-server package with a higher "
-"version has been installed previously."
+msgid "The old data directory will be saved at new location"
 msgstr ""
-"هذا الملف دلالة على أن نسخة أحدث من حزمة mariadb-server تم تثبيتها مسبقاً."

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"There is no guarantee that the version you're currently installing will be "
-"able to use the current databases."
+"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
+"indicates a database binary format version that cannot automatically be "
+"upgraded (or downgraded)."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.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."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.templates:2001
+msgid ""
+"Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
-"ليست هناك أية ضمانة أن النسخة التي تقوم بتثبيتها ستكون قادرة على استخدام "
-"قواعد البيانات الحالية."

 #. Type: note
 #. Description
@@ -111,31 +106,15 @@ msgstr ""
 "إن كنت تقوم بإزالة حزمة MariaDB كي تقوم لاحقاً بتثبيت نسخة أحدث أو إن كانت "
 "حزمة mariadb-server مختلفة تستخدمها، فيجب إبقاء البيانات."

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid "Start the MariaDB server on boot?"
-msgstr "تشغيل خادم MariaDB عند الإقلاع؟"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid ""
-"The MariaDB server can be launched automatically at boot time or manually "
-"with the '/etc/init.d/mysql start' command."
-msgstr ""
-"يمكن تشغيل خادم MariaDB آلياً وقت الإقلاع أو يدوياً باستخدام الأمر '/etc/init."
-"d/mysql start'."
-
 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "كلمة المرور الجديدة لمستخد \"root\" الخاص بـMariaDB:"

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -145,7 +124,7 @@ msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 #, fuzzy
 #| msgid "If that field is left blank, the password will not be changed."
 msgid "If this field is left blank, the password will not be changed."
@@ -153,7 +132,7 @@ msgstr "إن ترك الحقل فارغاً، فلن يتم تغيير كلمة

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:7001
+#: ../mariadb-server-10.2.templates:6001
 #, fuzzy
 #| msgid "New password for the MariaDB \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -161,13 +140,13 @@ msgstr "كلمة المرور الجديدة لمستخد \"root\" الخاص ب

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "تعذر تعيين كلمة مرور للمستخدم \"root\" الخاص بـMariaDB."

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -179,7 +158,7 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 #, fuzzy
 #| msgid ""
 #| "You should check the account's password after tha package installation."
@@ -188,7 +167,7 @@ msgstr "يجب عليك التحقق من كلمة مرور الحساب عقب

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 #, fuzzy
 #| msgid ""
 #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for "
@@ -197,21 +176,54 @@ msgid ""
 "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for "
 "more information."
 msgstr ""
-"الرجاء قراءة الملف /usr/share/doc/mariadb-server-10.2/README.Debian للمزيد من "
-"المعلومات."
+"الرجاء قراءة الملف /usr/share/doc/mariadb-server-10.2/README.Debian للمزيد "
+"من المعلومات."

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "Password input error"
 msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""

+#~ msgid "Really proceed with downgrade?"
+#~ msgstr "هل فعلاً تريد التثبيط؟"
+
+#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
+#~ msgstr "هناك ملف مسمى /var/lib/mysql/debian-*.flag موجود على هذا النظام."
+
+#, fuzzy
+#~| msgid ""
+#~| "Such file is an indication that a mariadb-server package with a higher "
+#~| "version has been installed earlier."
+#~ msgid ""
+#~ "Such a file is an indication that a mariadb-server package with a higher "
+#~ "version has been installed previously."
+#~ msgstr ""
+#~ "هذا الملف دلالة على أن نسخة أحدث من حزمة mariadb-server تم تثبيتها مسبقاً."
+
+#~ msgid ""
+#~ "There is no guarantee that the version you're currently installing will "
+#~ "be able to use the current databases."
+#~ msgstr ""
+#~ "ليست هناك أية ضمانة أن النسخة التي تقوم بتثبيتها ستكون قادرة على استخدام "
+#~ "قواعد البيانات الحالية."
+
+#~ msgid "Start the MariaDB server on boot?"
+#~ msgstr "تشغيل خادم MariaDB عند الإقلاع؟"
+
+#~ msgid ""
+#~ "The MariaDB server can be launched automatically at boot time or manually "
+#~ "with the '/etc/init.d/mysql start' command."
+#~ msgstr ""
+#~ "يمكن تشغيل خادم MariaDB آلياً وقت الإقلاع أو يدوياً باستخدام الأمر '/etc/"
+#~ "init.d/mysql start'."
+
 #~ msgid ""
 #~ "To use MariaDB, the following entries for users and groups should be "
 #~ "added to the system:"
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-4.1\n"
 "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
-"POT-Creation-Date: 2012-01-12 13:08+0100\n"
+"POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2004-01-31 19:20GMT\n"
 "Last-Translator: Aleix Badia i Bosch <abadia@ica.es>\n"
 "Language-Team: Debian L10n Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -15,32 +15,34 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
-msgid "Really proceed with downgrade?"
+msgid "The old data directory will be saved at new location"
 msgstr ""

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
-msgstr ""
-
-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"Such a file is an indication that a mariadb-server package with a higher "
-"version has been installed previously."
+"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
+"indicates a database binary format version that cannot automatically be "
+"upgraded (or downgraded)."
 msgstr ""

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"There is no guarantee that the version you're currently installing will be "
-"able to use the current databases."
+"Therefore the previous data directory will be renamed to /var/lib/mysql-* "
+"and a new data directory will be initialized at /var/lib/mysql."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.templates:2001
+msgid ""
+"Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""

 #. Type: note
@@ -90,35 +92,15 @@ msgid ""
 "the data should be kept."
 msgstr ""

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-#, fuzzy
-#| msgid "Should MySQL start on boot?"
-msgid "Start the MariaDB server on boot?"
-msgstr "Voleu que el MariaDB s'inici<63> a l'arrencada ?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-#, fuzzy
-msgid ""
-"The MariaDB server can be launched automatically at boot time or manually "
-"with the '/etc/init.d/mysql start' command."
-msgstr ""
-"El MariaDB es pot executar a l'arrencada o nom<6F>s si executeu manualment '/"
-"etc/init.d/mysql start'. Seleccioneu 's<>' si voleu que s'inicialitzi "
-"autom<6F>ticament."
-
 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -126,25 +108,25 @@ msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:7001
+#: ../mariadb-server-10.2.templates:6001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -153,13 +135,13 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid ""
 "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for "
 "more information."
@@ -167,16 +149,30 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "Password input error"
 msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""

+#, fuzzy
+#~| msgid "Should MySQL start on boot?"
+#~ msgid "Start the MariaDB server on boot?"
+#~ msgstr "Voleu que el MariaDB s'inici<63> a l'arrencada ?"
+
+#, fuzzy
+#~ msgid ""
+#~ "The MariaDB server can be launched automatically at boot time or manually "
+#~ "with the '/etc/init.d/mysql start' command."
+#~ msgstr ""
+#~ "El MariaDB es pot executar a l'arrencada o nom<6F>s si executeu manualment '/"
+#~ "etc/init.d/mysql start'. Seleccioneu 's<>' si voleu que s'inicialitzi "
+#~ "autom<6F>ticament."
+
 #, fuzzy
 #~ msgid ""
 #~ "To use mysql you must install an equivalent user and group to the "
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1\n"
 "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
-"POT-Creation-Date: 2012-01-12 13:08+0100\n"
+"POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2007-05-01 13:01+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -24,40 +24,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
-msgid "Really proceed with downgrade?"
-msgstr "Opravdu pokračovat v degradaci?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
-msgstr "V systému existuje soubor /var/lib/mysql/debian-*.flag."
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Such file is an indication that a mariadb-server package with a higher "
-#| "version has been installed earlier."
-msgid ""
-"Such a file is an indication that a mariadb-server package with a higher "
-"version has been installed previously."
+msgid "The old data directory will be saved at new location"
 msgstr ""
-"To znamená, že již byl nainstalován balík mariadb-server s vyšší verzí."

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"There is no guarantee that the version you're currently installing will be "
-"able to use the current databases."
+"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
+"indicates a database binary format version that cannot automatically be "
+"upgraded (or downgraded)."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.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."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.templates:2001
+msgid ""
+"Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
-"Neexistuje žádná záruka, že momentálně instalovaná verze bude umět pracovat "
-"se stávajícími databázemi."

 #. Type: note
 #. Description
@@ -114,31 +109,15 @@ msgstr ""
 "MariaDB, nebo pokud tato data souběžně využívá jiný balík mariadb-server, "
 "měli byste data ponechat."

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid "Start the MariaDB server on boot?"
-msgstr "Spustit MariaDB server při startu systému?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid ""
-"The MariaDB server can be launched automatically at boot time or manually "
-"with the '/etc/init.d/mysql start' command."
-msgstr ""
-"MariaDB se může spouštět automaticky při startu systému, nebo ručně příkazem "
-"'/etc/init.d/mysql start'."
-
 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Nové heslo MariaDB uživatele \"root\":"

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -148,7 +127,7 @@ msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 #, fuzzy
 #| msgid "If that field is left blank, the password will not be changed."
 msgid "If this field is left blank, the password will not be changed."
@@ -156,7 +135,7 @@ msgstr "Ponecháte-li pole prázdné, heslo se nezmění."

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:7001
+#: ../mariadb-server-10.2.templates:6001
 #, fuzzy
 #| msgid "New password for the MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -164,13 +143,13 @@ msgstr "Nové heslo MariaDB uživatele \"root\":"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "Nelze nastavit heslo MariaDB uživatele \"root\""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -182,7 +161,7 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 #, fuzzy
 #| msgid ""
 #| "You should check the account's password after tha package installation."
@@ -191,7 +170,7 @@ msgstr "Po instalaci balíku byste měli heslo ověřit."

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 #, fuzzy
 #| msgid ""
 #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for "
@@ -204,16 +183,49 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "Password input error"
 msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""

+#~ msgid "Really proceed with downgrade?"
+#~ msgstr "Opravdu pokračovat v degradaci?"
+
+#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
+#~ msgstr "V systému existuje soubor /var/lib/mysql/debian-*.flag."
+
+#, fuzzy
+#~| msgid ""
+#~| "Such file is an indication that a mariadb-server package with a higher "
+#~| "version has been installed earlier."
+#~ msgid ""
+#~ "Such a file is an indication that a mariadb-server package with a higher "
+#~ "version has been installed previously."
+#~ msgstr ""
+#~ "To znamená, že již byl nainstalován balík mariadb-server s vyšší verzí."
+
+#~ msgid ""
+#~ "There is no guarantee that the version you're currently installing will "
+#~ "be able to use the current databases."
+#~ msgstr ""
+#~ "Neexistuje žádná záruka, že momentálně instalovaná verze bude umět "
+#~ "pracovat se stávajícími databázemi."
+
+#~ msgid "Start the MariaDB server on boot?"
+#~ msgstr "Spustit MariaDB server při startu systému?"
+
+#~ msgid ""
+#~ "The MariaDB server can be launched automatically at boot time or manually "
+#~ "with the '/etc/init.d/mysql start' command."
+#~ msgstr ""
+#~ "MariaDB se může spouštět automaticky při startu systému, nebo ručně "
+#~ "příkazem '/etc/init.d/mysql start'."
+
 #~ msgid ""
 #~ "To use MariaDB, the following entries for users and groups should be "
 #~ "added to the system:"
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-4.1\n"
 "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
-"POT-Creation-Date: 2012-01-12 13:08+0100\n"
+"POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2007-05-30 22:41+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
 "Language-Team: Danish\n"
@@ -25,42 +25,35 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
-msgid "Really proceed with downgrade?"
-msgstr "<22>nsker du virkelig at forts<74>tte nedgraderingen?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
+msgid "The old data directory will be saved at new location"
 msgstr ""
-"Der er en fil med navnet  /var/lib/mysql/debian-*.flag p<> dette system."

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Such file is an indication that a mariadb-server package with a higher "
-#| "version has been installed earlier."
-msgid ""
-"Such a file is an indication that a mariadb-server package with a higher "
-"version has been installed previously."
-msgstr ""
-"S<>dan en fil tyder p<> at der tidligere har v<>ret installeret en h<>jere "
-"version af mariadb-server-pakken."
-
-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"There is no guarantee that the version you're currently installing will be "
-"able to use the current databases."
+"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
+"indicates a database binary format version that cannot automatically be "
+"upgraded (or downgraded)."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.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."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.templates:2001
+msgid ""
+"Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
-"Det kan ikke garanteres at den version, du er ved at installere, kan benytte "
-"data fra de eksisterende databaser."

 #. Type: note
 #. Description
@@ -117,31 +110,15 @@ msgstr ""
 "eller hvis en anden mariadb-server-pakke allerede benytter den, b<>r dataene "
 "bevares."

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid "Start the MariaDB server on boot?"
-msgstr "Start MariaDB-serveren under systemopstart?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid ""
-"The MariaDB server can be launched automatically at boot time or manually "
-"with the '/etc/init.d/mysql start' command."
-msgstr ""
-"MariaDB-serveren kan enten startes op automatisk under systemopstarten, "
-"eller manuelt med kommandoen '/etc/init.d/mysql start'."
-
 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Ny adgangskode for MariaDB's \"root\"-bruger:"

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -151,7 +128,7 @@ msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 #, fuzzy
 #| msgid "If that field is left blank, the password will not be changed."
 msgid "If this field is left blank, the password will not be changed."
@@ -159,7 +136,7 @@ msgstr "Hvis du lader dette felt st

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:7001
+#: ../mariadb-server-10.2.templates:6001
 #, fuzzy
 #| msgid "New password for the MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -167,13 +144,13 @@ msgstr "Ny adgangskode for MariaDB's \"root\"-bruger:"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "Kunne ikke s<>tte adgangskoden for MariaDB's \"root\"-bruger"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -186,13 +163,13 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr "Du b<>r tjekke kontoens adgangskode efter pakkeinstallationen."

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 #, fuzzy
 #| msgid ""
 #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for "
@@ -206,16 +183,51 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "Password input error"
 msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""

+#~ msgid "Really proceed with downgrade?"
+#~ msgstr "<22>nsker du virkelig at forts<74>tte nedgraderingen?"
+
+#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
+#~ msgstr ""
+#~ "Der er en fil med navnet  /var/lib/mysql/debian-*.flag p<> dette system."
+
+#, fuzzy
+#~| msgid ""
+#~| "Such file is an indication that a mariadb-server package with a higher "
+#~| "version has been installed earlier."
+#~ msgid ""
+#~ "Such a file is an indication that a mariadb-server package with a higher "
+#~ "version has been installed previously."
+#~ msgstr ""
+#~ "S<>dan en fil tyder p<> at der tidligere har v<>ret installeret en h<>jere "
+#~ "version af mariadb-server-pakken."
+
+#~ msgid ""
+#~ "There is no guarantee that the version you're currently installing will "
+#~ "be able to use the current databases."
+#~ msgstr ""
+#~ "Det kan ikke garanteres at den version, du er ved at installere, kan "
+#~ "benytte data fra de eksisterende databaser."
+
+#~ msgid "Start the MariaDB server on boot?"
+#~ msgstr "Start MariaDB-serveren under systemopstart?"
+
+#~ msgid ""
+#~ "The MariaDB server can be launched automatically at boot time or manually "
+#~ "with the '/etc/init.d/mysql start' command."
+#~ msgstr ""
+#~ "MariaDB-serveren kan enten startes op automatisk under systemopstarten, "
+#~ "eller manuelt med kommandoen '/etc/init.d/mysql start'."
+
 #~ msgid ""
 #~ "To use MariaDB, the following entries for users and groups should be "
 #~ "added to the system:"
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1_5.1.37-1_de\n"
 "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
-"POT-Creation-Date: 2012-01-12 13:08+0100\n"
+"POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2009-08-27 22:41+0200\n"
 "Last-Translator: Thomas Mueller <thomas.mueller@tmit.eu>\n"
 "Language-Team: german <debian-l10n-german@lists.debian.org>\n"
@@ -27,39 +27,35 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
-msgid "Really proceed with downgrade?"
-msgstr "Möchten Sie wirklich eine ältere Version einspielen?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
+msgid "The old data directory will be saved at new location"
 msgstr ""
-"Auf diesem System existiert eine Datei mit dem Namen /var/lib/mysql/debian-*."
-"flag"

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"Such a file is an indication that a mariadb-server package with a higher "
-"version has been installed previously."
+"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
+"indicates a database binary format version that cannot automatically be "
+"upgraded (or downgraded)."
 msgstr ""
-"Diese Datei ist ein Hinweis darauf, dass früher ein MariaDB-Server-Paket mit "
-"einer höheren Version installiert war."

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"There is no guarantee that the version you're currently installing will be "
-"able to use the current databases."
+"Therefore the previous data directory will be renamed to /var/lib/mysql-* "
+"and a new data directory will be initialized at /var/lib/mysql."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.templates:2001
+msgid ""
+"Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
-"Es kann nicht garantiert werden, dass die gegenwärtig zu installierende "
-"Version dessen Daten benutzen kann."

 #. Type: note
 #. Description
@@ -115,31 +111,15 @@ msgstr ""
 "ein anderes mariadb-server-Paket dieses bereits benutzt, sollten die Daten "
 "behalten werden."

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid "Start the MariaDB server on boot?"
-msgstr "Soll der MariaDB-Server automatisch beim Booten starten?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid ""
-"The MariaDB server can be launched automatically at boot time or manually "
-"with the '/etc/init.d/mysql start' command."
-msgstr ""
-"Der MariaDB-Dienst kann entweder automatisch beim Systemstart oder manuell "
-"durch Eingabe des Befehls »/etc/init.d/mysql start« gestartet werden."
-
 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Neues Passwort für den MariaDB »root«-Benutzer:"

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -149,25 +129,25 @@ msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "If this field is left blank, the password will not be changed."
 msgstr "Wenn dieses Feld freigelassen wird, wird das Passwort nicht geändert."

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:7001
+#: ../mariadb-server-10.2.templates:6001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr "Wiederholen Sie das Passwort für den MariaDB-»root«-Benutzer:"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "Konnte für den MariaDB-»root«-Benutzer kein Passwort setzen"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -180,7 +160,7 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 "Sie sollten das Passwort des administrativen Benutzers nach der "
@@ -188,7 +168,7 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 #, fuzzy
 #| msgid ""
 #| "Please read the /usr/share/doc/mariadb-server-5.1/README.Debian file for "
@@ -202,15 +182,47 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "Password input error"
 msgstr "Passwort-Eingabefehler"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 "Die beiden von Ihnen eingegebenen Passwörter sind nicht identisch. Bitte "
 "erneut versuchen."

+#~ msgid "Really proceed with downgrade?"
+#~ msgstr "Möchten Sie wirklich eine ältere Version einspielen?"
+
+#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
+#~ msgstr ""
+#~ "Auf diesem System existiert eine Datei mit dem Namen /var/lib/mysql/"
+#~ "debian-*.flag"
+
+#~ msgid ""
+#~ "Such a file is an indication that a mariadb-server package with a higher "
+#~ "version has been installed previously."
+#~ msgstr ""
+#~ "Diese Datei ist ein Hinweis darauf, dass früher ein MariaDB-Server-Paket "
+#~ "mit einer höheren Version installiert war."
+
+#~ msgid ""
+#~ "There is no guarantee that the version you're currently installing will "
+#~ "be able to use the current databases."
+#~ msgstr ""
+#~ "Es kann nicht garantiert werden, dass die gegenwärtig zu installierende "
+#~ "Version dessen Daten benutzen kann."
+
+#~ msgid "Start the MariaDB server on boot?"
+#~ msgstr "Soll der MariaDB-Server automatisch beim Booten starten?"
+
+#~ msgid ""
+#~ "The MariaDB server can be launched automatically at boot time or manually "
+#~ "with the '/etc/init.d/mysql start' command."
+#~ msgstr ""
+#~ "Der MariaDB-Dienst kann entweder automatisch beim Systemstart oder "
+#~ "manuell durch Eingabe des Befehls »/etc/init.d/mysql start« gestartet "
+#~ "werden."
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -41,7 +41,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1_5.0.24-3\n"
 "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
-"POT-Creation-Date: 2012-01-12 13:08+0100\n"
+"POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2007-05-28 22:21+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian l10 Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -50,42 +50,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
-msgid "Really proceed with downgrade?"
-msgstr "¿Desea realmente continuar con la desactualización?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
+msgid "The old data directory will be saved at new location"
 msgstr ""
-"Existe un archivo con el nombre /var/lib/mysql/debian-*.flag en este sistema."

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Such file is an indication that a mariadb-server package with a higher "
-#| "version has been installed earlier."
-msgid ""
-"Such a file is an indication that a mariadb-server package with a higher "
-"version has been installed previously."
-msgstr ""
-"Este fichero indica que se instaló previamente una versión superior del "
-"paquete mariadb-server."
-
-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"There is no guarantee that the version you're currently installing will be "
-"able to use the current databases."
+"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
+"indicates a database binary format version that cannot automatically be "
+"upgraded (or downgraded)."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.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."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.templates:2001
+msgid ""
+"Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
-"No se puede garantizar que la versión que está instalando pueda usar la base "
-"de datos actual."

 #. Type: note
 #. Description
@@ -143,31 +136,15 @@ msgstr ""
 "MariaDB más reciente o si hay un paquete «mariadb-server» distinto que los "
 "está utilizando."

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid "Start the MariaDB server on boot?"
-msgstr "¿Debería ejecutarse el servidor MariaDB al iniciarse el sistema?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid ""
-"The MariaDB server can be launched automatically at boot time or manually "
-"with the '/etc/init.d/mysql start' command."
-msgstr ""
-"El servidor MariaDB puede iniciarse en el momento de arranque del sistema o "
-"manualmente si escribe la orden «/etc/init.d/mysql start»."
-
 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Nueva contraseña para el usuario «root» de MariaDB:"

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -177,7 +154,7 @@ msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 #, fuzzy
 #| msgid "If that field is left blank, the password will not be changed."
 msgid "If this field is left blank, the password will not be changed."
@@ -185,7 +162,7 @@ msgstr "No se modificará la contraseña si deja el espacio en blanco."

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:7001
+#: ../mariadb-server-10.2.templates:6001
 #, fuzzy
 #| msgid "New password for the MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -193,13 +170,13 @@ msgstr "Nueva contraseña para el usuario «root» de MariaDB:"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "No se pudo fijar la contraseña para el usuario «root» de MariaDB"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -212,7 +189,7 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 "Debería comprobar la contraseña de la cuenta después de la instalación del "
@@ -220,7 +197,7 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 #, fuzzy
 #| msgid ""
 #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for "
@@ -234,16 +211,52 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "Password input error"
 msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""

+#~ msgid "Really proceed with downgrade?"
+#~ msgstr "¿Desea realmente continuar con la desactualización?"
+
+#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
+#~ msgstr ""
+#~ "Existe un archivo con el nombre /var/lib/mysql/debian-*.flag en este "
+#~ "sistema."
+
+#, fuzzy
+#~| msgid ""
+#~| "Such file is an indication that a mariadb-server package with a higher "
+#~| "version has been installed earlier."
+#~ msgid ""
+#~ "Such a file is an indication that a mariadb-server package with a higher "
+#~ "version has been installed previously."
+#~ msgstr ""
+#~ "Este fichero indica que se instaló previamente una versión superior del "
+#~ "paquete mariadb-server."
+
+#~ msgid ""
+#~ "There is no guarantee that the version you're currently installing will "
+#~ "be able to use the current databases."
+#~ msgstr ""
+#~ "No se puede garantizar que la versión que está instalando pueda usar la "
+#~ "base de datos actual."
+
+#~ msgid "Start the MariaDB server on boot?"
+#~ msgstr "¿Debería ejecutarse el servidor MariaDB al iniciarse el sistema?"
+
+#~ msgid ""
+#~ "The MariaDB server can be launched automatically at boot time or manually "
+#~ "with the '/etc/init.d/mysql start' command."
+#~ msgstr ""
+#~ "El servidor MariaDB puede iniciarse en el momento de arranque del sistema "
+#~ "o manualmente si escribe la orden «/etc/init.d/mysql start»."
+
 #~ msgid ""
 #~ "To use MariaDB, the following entries for users and groups should be "
 #~ "added to the system:"
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
-"POT-Creation-Date: 2012-01-12 13:08+0100\n"
+"POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2009-07-29 11:59+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-eu@lists.debian.org>\n"
@@ -18,41 +18,35 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
-msgid "Really proceed with downgrade?"
-msgstr "Benetan bertsio zaharragora itzuli nahi duzu?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
-msgstr "Sisteman badago /var/lib/mysql/debian-*.flag izeneko fitxategi bat."
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Such file is an indication that a mariadb-server package with a higher "
-#| "version has been installed earlier."
-msgid ""
-"Such a file is an indication that a mariadb-server package with a higher "
-"version has been installed previously."
+msgid "The old data directory will be saved at new location"
 msgstr ""
-"Fitxategi honek aurretik bertsio berriagoko mysql-zerbitzari pakete bat "
-"instalatu dela adierazten du."

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"There is no guarantee that the version you're currently installing will be "
-"able to use the current databases."
+"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
+"indicates a database binary format version that cannot automatically be "
+"upgraded (or downgraded)."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.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."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.templates:2001
+msgid ""
+"Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
-"Ezin da ziurtatu instalatzen ari zaren bertsio honek dauden datubaseak "
-"erabili ahal izango dituenik."

 #. Type: note
 #. Description
@@ -109,31 +103,15 @@ msgstr ""
 "bazara, edo beste mariadb-server pakete bat berau erabiltzen ari bada, "
 "datuak mantendu egin beharko lirateke."

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid "Start the MariaDB server on boot?"
-msgstr "Abioan MariaDB zerbitzaria abiarazi?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid ""
-"The MariaDB server can be launched automatically at boot time or manually "
-"with the '/etc/init.d/mysql start' command."
-msgstr ""
-"Sistema abioan MariaDB automatikoki abiarazi daiteke edo eskuz '/etc/init.d/"
-"mysql start' eginaz."
-
 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "MariaDB \"root\" erabiltzailearen pasahitz berria:"

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -143,7 +121,7 @@ msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 #, fuzzy
 #| msgid "If that field is left blank, the password will not be changed."
 msgid "If this field is left blank, the password will not be changed."
@@ -151,19 +129,19 @@ msgstr "Eremua hau zurian utziaz gero ez da pasahitza aldatuko."

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:7001
+#: ../mariadb-server-10.2.templates:6001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr "Errepikatu MariaDB \"root\" erabiltzailearen pasahitza:"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "Ezin da MariaDB \"root\" erabiltzailearen pasahitza ezarri"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -175,14 +153,14 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 "Kontuaren pasahitza egiaztatu beharko zenuke paketea instalatu aurretik."

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 #, fuzzy
 #| msgid ""
 #| "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for "
@@ -196,16 +174,50 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "Password input error"
 msgstr "Pasahitz sarrera errorea"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr "Idatzi dituzun bi pasahitzak ez dira berdina. Mesedez saiatu berriz."

+#~ msgid "Really proceed with downgrade?"
+#~ msgstr "Benetan bertsio zaharragora itzuli nahi duzu?"
+
+#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
+#~ msgstr "Sisteman badago /var/lib/mysql/debian-*.flag izeneko fitxategi bat."
+
+#, fuzzy
+#~| msgid ""
+#~| "Such file is an indication that a mariadb-server package with a higher "
+#~| "version has been installed earlier."
+#~ msgid ""
+#~ "Such a file is an indication that a mariadb-server package with a higher "
+#~ "version has been installed previously."
+#~ msgstr ""
+#~ "Fitxategi honek aurretik bertsio berriagoko mysql-zerbitzari pakete bat "
+#~ "instalatu dela adierazten du."
+
+#~ msgid ""
+#~ "There is no guarantee that the version you're currently installing will "
+#~ "be able to use the current databases."
+#~ msgstr ""
+#~ "Ezin da ziurtatu instalatzen ari zaren bertsio honek dauden datubaseak "
+#~ "erabili ahal izango dituenik."
+
+#~ msgid "Start the MariaDB server on boot?"
+#~ msgstr "Abioan MariaDB zerbitzaria abiarazi?"
+
+#~ msgid ""
+#~ "The MariaDB server can be launched automatically at boot time or manually "
+#~ "with the '/etc/init.d/mysql start' command."
+#~ msgstr ""
+#~ "Sistema abioan MariaDB automatikoki abiarazi daiteke edo eskuz '/etc/init."
+#~ "d/mysql start' eginaz."
+
 #~ msgid ""
 #~ "To use MariaDB, the following entries for users and groups should be "
 #~ "added to the system:"
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
-"POT-Creation-Date: 2012-01-12 13:08+0100\n"
+"POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2009-08-08 14:56+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -20,35 +20,35 @@ msgstr ""
 "X-Generator: Lokalize 0.3\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
-msgid "Really proceed with downgrade?"
-msgstr "Faut-il vraiment revenir à la version précédente ?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
-msgstr "Un fichier /var/lib/mysql/debian-*.flag est présent sur ce système."
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-msgid ""
-"Such a file is an indication that a mariadb-server package with a higher "
-"version has been installed previously."
+msgid "The old data directory will be saved at new location"
 msgstr ""
-"Cela indique qu'une version plus récente du paquet mariadb-server a été "
-"précédemment installée."

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"There is no guarantee that the version you're currently installing will be "
-"able to use the current databases."
-msgstr "Il n'est pas garanti que cette version puisse en utiliser les données."
+"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
+"indicates a database binary format version that cannot automatically be "
+"upgraded (or downgraded)."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.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."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.templates:2001
+msgid ""
+"Please manually export/import your data (e.g. with mysqldump) if needed."
+msgstr ""

 #. Type: note
 #. Description
@@ -103,31 +103,15 @@ msgstr ""
 "Si vous prévoyez d'installer une version plus récente de MariaDB ou si un "
 "autre paquet mariadb-server les utilise déjà, vous devriez les conserver."

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid "Start the MariaDB server on boot?"
-msgstr "Faut-il lancer MariaDB au démarrage ?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid ""
-"The MariaDB server can be launched automatically at boot time or manually "
-"with the '/etc/init.d/mysql start' command."
-msgstr ""
-"MariaDB peut être lancé soit au démarrage, soit en entrant la commande « /"
-"etc/init.d/mysql start »."
-
 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Nouveau mot de passe du superutilisateur de MariaDB :"

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -137,26 +121,26 @@ msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "If this field is left blank, the password will not be changed."
 msgstr "Si ce champ est laissé vide, le mot de passe ne sera pas changé."

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:7001
+#: ../mariadb-server-10.2.templates:6001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr "Confirmation du mot de passe du superutilisateur de MariaDB :"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr ""
 "Impossible de changer le mot de passe de l'utilisateur « root » de MariaDB"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -168,7 +152,7 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 "Vous devriez vérifier le mot de passe de ce compte après l'installation du "
@@ -176,7 +160,7 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 #, fuzzy
 #| msgid ""
 #| "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for "
@@ -190,18 +174,47 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "Password input error"
 msgstr "Erreur de saisie du mot de passe"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 "Le mot de passe et sa confirmation ne sont pas identiques. Veuillez "
 "recommencer."

+#~ msgid "Really proceed with downgrade?"
+#~ msgstr "Faut-il vraiment revenir à la version précédente ?"
+
+#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
+#~ msgstr "Un fichier /var/lib/mysql/debian-*.flag est présent sur ce système."
+
+#~ msgid ""
+#~ "Such a file is an indication that a mariadb-server package with a higher "
+#~ "version has been installed previously."
+#~ msgstr ""
+#~ "Cela indique qu'une version plus récente du paquet mariadb-server a été "
+#~ "précédemment installée."
+
+#~ msgid ""
+#~ "There is no guarantee that the version you're currently installing will "
+#~ "be able to use the current databases."
+#~ msgstr ""
+#~ "Il n'est pas garanti que cette version puisse en utiliser les données."
+
+#~ msgid "Start the MariaDB server on boot?"
+#~ msgstr "Faut-il lancer MariaDB au démarrage ?"
+
+#~ msgid ""
+#~ "The MariaDB server can be launched automatically at boot time or manually "
+#~ "with the '/etc/init.d/mysql start' command."
+#~ msgstr ""
+#~ "MariaDB peut être lancé soit au démarrage, soit en entrant la commande « /"
+#~ "etc/init.d/mysql start »."
+
 #~ msgid ""
 #~ "To use MySQL, the following entries for users and groups should be added "
 #~ "to the system:"
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1\n"
 "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
-"POT-Creation-Date: 2012-01-12 13:08+0100\n"
+"POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2007-04-20 09:44+0200\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -15,41 +15,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
-msgid "Really proceed with downgrade?"
-msgstr "¿Quere pasar a unha versión anterior?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
-msgstr "Neste sistema hai un ficheiro chamado /var/lib/mysql/debian-*.flag."
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Such file is an indication that a mariadb-server package with a higher "
-#| "version has been installed earlier."
-msgid ""
-"Such a file is an indication that a mariadb-server package with a higher "
-"version has been installed previously."
+msgid "The old data directory will be saved at new location"
 msgstr ""
-"Este ficheiro indica que antes se instalou un paquete mariadb-server cunha "
-"versión superior."

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"There is no guarantee that the version you're currently installing will be "
-"able to use the current databases."
+"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
+"indicates a database binary format version that cannot automatically be "
+"upgraded (or downgraded)."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.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."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.templates:2001
+msgid ""
+"Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
-"Non se pode garantir que a versión que está a instalar poida empregar as "
-"bases de datos actuais."

 #. Type: note
 #. Description
@@ -107,31 +101,15 @@ msgstr ""
 "recente ou se xa hai un paquete mariadb-server diferente a empregalo, "
 "debería conservar os datos."

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid "Start the MariaDB server on boot?"
-msgstr "¿Iniciar o servidor MariaDB co ordenador?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid ""
-"The MariaDB server can be launched automatically at boot time or manually "
-"with the '/etc/init.d/mysql start' command."
-msgstr ""
-"Pódese iniciar automaticamente o servidor MariaDB ao iniciar o ordenador, ou "
-"manualmente coa orde \"/etc/init.d/mysql start\"."
-
 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Novo contrasinal para o usuario \"root\" de MariaDB:"

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -141,7 +119,7 @@ msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 #, fuzzy
 #| msgid "If that field is left blank, the password will not be changed."
 msgid "If this field is left blank, the password will not be changed."
@@ -149,7 +127,7 @@ msgstr "Se deixa o campo en branco, non se ha cambiar o contrasinal."

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:7001
+#: ../mariadb-server-10.2.templates:6001
 #, fuzzy
 #| msgid "New password for the MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -157,13 +135,13 @@ msgstr "Novo contrasinal para o usuario \"root\" de MariaDB:"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "Non se puido establecer o contrasinal do usuario \"root\" de MariaDB"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -175,7 +153,7 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 #, fuzzy
 #| msgid ""
 #| "You should check the account's password after tha package installation."
@@ -184,7 +162,7 @@ msgstr "Debería comprobar o contrasinal da conta trala instalación do paquete.

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 #, fuzzy
 #| msgid ""
 #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for "
@@ -198,16 +176,50 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "Password input error"
 msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""

+#~ msgid "Really proceed with downgrade?"
+#~ msgstr "¿Quere pasar a unha versión anterior?"
+
+#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
+#~ msgstr "Neste sistema hai un ficheiro chamado /var/lib/mysql/debian-*.flag."
+
+#, fuzzy
+#~| msgid ""
+#~| "Such file is an indication that a mariadb-server package with a higher "
+#~| "version has been installed earlier."
+#~ msgid ""
+#~ "Such a file is an indication that a mariadb-server package with a higher "
+#~ "version has been installed previously."
+#~ msgstr ""
+#~ "Este ficheiro indica que antes se instalou un paquete mariadb-server "
+#~ "cunha versión superior."
+
+#~ msgid ""
+#~ "There is no guarantee that the version you're currently installing will "
+#~ "be able to use the current databases."
+#~ msgstr ""
+#~ "Non se pode garantir que a versión que está a instalar poida empregar as "
+#~ "bases de datos actuais."
+
+#~ msgid "Start the MariaDB server on boot?"
+#~ msgstr "¿Iniciar o servidor MariaDB co ordenador?"
+
+#~ msgid ""
+#~ "The MariaDB server can be launched automatically at boot time or manually "
+#~ "with the '/etc/init.d/mysql start' command."
+#~ msgstr ""
+#~ "Pódese iniciar automaticamente o servidor MariaDB ao iniciar o ordenador, "
+#~ "ou manualmente coa orde \"/etc/init.d/mysql start\"."
+
 #~ msgid ""
 #~ "To use MariaDB, the following entries for users and groups should be "
 #~ "added to the system:"
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -2,12 +2,12 @@
 # Copyright (C) 2009 Software in the Public Interest
 # This file is distributed under the same license as the mysql-dfsg-5.1 package.
 # Luca Monducci <luca.mo@tiscali.it>, 2006 - 2009.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.1.37 italian debconf templates\n"
 "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
-"POT-Creation-Date: 2012-01-12 13:08+0100\n"
+"POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2009-08-08 11:03+0200\n"
 "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -16,38 +16,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
-msgid "Really proceed with downgrade?"
-msgstr "Procedere realmente con l'abbassamento di versione?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
+msgid "The old data directory will be saved at new location"
 msgstr ""
-"Su questo sistema esiste un file con nome /var/lib/mysql/debian-*.flag."

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"Such a file is an indication that a mariadb-server package with a higher "
-"version has been installed previously."
+"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
+"indicates a database binary format version that cannot automatically be "
+"upgraded (or downgraded)."
 msgstr ""
-"Quel file indica che in precedenza è stata installata una versione superiore "
-"del pacchetto mariadb-server."

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"There is no guarantee that the version you're currently installing will be "
-"able to use the current databases."
+"Therefore the previous data directory will be renamed to /var/lib/mysql-* "
+"and a new data directory will be initialized at /var/lib/mysql."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.templates:2001
+msgid ""
+"Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
-"Non è garantito che la versione che si sta installando sia in grado di usare "
-"i database presenti."

 #. Type: note
 #. Description
@@ -103,31 +100,15 @@ msgstr ""
 "recente oppure se sono già in uso da un altro pacchetto mariadb-server, i "
 "dati non devono essere eliminati."

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid "Start the MariaDB server on boot?"
-msgstr "Lanciare il server MariaDB all'avvio?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid ""
-"The MariaDB server can be launched automatically at boot time or manually "
-"with the '/etc/init.d/mysql start' command."
-msgstr ""
-"Il server MariaDB può essere lanciato automaticamente all'avvio del sistema "
-"oppure manualmente con il comando «/etc/init.d/mysql start»."
-
 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Nuova password per l'utente «root» di MariaDB:"

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -137,25 +118,25 @@ msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "If this field is left blank, the password will not be changed."
 msgstr "Se questo campo è lasciato vuoto, la password non viene cambiata."

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:7001
+#: ../mariadb-server-10.2.templates:6001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr "Ripetere la password per l'utente «root» di MariaDB:"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "Impossibile impostare la password per l'utente «root» di MariaDB"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -168,14 +149,14 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 "Al termine dell'installazione si deve verificare la password dell'account."

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 #, fuzzy
 #| msgid ""
 #| "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for "
@@ -189,13 +170,43 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "Password input error"
 msgstr "Errore di inserimento della password"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr "Le due password inserite sono diverse. Riprovare."

+#~ msgid "Really proceed with downgrade?"
+#~ msgstr "Procedere realmente con l'abbassamento di versione?"
+
+#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
+#~ msgstr ""
+#~ "Su questo sistema esiste un file con nome /var/lib/mysql/debian-*.flag."
+
+#~ msgid ""
+#~ "Such a file is an indication that a mariadb-server package with a higher "
+#~ "version has been installed previously."
+#~ msgstr ""
+#~ "Quel file indica che in precedenza è stata installata una versione "
+#~ "superiore del pacchetto mariadb-server."
+
+#~ msgid ""
+#~ "There is no guarantee that the version you're currently installing will "
+#~ "be able to use the current databases."
+#~ msgstr ""
+#~ "Non è garantito che la versione che si sta installando sia in grado di "
+#~ "usare i database presenti."
+
+#~ msgid "Start the MariaDB server on boot?"
+#~ msgstr "Lanciare il server MariaDB all'avvio?"
+
+#~ msgid ""
+#~ "The MariaDB server can be launched automatically at boot time or manually "
+#~ "with the '/etc/init.d/mysql start' command."
+#~ msgstr ""
+#~ "Il server MariaDB può essere lanciato automaticamente all'avvio del "
+#~ "sistema oppure manualmente con il comando «/etc/init.d/mysql start»."
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.1.37-1\n"
 "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
-"POT-Creation-Date: 2012-01-12 13:08+0100\n"
+"POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2009-09-01 08:25+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -25,39 +25,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
-msgid "Really proceed with downgrade?"
-msgstr "本当にダウングレードを実行しますか?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
+msgid "The old data directory will be saved at new location"
 msgstr ""
-"このシステムには  /var/lib/mysql/debian-*.flag という名前のファイルが存在して"
-"います。"

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"Such a file is an indication that a mariadb-server package with a higher "
-"version has been installed previously."
+"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
+"indicates a database binary format version that cannot automatically be "
+"upgraded (or downgraded)."
 msgstr ""
-"このファイルが意味するのは、以前により新しいバージョンの mariadb-server パッ"
-"ケージがインストールされていたことを示します。"

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"There is no guarantee that the version you're currently installing will be "
-"able to use the current databases."
+"Therefore the previous data directory will be renamed to /var/lib/mysql-* "
+"and a new data directory will be initialized at /var/lib/mysql."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.templates:2001
+msgid ""
+"Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
-"このデータベースを現在インストールしようとしているバージョンで使えるかどうか"
-"は保証できません。"

 #. Type: note
 #. Description
@@ -111,31 +107,15 @@ msgstr ""
 "ケージを削除しようとしている、あるいは別の mariadb-server パッケージを既に"
 "使っている場合、データは保持する必要があります。"

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid "Start the MariaDB server on boot?"
-msgstr "MariaDB をシステム起動時に開始しますか?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid ""
-"The MariaDB server can be launched automatically at boot time or manually "
-"with the '/etc/init.d/mysql start' command."
-msgstr ""
-"MariaDB の起動方法について、システム起動時に自動的に開始するか、あるいは '/"
-"etc/init.d/mysql start' と手で入力して起動するかを選べます。"
-
 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "MariaDB の \"root\" ユーザに対する新しいパスワード:"

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -145,25 +125,25 @@ msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "If this field is left blank, the password will not be changed."
 msgstr "この値を空のままにしておいた場合は、パスワードは変更されません。"

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:7001
+#: ../mariadb-server-10.2.templates:6001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr "MariaDB の \"root\" ユーザに対する新しいパスワード:"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "MariaDB の \"root\" ユーザのパスワードを設定できません"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -175,14 +155,14 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr ""
 "パッケージのインストール後、アカウントのパスワードを確認する必要があります。"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 #, fuzzy
 #| msgid ""
 #| "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for "
@@ -195,13 +175,44 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "Password input error"
 msgstr "パスワード入力エラー"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr "入力された二つのパスワードが一致しません。再入力してください。"

+#~ msgid "Really proceed with downgrade?"
+#~ msgstr "本当にダウングレードを実行しますか?"
+
+#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
+#~ msgstr ""
+#~ "このシステムには  /var/lib/mysql/debian-*.flag という名前のファイルが存在"
+#~ "しています。"
+
+#~ msgid ""
+#~ "Such a file is an indication that a mariadb-server package with a higher "
+#~ "version has been installed previously."
+#~ msgstr ""
+#~ "このファイルが意味するのは、以前により新しいバージョンの mariadb-server "
+#~ "パッケージがインストールされていたことを示します。"
+
+#~ msgid ""
+#~ "There is no guarantee that the version you're currently installing will "
+#~ "be able to use the current databases."
+#~ msgstr ""
+#~ "このデータベースを現在インストールしようとしているバージョンで使えるかどう"
+#~ "かは保証できません。"
+
+#~ msgid "Start the MariaDB server on boot?"
+#~ msgstr "MariaDB をシステム起動時に開始しますか?"
+
+#~ msgid ""
+#~ "The MariaDB server can be launched automatically at boot time or manually "
+#~ "with the '/etc/init.d/mysql start' command."
+#~ msgstr ""
+#~ "MariaDB の起動方法について、システム起動時に自動的に開始するか、あるいは "
+#~ "'/etc/init.d/mysql start' と手で入力して起動するかを選べます。"
--- a/debian/po/nb.po
+++ b/debian/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mysql_nb\n"
 "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
-"POT-Creation-Date: 2012-01-12 13:08+0100\n"
+"POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2007-02-18 12:13+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -17,43 +17,34 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
-#, fuzzy
-#| msgid "Do you really want to downgrade?"
-msgid "Really proceed with downgrade?"
-msgstr "Er du sikker på at du vil nedgradere?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
+msgid "The old data directory will be saved at new location"
 msgstr ""

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-#, fuzzy
-#| msgid ""
-#| "WARNING: The file /var/lib/mysql/debian-*.flag exists. This indicates "
-#| "that a mysql-server package with a higher version has been installed "
-#| "before. It can not be guaranteed that this version can use its data."
-msgid ""
-"Such a file is an indication that a mariadb-server package with a higher "
-"version has been installed previously."
-msgstr ""
-"ADVARSEL: Fila /var/lib/mysql/debian-*.flag finnes. Dette viser at en "
-"mariadb-server-pakke med et høyere versjonsnummer har vært installert før. "
-"Det kan ikke garanteres at denne versjonen kan bruke data fra den høyere "
-"versjonen."
-
-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"There is no guarantee that the version you're currently installing will be "
-"able to use the current databases."
+"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
+"indicates a database binary format version that cannot automatically be "
+"upgraded (or downgraded)."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.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."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.templates:2001
+msgid ""
+"Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""

 #. Type: note
@@ -111,31 +102,9 @@ msgstr ""
 "beholdes hvis det bare skal installeres en høyere MariaDB-versjon, eller "
 "hvis en annen mariadb-server-pakke allerede bruker den."

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-#, fuzzy
-#| msgid "Should MySQL start on boot?"
-msgid "Start the MariaDB server on boot?"
-msgstr "Skal MariaDB startes ved maskinoppstart?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-#, fuzzy
-#| msgid ""
-#| "The MySQL can start automatically on boot time or only if you manually "
-#| "type '/etc/init.d/mysql start'."
-msgid ""
-"The MariaDB server can be launched automatically at boot time or manually "
-"with the '/etc/init.d/mysql start' command."
-msgstr ""
-"MariaDB kan startes automatisk når maskinen starter, eller bare hvis du "
-"skriver «/etc/init.d/mysql start»."
-
 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "New password for the MariaDB \"root\" user:"
@@ -143,7 +112,7 @@ msgstr "Nytt passord for MariaDBs «root»-bruker:"

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 #, fuzzy
 #| msgid ""
 #| "It is highly recommended that you set a password for the MySQL "
@@ -157,13 +126,13 @@ msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:7001
+#: ../mariadb-server-10.2.templates:6001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -171,7 +140,7 @@ msgstr "Nytt passord for MariaDBs «root»-bruker:"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 #, fuzzy
 #| msgid "Unable to set password for MySQL \"root\" user"
 msgid "Unable to set password for the MariaDB \"root\" user"
@@ -179,7 +148,7 @@ msgstr "Klarer ikke angi passord for MariaDBs «root»-bruker"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 #, fuzzy
 #| msgid ""
 #| "It seems an error occurred while setting the password for the MySQL "
@@ -198,13 +167,13 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid ""
 "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for "
 "more information."
@@ -212,16 +181,51 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "Password input error"
 msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""

+#, fuzzy
+#~| msgid "Do you really want to downgrade?"
+#~ msgid "Really proceed with downgrade?"
+#~ msgstr "Er du sikker på at du vil nedgradere?"
+
+#, fuzzy
+#~| msgid ""
+#~| "WARNING: The file /var/lib/mysql/debian-*.flag exists. This indicates "
+#~| "that a mysql-server package with a higher version has been installed "
+#~| "before. It can not be guaranteed that this version can use its data."
+#~ msgid ""
+#~ "Such a file is an indication that a mariadb-server package with a higher "
+#~ "version has been installed previously."
+#~ msgstr ""
+#~ "ADVARSEL: Fila /var/lib/mysql/debian-*.flag finnes. Dette viser at en "
+#~ "mariadb-server-pakke med et høyere versjonsnummer har vært installert "
+#~ "før. Det kan ikke garanteres at denne versjonen kan bruke data fra den "
+#~ "høyere versjonen."
+
+#, fuzzy
+#~| msgid "Should MySQL start on boot?"
+#~ msgid "Start the MariaDB server on boot?"
+#~ msgstr "Skal MariaDB startes ved maskinoppstart?"
+
+#, fuzzy
+#~| msgid ""
+#~| "The MySQL can start automatically on boot time or only if you manually "
+#~| "type '/etc/init.d/mysql start'."
+#~ msgid ""
+#~ "The MariaDB server can be launched automatically at boot time or manually "
+#~ "with the '/etc/init.d/mysql start' command."
+#~ msgstr ""
+#~ "MariaDB kan startes automatisk når maskinen starter, eller bare hvis du "
+#~ "skriver «/etc/init.d/mysql start»."
+
 #~ msgid ""
 #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
 #~ msgstr ""
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.0.30-1\n"
 "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
-"POT-Creation-Date: 2012-01-12 13:08+0100\n"
+"POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2006-02-19 10:20+0100\n"
 "Last-Translator: Thijs Kinkhorst <thijs@debian.org>\n"
 "Language-Team: Debian-Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -16,44 +16,34 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
-#, fuzzy
-#| msgid "Do you really want to downgrade?"
-msgid "Really proceed with downgrade?"
-msgstr "Wilt u echt een oude versie herstellen?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
+msgid "The old data directory will be saved at new location"
 msgstr ""

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-#, fuzzy
-#| msgid ""
-#| "WARNING: The file /var/lib/mysql/debian-*.flag exists. This indicates "
-#| "that a mysql-server package with a higher version has been installed "
-#| "before. It can not be guaranteed that this version can use its data."
-msgid ""
-"Such a file is an indication that a mariadb-server package with a higher "
-"version has been installed previously."
-msgstr ""
-"Waarschuwing: waarschijnlijk is een hogere versie van het mariadb-server "
-"pakket geïnstalleerd geweest (het bestand /var/lib/mysql/debian-*.flag "
-"bestaat). Er is geen garantie dat de gegevensbestanden, bewerkt met die "
-"hogere versie, kunnen worden gebruikt met de versie van mysql die u nu "
-"installeert."
-
-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"There is no guarantee that the version you're currently installing will be "
-"able to use the current databases."
+"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
+"indicates a database binary format version that cannot automatically be "
+"upgraded (or downgraded)."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.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."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.templates:2001
+msgid ""
+"Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""

 #. Type: note
@@ -112,31 +102,9 @@ msgstr ""
 "een ander mariadb-serverpakket de datamap al gebruikt, dan zou de data "
 "moeten worden behouden."

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-#, fuzzy
-#| msgid "Should MySQL start on boot?"
-msgid "Start the MariaDB server on boot?"
-msgstr "Moet MariaDB starten als de computer start?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-#, fuzzy
-#| msgid ""
-#| "The MySQL can start automatically on boot time or only if you manually "
-#| "type '/etc/init.d/mysql start'."
-msgid ""
-"The MariaDB server can be launched automatically at boot time or manually "
-"with the '/etc/init.d/mysql start' command."
-msgstr ""
-"MariaDB kan automatisch starten bij het starten van de computer, of slechts "
-"wanneer u '/etc/init.d/mysql start' handmatig uitvoert."
-
 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "New password for the MariaDB \"root\" user:"
@@ -144,7 +112,7 @@ msgstr "Nieuw wachtwoord voor de MariaDB \"root\"-gebruiker:"

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 #, fuzzy
 #| msgid ""
 #| "It is highly recommended that you set a password for the MySQL "
@@ -158,13 +126,13 @@ msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:7001
+#: ../mariadb-server-10.2.templates:6001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -172,7 +140,7 @@ msgstr "Nieuw wachtwoord voor de MariaDB \"root\"-gebruiker:"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 #, fuzzy
 #| msgid "Unable to set password for MySQL \"root\" user"
 msgid "Unable to set password for the MariaDB \"root\" user"
@@ -180,7 +148,7 @@ msgstr "Kan het wachtwoord voor de MariaDB \"root\"-gebruiker niet instellen"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 #, fuzzy
 #| msgid ""
 #| "It seems an error occurred while setting the password for the MySQL "
@@ -199,13 +167,13 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid ""
 "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for "
 "more information."
@@ -213,16 +181,52 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "Password input error"
 msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""

+#, fuzzy
+#~| msgid "Do you really want to downgrade?"
+#~ msgid "Really proceed with downgrade?"
+#~ msgstr "Wilt u echt een oude versie herstellen?"
+
+#, fuzzy
+#~| msgid ""
+#~| "WARNING: The file /var/lib/mysql/debian-*.flag exists. This indicates "
+#~| "that a mysql-server package with a higher version has been installed "
+#~| "before. It can not be guaranteed that this version can use its data."
+#~ msgid ""
+#~ "Such a file is an indication that a mariadb-server package with a higher "
+#~ "version has been installed previously."
+#~ msgstr ""
+#~ "Waarschuwing: waarschijnlijk is een hogere versie van het mariadb-server "
+#~ "pakket geïnstalleerd geweest (het bestand /var/lib/mysql/debian-*.flag "
+#~ "bestaat). Er is geen garantie dat de gegevensbestanden, bewerkt met die "
+#~ "hogere versie, kunnen worden gebruikt met de versie van mysql die u nu "
+#~ "installeert."
+
+#, fuzzy
+#~| msgid "Should MySQL start on boot?"
+#~ msgid "Start the MariaDB server on boot?"
+#~ msgstr "Moet MariaDB starten als de computer start?"
+
+#, fuzzy
+#~| msgid ""
+#~| "The MySQL can start automatically on boot time or only if you manually "
+#~| "type '/etc/init.d/mysql start'."
+#~ msgid ""
+#~ "The MariaDB server can be launched automatically at boot time or manually "
+#~ "with the '/etc/init.d/mysql start' command."
+#~ msgstr ""
+#~ "MariaDB kan automatisch starten bij het starten van de computer, of "
+#~ "slechts wanneer u '/etc/init.d/mysql start' handmatig uitvoert."
+
 #~ msgid ""
 #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
 #~ msgstr ""
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1\n"
 "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
-"POT-Creation-Date: 2012-01-12 13:08+0100\n"
+"POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2007-05-05 21:01+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -16,41 +16,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
-msgid "Really proceed with downgrade?"
-msgstr "Deseja mesmo fazer downgrade?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
-msgstr "Existe um ficheiro chamado /var/lib/mysql/debian-*.flag neste sistema."
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Such file is an indication that a mariadb-server package with a higher "
-#| "version has been installed earlier."
-msgid ""
-"Such a file is an indication that a mariadb-server package with a higher "
-"version has been installed previously."
+msgid "The old data directory will be saved at new location"
 msgstr ""
-"Tal ficheiro significa que anteriormente foi instalado um pacote mariadb-"
-"server com um número de versão superior."

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"There is no guarantee that the version you're currently installing will be "
-"able to use the current databases."
+"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
+"indicates a database binary format version that cannot automatically be "
+"upgraded (or downgraded)."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.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."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.templates:2001
+msgid ""
+"Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
-"Não existe nenhuma garantia que a versão que está actualmente a instalar "
-"seja capaz de utilizar as bases de dados actuais."

 #. Type: note
 #. Description
@@ -107,31 +101,15 @@ msgstr ""
 "versão mais recente ou se um pacote mariadb-server já está os está a "
 "utilizar, os dados devem ser mantidos."

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid "Start the MariaDB server on boot?"
-msgstr "Iniciar o servidor MariaDB no arranque?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid ""
-"The MariaDB server can be launched automatically at boot time or manually "
-"with the '/etc/init.d/mysql start' command."
-msgstr ""
-"O MariaDB pode ser automaticamente lançado no arranque ou manualmente "
-"através do comando '/etc/init.d/mysql start'."
-
 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Nova palavra-passe para o utilizador \"root\" do MariaDB:"

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -141,7 +119,7 @@ msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 #, fuzzy
 #| msgid "If that field is left blank, the password will not be changed."
 msgid "If this field is left blank, the password will not be changed."
@@ -150,7 +128,7 @@ msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:7001
+#: ../mariadb-server-10.2.templates:6001
 #, fuzzy
 #| msgid "New password for the MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -158,7 +136,7 @@ msgstr "Nova palavra-passe para o utilizador \"root\" do MariaDB:"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr ""
 "Não foi possível definir a palavra-passe para o utilizador \"root\" do "
@@ -166,7 +144,7 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -179,7 +157,7 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 #, fuzzy
 #| msgid ""
 #| "You should check the account's password after tha package installation."
@@ -189,7 +167,7 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 #, fuzzy
 #| msgid ""
 #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for "
@@ -203,16 +181,51 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "Password input error"
 msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""

+#~ msgid "Really proceed with downgrade?"
+#~ msgstr "Deseja mesmo fazer downgrade?"
+
+#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
+#~ msgstr ""
+#~ "Existe um ficheiro chamado /var/lib/mysql/debian-*.flag neste sistema."
+
+#, fuzzy
+#~| msgid ""
+#~| "Such file is an indication that a mariadb-server package with a higher "
+#~| "version has been installed earlier."
+#~ msgid ""
+#~ "Such a file is an indication that a mariadb-server package with a higher "
+#~ "version has been installed previously."
+#~ msgstr ""
+#~ "Tal ficheiro significa que anteriormente foi instalado um pacote mariadb-"
+#~ "server com um número de versão superior."
+
+#~ msgid ""
+#~ "There is no guarantee that the version you're currently installing will "
+#~ "be able to use the current databases."
+#~ msgstr ""
+#~ "Não existe nenhuma garantia que a versão que está actualmente a instalar "
+#~ "seja capaz de utilizar as bases de dados actuais."
+
+#~ msgid "Start the MariaDB server on boot?"
+#~ msgstr "Iniciar o servidor MariaDB no arranque?"
+
+#~ msgid ""
+#~ "The MariaDB server can be launched automatically at boot time or manually "
+#~ "with the '/etc/init.d/mysql start' command."
+#~ msgstr ""
+#~ "O MariaDB pode ser automaticamente lançado no arranque ou manualmente "
+#~ "através do comando '/etc/init.d/mysql start'."
+
 #~ msgid ""
 #~ "To use MariaDB, the following entries for users and groups should be "
 #~ "added to the system:"
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1\n"
 "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
-"POT-Creation-Date: 2012-01-12 13:08+0100\n"
+"POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2007-04-21 15:59-0300\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -19,41 +19,35 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "pt_BR utf-8\n"

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
-msgid "Really proceed with downgrade?"
-msgstr "Realmente proceder com o rebaixamento de versão?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
-msgstr "Um arquivo de nome /var/lib/mysql/debian-*.flag existe no sistema."
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Such file is an indication that a mariadb-server package with a higher "
-#| "version has been installed earlier."
-msgid ""
-"Such a file is an indication that a mariadb-server package with a higher "
-"version has been installed previously."
+msgid "The old data directory will be saved at new location"
 msgstr ""
-"A presença de um arquivo como este é uma indicação de que um pacote mariadb-"
-"server com um número de versão mais alto já foi instalado anteriormente."

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"There is no guarantee that the version you're currently installing will be "
-"able to use the current databases."
+"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
+"indicates a database binary format version that cannot automatically be "
+"upgraded (or downgraded)."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.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."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.templates:2001
+msgid ""
+"Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
-"Não há garantias de que a versão que você está instalando no momento "
-"conseguirá utilizar as bases de dados existentes."

 #. Type: note
 #. Description
@@ -110,31 +104,15 @@ msgstr ""
 "versão mais recente ou, caso uma versão diferente do pacote mariadb-server "
 "esteja sendo utilizada, os dados deverão ser mantidos."

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid "Start the MariaDB server on boot?"
-msgstr "Iniciar o servidor MariaDB junto a inicialização da máquina?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid ""
-"The MariaDB server can be launched automatically at boot time or manually "
-"with the '/etc/init.d/mysql start' command."
-msgstr ""
-"O servidor MariaDB pode ser iniciado automaticamente junto a inicialização "
-"da máquina ou manualmente com o comando '/etc/init.d/mysql start'."
-
 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Nova senha para o usuário \"root\" do MariaDB:"

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -144,7 +122,7 @@ msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 #, fuzzy
 #| msgid "If that field is left blank, the password will not be changed."
 msgid "If this field is left blank, the password will not be changed."
@@ -152,7 +130,7 @@ msgstr "Caso este campo seja deixado em branco, a senha não sera mudada."

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:7001
+#: ../mariadb-server-10.2.templates:6001
 #, fuzzy
 #| msgid "New password for the MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -160,13 +138,13 @@ msgstr "Nova senha para o usuário \"root\" do MariaDB:"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "Impossível definir senha para o usuário \"root\" do MariaDB"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -179,7 +157,7 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 #, fuzzy
 #| msgid ""
 #| "You should check the account's password after tha package installation."
@@ -188,7 +166,7 @@ msgstr "Você deverá checar a senha dessa conta após a instalação deste paco

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 #, fuzzy
 #| msgid ""
 #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for "
@@ -202,16 +180,52 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "Password input error"
 msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""

+#~ msgid "Really proceed with downgrade?"
+#~ msgstr "Realmente proceder com o rebaixamento de versão?"
+
+#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
+#~ msgstr "Um arquivo de nome /var/lib/mysql/debian-*.flag existe no sistema."
+
+#, fuzzy
+#~| msgid ""
+#~| "Such file is an indication that a mariadb-server package with a higher "
+#~| "version has been installed earlier."
+#~ msgid ""
+#~ "Such a file is an indication that a mariadb-server package with a higher "
+#~ "version has been installed previously."
+#~ msgstr ""
+#~ "A presença de um arquivo como este é uma indicação de que um pacote "
+#~ "mariadb-server com um número de versão mais alto já foi instalado "
+#~ "anteriormente."
+
+#~ msgid ""
+#~ "There is no guarantee that the version you're currently installing will "
+#~ "be able to use the current databases."
+#~ msgstr ""
+#~ "Não há garantias de que a versão que você está instalando no momento "
+#~ "conseguirá utilizar as bases de dados existentes."
+
+#~ msgid "Start the MariaDB server on boot?"
+#~ msgstr "Iniciar o servidor MariaDB junto a inicialização da máquina?"
+
+#~ msgid ""
+#~ "The MariaDB server can be launched automatically at boot time or manually "
+#~ "with the '/etc/init.d/mysql start' command."
+#~ msgstr ""
+#~ "O servidor MariaDB pode ser iniciado automaticamente junto a "
+#~ "inicialização da máquina ou manualmente com o comando '/etc/init.d/mysql "
+#~ "start'."
+
 #~ msgid ""
 #~ "To use MariaDB, the following entries for users and groups should be "
 #~ "added to the system:"
--- a/debian/po/ro.po
+++ b/debian/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po-debconf://mysql-dfsg\n"
 "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
-"POT-Creation-Date: 2012-01-12 13:08+0100\n"
+"POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2006-12-20 21:27+0200\n"
 "Last-Translator: stan ioan-eugen <stan.ieugen@gmail.com>\n"
 "Language-Team: romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -17,43 +17,34 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
-#, fuzzy
-#| msgid "Do you really want to downgrade?"
-msgid "Really proceed with downgrade?"
-msgstr "Sunteţi sigur că doriţi să instalaţi o versiune mai veche?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
+msgid "The old data directory will be saved at new location"
 msgstr ""

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-#, fuzzy
-#| msgid ""
-#| "WARNING: The file /var/lib/mysql/debian-*.flag exists. This indicates "
-#| "that a mysql-server package with a higher version has been installed "
-#| "before. It can not be guaranteed that this version can use its data."
-msgid ""
-"Such a file is an indication that a mariadb-server package with a higher "
-"version has been installed previously."
-msgstr ""
-"AVERTISMENT: Fişierul /var/lib/mysql/debian-*.flag există. Acest lucru "
-"indică faptul că anterior a fost instalată o versiune nouă a pachetului "
-"mariadb-server. Nu se poate garanta că versiunea instalată acum poate folosi "
-"datele versiunii instalate anterior."
-
-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"There is no guarantee that the version you're currently installing will be "
-"able to use the current databases."
+"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
+"indicates a database binary format version that cannot automatically be "
+"upgraded (or downgraded)."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.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."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.templates:2001
+msgid ""
+"Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""

 #. Type: note
@@ -111,31 +102,9 @@ msgstr ""
 "doar să instalaţi o versiune nouă MariaDB sau datele sunt folosite de către "
 "un alt pachet mariadb-server, atunci ar trebui păstraţi datele."

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-#, fuzzy
-#| msgid "Should MySQL start on boot?"
-msgid "Start the MariaDB server on boot?"
-msgstr "Doriţi ca MariaDB să pornească la initializarea sistemului?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-#, fuzzy
-#| msgid ""
-#| "The MySQL can start automatically on boot time or only if you manually "
-#| "type '/etc/init.d/mysql start'."
-msgid ""
-"The MariaDB server can be launched automatically at boot time or manually "
-"with the '/etc/init.d/mysql start' command."
-msgstr ""
-"MariaDB poate porni automat la iniţializarea sistemului sau doar dacă rulaţi "
-"comanda „/etc/init.d/mysql start”."
-
 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "New password for the MariaDB \"root\" user:"
@@ -143,7 +112,7 @@ msgstr "Noua parolă pentru utilizatorul „root” al MariaDB:"

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 #, fuzzy
 #| msgid ""
 #| "It is highly recommended that you set a password for the MySQL "
@@ -157,13 +126,13 @@ msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:7001
+#: ../mariadb-server-10.2.templates:6001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
@@ -171,7 +140,7 @@ msgstr "Noua parolă pentru utilizatorul „root” al MariaDB:"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 #, fuzzy
 #| msgid "Unable to set password for MySQL \"root\" user"
 msgid "Unable to set password for the MariaDB \"root\" user"
@@ -179,7 +148,7 @@ msgstr "Nu s-a putut stabili parola pentru utilizatorul „root” al MariaDB"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 #, fuzzy
 #| msgid ""
 #| "It seems an error occurred while setting the password for the MySQL "
@@ -198,13 +167,13 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid ""
 "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for "
 "more information."
@@ -212,16 +181,51 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "Password input error"
 msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""

+#, fuzzy
+#~| msgid "Do you really want to downgrade?"
+#~ msgid "Really proceed with downgrade?"
+#~ msgstr "Sunteţi sigur că doriţi să instalaţi o versiune mai veche?"
+
+#, fuzzy
+#~| msgid ""
+#~| "WARNING: The file /var/lib/mysql/debian-*.flag exists. This indicates "
+#~| "that a mysql-server package with a higher version has been installed "
+#~| "before. It can not be guaranteed that this version can use its data."
+#~ msgid ""
+#~ "Such a file is an indication that a mariadb-server package with a higher "
+#~ "version has been installed previously."
+#~ msgstr ""
+#~ "AVERTISMENT: Fişierul /var/lib/mysql/debian-*.flag există. Acest lucru "
+#~ "indică faptul că anterior a fost instalată o versiune nouă a pachetului "
+#~ "mariadb-server. Nu se poate garanta că versiunea instalată acum poate "
+#~ "folosi datele versiunii instalate anterior."
+
+#, fuzzy
+#~| msgid "Should MySQL start on boot?"
+#~ msgid "Start the MariaDB server on boot?"
+#~ msgstr "Doriţi ca MariaDB să pornească la initializarea sistemului?"
+
+#, fuzzy
+#~| msgid ""
+#~| "The MySQL can start automatically on boot time or only if you manually "
+#~| "type '/etc/init.d/mysql start'."
+#~ msgid ""
+#~ "The MariaDB server can be launched automatically at boot time or manually "
+#~ "with the '/etc/init.d/mysql start' command."
+#~ msgstr ""
+#~ "MariaDB poate porni automat la iniţializarea sistemului sau doar dacă "
+#~ "rulaţi comanda „/etc/init.d/mysql start”."
+
 #~ msgid "Cannot upgrade if ISAM tables are present!"
 #~ msgstr "Nu se poate face actualizarea dacă sunt prezente tabele ISAM!"

--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.1.37-1\n"
 "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
-"POT-Creation-Date: 2012-01-12 13:08+0100\n"
+"POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2009-08-06 20:27+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -30,37 +30,35 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
-msgid "Really proceed with downgrade?"
-msgstr "Действительно установить более старую версию?"
+msgid "The old data directory will be saved at new location"
+msgstr ""

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
-msgstr "В системе найден файл /var/lib/mysql/debian-*.flag."
-
-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"Such a file is an indication that a mariadb-server package with a higher "
-"version has been installed previously."
+"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
+"indicates a database binary format version that cannot automatically be "
+"upgraded (or downgraded)."
 msgstr ""
-"Это означает, что ранее уже был установлен пакет mariadb-server более новой "
-"версии."

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"There is no guarantee that the version you're currently installing will be "
-"able to use the current databases."
+"Therefore the previous data directory will be renamed to /var/lib/mysql-* "
+"and a new data directory will be initialized at /var/lib/mysql."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.templates:2001
+msgid ""
+"Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
-"Нет гарантий, что версия, которая устанавливается сейчас, будет способна "
-"работать с имеющимися базами данных."

 #. Type: note
 #. Description
@@ -113,31 +111,15 @@ msgstr ""
 "есть другие пакеты mariadb-server, использующие этот каталог, то данные "
 "лучше сохранить."

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid "Start the MariaDB server on boot?"
-msgstr "Запускать MariaDB при загрузке системы?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid ""
-"The MariaDB server can be launched automatically at boot time or manually "
-"with the '/etc/init.d/mysql start' command."
-msgstr ""
-"Сервер MariaDB можно запускать автоматически при загрузке системы или "
-"вручную по команде '/etc/init.d/mysql start'."
-
 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Новый пароль для MariaDB пользователя \"root\":"

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -147,25 +129,25 @@ msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "If this field is left blank, the password will not be changed."
 msgstr "Если оставить поле пустым, то пароль изменён не будет."

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:7001
+#: ../mariadb-server-10.2.templates:6001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr "Повторите ввод пароля для MariaDB пользователя \"root\":"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "Невозможно задать пароль MariaDB пользователю \"root\""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -177,13 +159,13 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr "Проверьте пароль учётной записи после установки пакета."

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 #, fuzzy
 #| msgid ""
 #| "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for "
@@ -196,13 +178,42 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "Password input error"
 msgstr "Ошибка ввода пароля"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr "Два введённых пароля не одинаковы. Повторите ввод."

+#~ msgid "Really proceed with downgrade?"
+#~ msgstr "Действительно установить более старую версию?"
+
+#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
+#~ msgstr "В системе найден файл /var/lib/mysql/debian-*.flag."
+
+#~ msgid ""
+#~ "Such a file is an indication that a mariadb-server package with a higher "
+#~ "version has been installed previously."
+#~ msgstr ""
+#~ "Это означает, что ранее уже был установлен пакет mariadb-server более "
+#~ "новой версии."
+
+#~ msgid ""
+#~ "There is no guarantee that the version you're currently installing will "
+#~ "be able to use the current databases."
+#~ msgstr ""
+#~ "Нет гарантий, что версия, которая устанавливается сейчас, будет способна "
+#~ "работать с имеющимися базами данных."
+
+#~ msgid "Start the MariaDB server on boot?"
+#~ msgstr "Запускать MariaDB при загрузке системы?"
+
+#~ msgid ""
+#~ "The MariaDB server can be launched automatically at boot time or manually "
+#~ "with the '/etc/init.d/mysql start' command."
+#~ msgstr ""
+#~ "Сервер MariaDB можно запускать автоматически при загрузке системы или "
+#~ "вручную по команде '/etc/init.d/mysql start'."
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -1,14 +1,14 @@
 # Translation of mysql-dfsg-5.1 debconf template to Swedish
 # Copyright (C) 2009 Martin Bagge <brother@bsnet.se>
 # This file is distributed under the same license as the mysql-dfsg-5.1 package.
-# 
+#
 # Andreas Henriksson <andreas@fatal.se>, 2007
 # Martin Bagge <brother@bsnet.se>, 2009
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.0.21-3\n"
 "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
-"POT-Creation-Date: 2012-01-12 13:08+0100\n"
+"POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2009-09-08 21:42+0100\n"
 "Last-Translator: Martin Bagge <brother@bsnet.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -19,37 +19,35 @@ msgstr ""
 "X-Poedit-Language: Swedish\n"
 "X-Poedit-Country: Sweden\n"

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
-msgid "Really proceed with downgrade?"
-msgstr "Vill du verkligen genomföra nedgraderingen?"
+msgid "The old data directory will be saved at new location"
+msgstr ""

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
-msgstr "En fil med namnet /var/lib/mysql/debian-*.flag hittades i systemet."
-
-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"Such a file is an indication that a mariadb-server package with a higher "
-"version has been installed previously."
+"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
+"indicates a database binary format version that cannot automatically be "
+"upgraded (or downgraded)."
 msgstr ""
-"En sådan fil är en indikation på att paketet mariadb-server med ett högre "
-"versionsnummer har installerats tidigare."

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"There is no guarantee that the version you're currently installing will be "
-"able to use the current databases."
+"Therefore the previous data directory will be renamed to /var/lib/mysql-* "
+"and a new data directory will be initialized at /var/lib/mysql."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.templates:2001
+msgid ""
+"Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""
-"Det finns ingen garanti för att den version som du håller på att installera "
-"kommer att kunna använda de aktuella databaserna."

 #. Type: note
 #. Description
@@ -105,31 +103,15 @@ msgstr ""
 "en nyare version eller om en annan mariadb-server redan använder filerna ska "
 "de inte raderas."

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid "Start the MariaDB server on boot?"
-msgstr "Ska MariaDB startas vid systemets uppstart?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid ""
-"The MariaDB server can be launched automatically at boot time or manually "
-"with the '/etc/init.d/mysql start' command."
-msgstr ""
-"MariaDB-servern kan startas vid systemets uppstart eller manuellt med "
-"kommandot \"/etc/init.d/mysql start\"."
-
 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Nytt lösenord för MariaDBs \"root\"-användare:"

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -139,25 +121,25 @@ msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "If this field is left blank, the password will not be changed."
 msgstr "Om detta fält lämnas tom kommer lösenordet inte att ändras."

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:7001
+#: ../mariadb-server-10.2.templates:6001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr "Repetera lösenordet för MariaDBs \"root\"-användare:"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "Kunde inte sätta lösenord för MariaDBs \"root\"-användare"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -170,13 +152,13 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr "Du bör kontrollera kontots lösenord efter installationen av paketet."

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 #, fuzzy
 #| msgid ""
 #| "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for "
@@ -190,16 +172,46 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "Password input error"
 msgstr "Fel vid inmatning av lösenord"

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr "De två lösenorden du angav stämde inte överrens. Prova igen."

+#~ msgid "Really proceed with downgrade?"
+#~ msgstr "Vill du verkligen genomföra nedgraderingen?"
+
+#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
+#~ msgstr "En fil med namnet /var/lib/mysql/debian-*.flag hittades i systemet."
+
+#~ msgid ""
+#~ "Such a file is an indication that a mariadb-server package with a higher "
+#~ "version has been installed previously."
+#~ msgstr ""
+#~ "En sådan fil är en indikation på att paketet mariadb-server med ett högre "
+#~ "versionsnummer har installerats tidigare."
+
+#~ msgid ""
+#~ "There is no guarantee that the version you're currently installing will "
+#~ "be able to use the current databases."
+#~ msgstr ""
+#~ "Det finns ingen garanti för att den version som du håller på att "
+#~ "installera kommer att kunna använda de aktuella databaserna."
+
+#~ msgid "Start the MariaDB server on boot?"
+#~ msgstr "Ska MariaDB startas vid systemets uppstart?"
+
+#~ msgid ""
+#~ "The MariaDB server can be launched automatically at boot time or manually "
+#~ "with the '/etc/init.d/mysql start' command."
+#~ msgstr ""
+#~ "MariaDB-servern kan startas vid systemets uppstart eller manuellt med "
+#~ "kommandot \"/etc/init.d/mysql start\"."
+
 #~ msgid ""
 #~ "To use MySQL, the following entries for users and groups should be added "
 #~ "to the system:"
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: mariadb-10.2\n"
 "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
-"POT-Creation-Date: 2012-01-12 13:08+0100\n"
+"POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,32 +17,34 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
-msgid "Really proceed with downgrade?"
+msgid "The old data directory will be saved at new location"
 msgstr ""

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
-msgstr ""
-
-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"Such a file is an indication that a mariadb-server package with a higher "
-"version has been installed previously."
+"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
+"indicates a database binary format version that cannot automatically be "
+"upgraded (or downgraded)."
 msgstr ""

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"There is no guarantee that the version you're currently installing will be "
-"able to use the current databases."
+"Therefore the previous data directory will be renamed to /var/lib/mysql-* "
+"and a new data directory will be initialized at /var/lib/mysql."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.templates:2001
+msgid ""
+"Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""

 #. Type: note
@@ -90,29 +92,15 @@ msgid ""
 "the data should be kept."
 msgstr ""

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid "Start the MariaDB server on boot?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-msgid ""
-"The MariaDB server can be launched automatically at boot time or manually "
-"with the '/etc/init.d/mysql start' command."
-msgstr ""
-
 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -120,25 +108,25 @@ msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:7001
+#: ../mariadb-server-10.2.templates:6001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -147,13 +135,13 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid ""
 "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for "
 "more information."
@@ -161,12 +149,12 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "Password input error"
 msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-4.1\n"
 "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
-"POT-Creation-Date: 2012-01-12 13:08+0100\n"
+"POT-Creation-Date: 2016-10-08 01:26+0300\n"
 "PO-Revision-Date: 2004-06-05 08:53+0300\n"
 "Last-Translator: Gürkan Aslan <gurkan@iaslan.com>\n"
 "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -16,32 +16,34 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=1; plural=0;\n"

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
-msgid "Really proceed with downgrade?"
+msgid "The old data directory will be saved at new location"
 msgstr ""

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:2001
-msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
-msgstr ""
-
-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"Such a file is an indication that a mariadb-server package with a higher "
-"version has been installed previously."
+"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
+"indicates a database binary format version that cannot automatically be "
+"upgraded (or downgraded)."
 msgstr ""

-#. Type: boolean
+#. Type: note
 #. Description
 #: ../mariadb-server-10.2.templates:2001
 msgid ""
-"There is no guarantee that the version you're currently installing will be "
-"able to use the current databases."
+"Therefore the previous data directory will be renamed to /var/lib/mysql-* "
+"and a new data directory will be initialized at /var/lib/mysql."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../mariadb-server-10.2.templates:2001
+msgid ""
+"Please manually export/import your data (e.g. with mysqldump) if needed."
 msgstr ""

 #. Type: note
@@ -91,35 +93,15 @@ msgid ""
 "the data should be kept."
 msgstr ""

-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-#, fuzzy
-#| msgid "Should MySQL start on boot?"
-msgid "Start the MariaDB server on boot?"
-msgstr "MariaDB açılış sırasında başlatılsın mı?"
-
-#. Type: boolean
-#. Description
-#: ../mariadb-server-10.2.templates:5001
-#, fuzzy
-msgid ""
-"The MariaDB server can be launched automatically at boot time or manually "
-"with the '/etc/init.d/mysql start' command."
-msgstr ""
-"MariaDB açılış sırasında veya '/etc/init.d/mysql start' komutunu vermeniz "
-"halinde elle başlatılabilir. Eğer açılışta otomatik olarak başlatılmasını "
-"istiyorsanız burada 'evet'i seçin."
-
 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "New password for the MariaDB \"root\" user:"
 msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
@@ -127,25 +109,25 @@ msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:6001
+#: ../mariadb-server-10.2.templates:5001
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""

 #. Type: password
 #. Description
-#: ../mariadb-server-10.2.templates:7001
+#: ../mariadb-server-10.2.templates:6001
 msgid "Repeat password for the MariaDB \"root\" user:"
 msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
@@ -154,13 +136,13 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:8001
+#: ../mariadb-server-10.2.templates:7001
 msgid ""
 "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for "
 "more information."
@@ -168,16 +150,30 @@ msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "Password input error"
 msgstr ""

 #. Type: error
 #. Description
-#: ../mariadb-server-10.2.templates:9001
+#: ../mariadb-server-10.2.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""

+#, fuzzy
+#~| msgid "Should MySQL start on boot?"
+#~ msgid "Start the MariaDB server on boot?"
+#~ msgstr "MariaDB açılış sırasında başlatılsın mı?"
+
+#, fuzzy
+#~ msgid ""
+#~ "The MariaDB server can be launched automatically at boot time or manually "
+#~ "with the '/etc/init.d/mysql start' command."
+#~ msgstr ""
+#~ "MariaDB açılış sırasında veya '/etc/init.d/mysql start' komutunu vermeniz "
+#~ "halinde elle başlatılabilir. Eğer açılışta otomatik olarak başlatılmasını "
+#~ "istiyorsanız burada 'evet'i seçin."
+
 #~ msgid ""
 #~ "To use mysql you must install an equivalent user and group to the "
 #~ "following and ensure yourself that /var/lib/mysql has the right "
--- a/debian/rules
+++ b/debian/rules
@@ -1,182 +1,149 @@
 #!/usr/bin/make -f

 export DH_VERBOSE=1
-export DEB_BUILD_HARDENING=1

-PACKAGE=mariadb-10.2
+# enable Debian Hardening
+# see: https://wiki.debian.org/Hardening
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk

-include /usr/share/dpatch/dpatch.make
-
-TMP=$(CURDIR)/debian/tmp/
-
-ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-ARCH_OS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+BUILDDIR := builddir
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEBVERSION = $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' )
-
+DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEBVERSION := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' )
 DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
 DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
 DEB_NOEPOCH_VERSION ?= $(shell echo $(DEB_VERSION) | cut -d: -f2-)
 DEB_UPSTREAM_VERSION ?= $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
 DEB_UPSTREAM_VERSION_MAJOR_MINOR := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -r -n 's/^([0-9]+\.[0-9]+).*/\1/p')
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DISTRIBUTION := $(shell lsb_release -i -s)
+RELEASE := $(shell lsb_release -r -s)
+TMP:=$(CURDIR)/debian/tmp

-DISTRIBUTION = $(shell lsb_release -i -s)
-RELEASE = $(shell lsb_release -r -s)
-
-MAKE_J = -j$(shell if [ -f /proc/cpuinfo ] ; then grep -c processor.* /proc/cpuinfo ; else echo 1 ; fi)
-ifeq (${MAKE_J}, -j0)
-  MAKE_J = -j1
-endif
+CC := $(DEB_HOST_GNU_TYPE)-gcc
+CXX := $(DEB_HOST_GNU_TYPE)-g++

 # Parallel build support as advised
 # at https://www.debian.org/doc/debian-policy/ch-source.html#s-debianrules-options
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
    NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
    MAKEFLAGS += -j $(NUMJOBS)
+else
+    # NUMJOBS cannot be empty as it is used as a parameter to mtr, default to 1.
+    NUMJOBS = 1
 endif

-
-USE_ASSEMBLER=--enable-assembler
-
-BUILDDIR = builddir
-builddir = $(BUILDDIR)
-
-# This causes seg11 crashes if LDAP is used for groups in /etc/nsswitch.conf
-# so it is disabled by default although, according to MySQL, it brings >10%
-# performance gain if enabled. See #299382.
-ifeq ($(STATIC_MYSQLD), 1)
-    USE_STATIC_MYSQLD=--with-mysqld-ldflags=-all-static
+# Ignore test suite exit code on unstable platforms
+ifneq (,$(filter $(ARCH), mips mipsel))
+    TESTSUITE_FAIL_CMD:=true
+else
+    TESTSUITE_FAIL_CMD:=exit 1
 endif

-configure: patch configure-stamp
-configure-stamp:
+# Skip TokuDB if arch is not amd64
+ifneq ($(ARCH), amd64)
+    CMAKEFLAGS += -DWITHOUT_TOKUDB=true
+endif
+
+# Add support for verbose builds
+MAKEFLAGS += VERBOSE=1
+
+override_dh_auto_clean:
+	@echo "RULES.$@"
+	dh_testdir
+	dh_testroot
+	[ ! -d mysql-test/var ] || rm -rf mysql-test/var
+	rm -rf $(BUILDDIR)
+	debconf-updatepo # Update po-files when clean runs before each build
+
+override_dh_prep:
+        # Don't clean /tmp/ away, it is needed by all binary packages
+
+override_dh_auto_configure:
 	@echo "RULES.$@"
 	dh_testdir

-ifneq ($(ARCH_OS),hurd)
-	if [ ! -d /proc/self ]; then echo "/proc IS NEEDED" 1>&2; exit 1; fi 
+	# Versioned symbols are only available on Linux.
+	# Remove symbols file on kFreeBSD builds so that
+	# dpkg-gensymbols will not fail the build.
+ifneq (,$(filter $(ARCH), kfreebsd-i386 kfreebsd-amd64))
+	rm debian/libmariadbclient18.symbols
 endif

-	( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
-	sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/usr/lib/ccache:/usr/local/bin:/usr/bin:/bin"} \
-			CC=$${MYSQL_BUILD_CC:-gcc} \
-			CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized"} \
-			CXX=$${MYSQL_BUILD_CXX:-g++} \
-			CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized"} \
-		cmake .. \
-		-DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
-		-DBUILD_CONFIG=mysql_release \
-		-DCOMPILATION_COMMENT="mariadb.org binary distribution" \
-		-DSYSTEM_TYPE="debian-linux-gnu" \
-		-DDEB=ubuntu'
-
+	mkdir -p $(BUILDDIR) && cd $(BUILDDIR) && \
+	sh -c  'PATH=$${MYSQL_BUILD_PATH:-"/usr/lib/ccache:/usr/local/bin:/usr/bin:/bin"} \
+	    	CC=${CC} \
+	    	CXX=${CXX} \
+	    cmake -DCMAKE_INSTALL_PREFIX=/usr \
+	    $(CMAKEFLAGS) \
+	    -DCOMPILATION_COMMENT="mariadb.org binary distribution" \
+	    -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
+	    -DSYSTEM_TYPE="debian-$(DEB_BUILD_GNU_SYSTEM)" \
+	    -DCMAKE_SYSTEM_PROCESSOR=$(DEB_BUILD_ARCH) \
+	    -DBUILD_CONFIG=mysql_release \
+	    -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
+	    -DINSTALL_PLUGINDIR=lib/mysql/plugin \
+	    -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test \
+	    -DDEB=$(DISTRIBUTION) ..'
 	touch $@

-build: build-stamp
+# This is needed, otherwise 'make test' will run before binaries have been built
+override_dh_auto_build:
+	@echo "RULES.$@"
+	# Print build env info to help debug builds on different platforms
+	dpkg-architecture
+	cd $(BUILDDIR) && $(MAKE)
+	touch $@

-build-stamp: configure
+override_dh_auto_test:
 	@echo "RULES.$@"
 	dh_testdir
-
-	cd $(builddir) && $(MAKE) $(MAKE_J) $(AM_EXTRA_MAKEFLAGS)
-
-ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),)
-	if [ ! -f testsuite-stamp ] ; then \
-	  cd $(builddir)/mysql-test && ./mtr --force --mem --parallel=$(NUMJOBS) --skip-rpl --suite=main; \
-	fi
+	# Skip unstable tests if such are defined for arch
+	[ ! -f debian/unstable-tests.$(ARCH) ] || cat debian/unstable-tests.$(ARCH) >> mysql-test/unstable-tests
+	# Run testsuite
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	cd $(BUILDDIR)/mysql-test && ./mtr --force --mem --parallel=$(NUMJOBS) --skip-rpl --suite=main --skip-test-list=unstable-tests  || $(TESTSUITE_FAIL_CMD) ;
 endif

-	touch testsuite-stamp
-
-	touch build-stamp
-
-clean: clean-patched unpatch
-	rm -rf debian/patched
-clean-patched:
-	@echo "RULES.clean-patched"
-	dh_testdir 
-	dh_testroot
-	rm -f configure-stamp*
-	rm -f build-stamp*
-	rm -f testsuite-stamp
-	#
-	[ ! -f Makefile ] || $(MAKE) clean
-	[ ! -d mysql-test/var ] || rm -rf mysql-test/var
-	#
-	rm -rf $(BUILDDIR)
-
-	debconf-updatepo
-	dh_clean -v
-
-
-install: build
+override_dh_auto_install:
 	@echo "RULES.$@"
 	dh_testdir
 	dh_testroot
-	dh_clean -k
-	dh_installdirs

-	# some self written manpages which hopefully
-	# gets overwritten sooner or later with upstreams
-	mkdir -p $(TMP)/usr/share/man/man1/
-	mkdir -p $(TMP)/usr/share/man/man8/
-	cp debian/additions/*.1 $(TMP)/usr/share/man/man1/
-	mkdir -p $(TMP)/etc/mysql/conf.d/
-	cp debian/additions/mysqld_safe_syslog.cnf $(TMP)/etc/mysql/conf.d/
+	# If TokuDB plugin was not built skip the package
+	[ -f $(BUILDDIR)/storage/tokudb/ha_tokudb.so ] || sed -i -e "/Package: mariadb-plugin-tokudb/,+14d" debian/control

-	# make install (trailing slash needed for innobase)
-	cd $(builddir) && $(MAKE) install DESTDIR=$(TMP)/
-	#
-	# After installing, remove rpath to make lintian happy.
-	set +e; \
-	find ./debian/tmp/ -type f -print0 \
-		| xargs -0 --no-run-if-empty chrpath -k 2>/dev/null \
-		| fgrep RPATH= \
-		| cut -d: -f 1 \
-		| xargs --no-run-if-empty chrpath -d; \
-	set -e
+	# If Mroonga plugin was not built skip the package
+	[ -f $(BUILDDIR)/storage/mroonga/ha_mroonga.so ] || sed -i -e "/Package: mariadb-plugin-mroonga/,+13d" debian/control

-	# libmysqlclient-dev: forgotten header file since 3.23.25?
-	cp $(BUILDDIR)/include/my_config.h $(TMP)/usr/include/mysql/
-	cp include/my_dir.h $(TMP)/usr/include/mysql/
+	# If libthrift-dev was available (manually installed, as it is
+	# not in Debian) and ha_cassandra.so was thus built, create package,
+	# otherwise skip it.
+	[ -f $(BUILDDIR)/storage/cassandra/ha_cassandra.so ] || sed -i -e "/Package: mariadb-plugin-cassandra/,+16d" debian/control

-	# mysql-common: We provide our own version of this package for
-	# completeness, but we can use an existing version; mariadb-specic
-	# stuff is in mariadb-common
-	install -d $(TMP)/etc/mysql
-	install -m 0644 debian/additions/my.cnf $(TMP)/etc/mysql/my.cnf
+	# If Spider plugin was not built skip the package
+	[ -f $(BUILDDIR)/storage/spider/ha_spider.so ] || sed -i -e "/Package: mariadb-plugin-spider/,+14d" debian/control

-	# mariadb-common: MariaDB-specific config stuff.
-	install -d $(TMP)/etc/mysql/conf.d
-	install -m 0644 debian/additions/mariadb.cnf $(TMP)/etc/mysql/conf.d/mariadb.cnf
+	# Copy systemd files to a location available for dh_installinit
+	cp $(BUILDDIR)/support-files/mariadb.service debian/mariadb-server-10.2.mariadb.service
+	cp $(BUILDDIR)/support-files/mariadb@.service debian/mariadb-server-10.2.mariadb@.service

-	# mariadb-client
-	install -m 0755 debian/additions/mysqlreport $(TMP)/usr/bin/
-	install -m 0755 debian/additions/innotop/innotop $(TMP)/usr/bin/
-	install -m 0644 debian/additions/innotop/innotop.1 $(TMP)/usr/share/man/man1/
+	# make install
+	cd $(BUILDDIR) && $(MAKE) install DESTDIR=$(TMP)

-	# mariadb-server
-	install -m 0755 $(BUILDDIR)/scripts/mysqld_safe $(TMP)/usr/bin/mysqld_safe
-	mkdir -p $(TMP)/usr/share/doc/mariadb-server-10.2/examples
-	# We have a sane my.cnf, cruft not needed (remove my-*.cnf and config-*.cnf)
-	#  $(TMP)/usr/share/mysql/*cnf      $(TMP)/usr/share/doc/mariadb-server-10.2/examples/
-	rm -vf $(TMP)/usr/share/mysql/my-*.cnf \
-	       $(TMP)/usr/share/mysql/config-*.cnf \
-	       $(TMP)/usr/share/mysql/mi_test_all* \
-	       $(TMP)/usr/share/mysql/mysql-log-rotate \
-	       $(TMP)/usr/share/mysql/mysql.server \
-	       $(TMP)/usr/share/mysql/binary-configure
-	nm -n $(BUILDDIR)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/mariadb-server-10.2/mysqld.sym.gz
-	install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/mysql/
-	install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/
-	install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/
+	# Delete runnable files we don't want to have in the test data package.
+	# This avoids triggering multiple Lintian errors.
+	rm -rf $(TMP)/usr/share/mysql/mysql-test/plugin/tokudb/tokudb/*.py
+	rm -rf $(TMP)/usr/share/mysql/mysql-test/plugin/tokudb/tokudb/t/*.py

-	install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-server-10.2/INFO_SRC
-	install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-server-10.2/INFO_BIN
-
-	# mariadb-test
-	mv $(TMP)/usr/mysql-test	$(TMP)/usr/share/mysql
+	# nm numeric soft is not enough, therefore extra sort in command
+	# to satisfy Debian reproducible build requirements
+	nm --defined-only $(BUILDDIR)/sql/mysqld | LC_ALL=C sort | gzip -n -9 > $(TMP)/usr/share/doc/mariadb-server-10.2/mysqld.sym.gz

 	# For 5.0 -> 10.2 transition
 	d=$(TMP)/usr/share/mysql-common/internal-use-only/; \
@@ -185,98 +152,33 @@ install: build
 	cp debian/mariadb-server-10.2.mysql-server.logrotate $$d/_etc_logrotate.d_mysql-server; \
 	cp debian/additions/debian-start $$d/_etc_mysql_debian-start;

-	# install AppArmor profile
+	# rename and install AppArmor profile
 	install -D -m 644 debian/apparmor-profile $(TMP)/etc/apparmor.d/usr.sbin.mysqld
 	# install Apport hook
 	install -D -m 644 debian/mariadb-server-10.2.py $(TMP)/usr/share/apport/package-hooks/source_mariadb-10.2.py

-	autorm=debian/autorm-file;                                      \
-	rm -f $$autorm;                                                 \
-	ignore='';                                                      \
-	for p in $$MARIADB_OPTIONAL_DEBS; do                            \
-	  p=mariadb-$$p;                                            \
-	  dh_movefiles --package=$$p || echo "../$$p*.deb" >> $$autorm; \
-	  ignore="$$ignore --no-package=$$p";                           \
-	done;                                                           \
-	sh -c "dh_movefiles $$ignore"
+	touch $@

-# Build architecture-independent files here.
-binary-indep: build install
-	@echo "RULES.binary-indep"
-	dh_testdir -i
-	dh_testroot -i
-	dh_installdebconf -i
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_installmenu -i
-	dh_installlogrotate -i
-	dh_installinit -i
-	dh_installcron -i 
-	dh_installman -i
-	dh_installinfo -i
-	dh_installlogcheck -i
-	dh_installchangelogs -i
-	dh_link -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_perl -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
+override_dh_installlogrotate-arch:
+	dh_installlogrotate --name mysql-server

-# Build architecture-dependent files here.
-binary-arch: build install
-	@echo "RULES.binary-arch"
-	dh_testdir 
-	dh_testroot
+override_dh_systemd_enable:
+	dh_systemd_enable --name=mariadb
+	dh_systemd_enable --no-enable --name=mariadb@

-	dh_installdebconf -a
-	dh_installdocs -a
-	dh_installexamples -a
-	dh_installmenu -a
-	dh_installlogrotate -a --name mysql-server
-	if [ -x /usr/bin/dh_systemd_enable -a -f debian/mariadb-server-10.2/lib/systemd/system/mariadb.service ]; then dh_systemd_enable -pmariadb-server-10.2 mariadb.service; fi
-	if [ -x /usr/bin/dh_systemd_enable -a -f debian/mariadb-server-10.2/lib/systemd/system/mariadb@.service ]; then dh_systemd_enable --no-enable -pmariadb-server-10.2 mariadb@.service; fi
-	# Start mysql in runlevel 19 before 20 where apache, proftpd etc gets
-	# started which might depend on a running database server.
-	dh_installinit -a --name=mysql -- defaults 19 21
-	if [ -x /usr/bin/dh_systemd_start -a -f debian/mariadb-server-10.2/lib/systemd/system/mariadb.service ]; then dh_systemd_start -pmariadb-server-10.2 --restart-after-upgrade mariadb.service; fi
-	dh_installcron -a --name mysql-server
-	dh_installman -a
-	dh_installinfo -a
-	dh_installlogcheck -a
-	dh_installchangelogs -a
-	dh_strip -a
-	dh_link -a	# .so muss nach .so.1.2.3 installier werden!
-	dh_compress -a --exclude=INFO_BIN
-	dh_fixperms -a
-	dh_makeshlibs -a
-	dh_makeshlibs -plibmariadbclient18 -V'libmariadbclient18 (>= 5.5.1-1)'
-	dh_installdeb -a
-	dh_perl -a
-	dh_shlibdeps -a -l debian/libmariadbclient18/usr/lib -L libmariadbclient18
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
+# Start mysql at sequence number 19 before 20 where apache, proftpd etc gets
+# started which might depend on a running database server.
+override_dh_installinit-arch:
+	dh_installinit --name=mysql -- defaults 19 21
+	dh_systemd_start --restart-after-upgrade

-source diff:
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-binary:	binary-indep binary-arch
+override_dh_installcron-arch:
+	dh_installcron --name mysql-server

 get-orig-source:
-	@wget -nv -T10 -t3 \
-	  -O /tmp/mysql-$(DEB_UPSTREAM_VERSION).tar.gz \
-	  http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-$(DEB_UPSTREAM_VERSION_MAJOR_MINOR)/mysql-$(DEB_UPSTREAM_VERSION).tar.gz
-	@tar xfz /tmp/mysql-$(DEB_UPSTREAM_VERSION).tar.gz -C /tmp
-	@rm -rf /tmp/mysql-$(DEB_UPSTREAM_VERSION)/Docs
-	@rm -rf /tmp/mysql-$(DEB_UPSTREAM_VERSION)/debian
-	@mv /tmp/mysql-$(DEB_UPSTREAM_VERSION) /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig
-	@cd /tmp ; tar czf $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig
-	@rm -f /tmp/mysql-$(DEB_UPSTREAM_VERSION).tar.gz
-	@rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig
+	uscan --force-download --verbose

-.PHONY: clean clean-patched configure build binary binary-indep binary-arch install patch unpatch
+%:
+	dh $@ --parallel --with dpatch --with systemd

 # vim: ts=8
--- a/debian/source/format
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
--- a/storage/cassandra/CMakeLists.txt
+++ b/storage/cassandra/CMakeLists.txt
@@ -50,7 +50,6 @@ SET(cassandra_sources
 LINK_DIRECTORIES(${LINK_DIR})

 IF(CASSANDRASE_OK)
-  SET(CASSANDRA_DEB_FILES "usr/lib/mysql/plugin/ha_cassandra.so" PARENT_SCOPE)
  MYSQL_ADD_PLUGIN(cassandra ${cassandra_sources} STORAGE_ENGINE
    MODULE_ONLY LINK_LIBRARIES thrift COMPONENT cassandra-engine)
 ENDIF(CASSANDRASE_OK)
--- a/storage/spider/CMakeLists.txt
+++ b/storage/spider/CMakeLists.txt
@@ -41,7 +41,6 @@ ELSE()
    ${CMAKE_SOURCE_DIR}/storage/spider/scripts/install_spider.sql
    DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
  )
-  SET(SPIDER_DEB_FILES "usr/lib/mysql/plugin/ha_spider.so usr/share/mysql/install_spider.sql" PARENT_SCOPE)
  MYSQL_ADD_PLUGIN(spider ${SPIDER_SOURCES} STORAGE_ENGINE MODULE_ONLY MODULE_OUTPUT_NAME "ha_spider")
 ENDIF()

--- a/storage/tokudb/CMakeLists.txt
+++ b/storage/tokudb/CMakeLists.txt
@@ -35,7 +35,6 @@ ENDIF()
 MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-vla" DEBUG)

 ############################################
-SET(TOKUDB_DEB_FILES "usr/lib/mysql/plugin/ha_tokudb.so\netc/mysql/conf.d/tokudb.cnf\nusr/bin/tokuftdump" PARENT_SCOPE)
 MARK_AS_ADVANCED(BUILDNAME)
 MARK_AS_ADVANCED(BUILD_TESTING)
 MARK_AS_ADVANCED(CMAKE_TOKUDB_REVISION)
				`@@ -0,0 +1 @@`
				`debian/tmp/usr/share/man/man1/mysql_config.1`
				`@@ -0,0 +1 @@`
				`debian/additions/mariadb.cnf etc/mysql/conf.d`