diff options
Diffstat (limited to 'debian')
94 files changed, 1109 insertions, 984 deletions
diff --git a/debian/additions/debian-start b/debian/additions/debian-start index 3202b3abc46..7940bbe68a5 100755 --- a/debian/additions/debian-start +++ b/debian/additions/debian-start @@ -4,6 +4,8 @@ # # Changes to this file will be preserved when updating the Debian package. # +# NOTE: This file is read only by the traditional SysV init script, not systemd. +# source /usr/share/mysql/debian-start.inc.sh diff --git a/debian/additions/innotop/changelog.innotop b/debian/additions/innotop/changelog.innotop index 67bc52698e7..1816595240b 100644 --- a/debian/additions/innotop/changelog.innotop +++ b/debian/additions/innotop/changelog.innotop @@ -77,7 +77,7 @@ Changelog for innotop: * remove cxn from $meta->{group_by} if there's only one connection displayed * fix for issue 19 - cxn column won't become visible when viewing two connections after having viewed one connection - * supress errors resulting from the addition of a 'BACKGROUND THREAD' + * suppress errors resulting from the addition of a 'BACKGROUND THREAD' section in the output of 'show innodb status' * possible fix for issue 22 - Useless use of a constant in void context * small change to set_to_tbl() around hiding the cxn column if there diff --git a/debian/additions/innotop/innotop b/debian/additions/innotop/innotop index ee0488580f6..eb4b3590cf6 100644 --- a/debian/additions/innotop/innotop +++ b/debian/additions/innotop/innotop @@ -4657,7 +4657,7 @@ my %stmt_maker_for = ( my $sth; eval { # This can fail if the table doesn't exist, INFORMATION_SCHEMA doesn't exist, etc. my $cols = $dbh->selectall_arrayref(q{SHOW /*innotop*/ COLUMNS FROM INFORMATION_SCHEMA.PROCESSLIST LIKE 'TIME_MS'}); - if ( @$cols ) { # The TIME_MS colum exists + if ( @$cols ) { # The TIME_MS column exists $sth = $dbh->prepare(q{SELECT /*innotop*/ ID, USER, HOST, DB, COMMAND, CASE WHEN TIME_MS/1000 > 365*86400 THEN TIME ELSE TIME_MS/1000 END AS TIME, STATE, INFO FROM INFORMATION_SCHEMA.PROCESSLIST}); } }; @@ -11653,7 +11653,7 @@ show you something like this: pages_modified Dirty Pages Pages modified (dirty IB_bp_pages_m buf_pool_hit_rate Hit Rate Buffer pool hit rate IB_bp_buf_poo total_mem_alloc Memory Total memory allocate IB_bp_total_m - add_pool_alloc Add'l Pool Additonal pool alloca IB_bp_add_poo + add_pool_alloc Add'l Pool Additional pool alloca IB_bp_add_poo The first line shows which table you're editing, and reminds you again to press '?' for a list of key mappings. The rest is a tabular representation of the diff --git a/debian/additions/innotop/innotop.1 b/debian/additions/innotop/innotop.1 index 1b56faebcfd..4c705422286 100644 --- a/debian/additions/innotop/innotop.1 +++ b/debian/additions/innotop/innotop.1 @@ -1678,7 +1678,7 @@ show you something like this: \& pages_modified Dirty Pages Pages modified (dirty IB_bp_pages_m \& buf_pool_hit_rate Hit Rate Buffer pool hit rate IB_bp_buf_poo \& total_mem_alloc Memory Total memory allocate IB_bp_total_m -\& add_pool_alloc Add\*(Aql Pool Additonal pool alloca IB_bp_add_poo +\& add_pool_alloc Add\*(Aql Pool Additional pool alloca IB_bp_add_poo .Ve .PP The first line shows which table you're editing, and reminds you again to press diff --git a/debian/additions/my.cnf b/debian/additions/my.cnf index d30ec182c8b..91a159e4669 100644 --- a/debian/additions/my.cnf +++ b/debian/additions/my.cnf @@ -186,4 +186,5 @@ key_buffer = 16M # * IMPORTANT: Additional settings that can override those from this file! # The files must end with '.cnf', otherwise they'll be ignored. # +!include /etc/mysql/mariadb.cnf !includedir /etc/mysql/conf.d/ diff --git a/debian/additions/mysqlreport b/debian/additions/mysqlreport index 64eaf93783a..6588b17f808 100755 --- a/debian/additions/mysqlreport +++ b/debian/additions/mysqlreport @@ -143,7 +143,6 @@ my $have_subquerycache_vals = 0; my $have_binlog_vals = 0; my $have_tokudb_engine = 0; my $use_thread_pool = 0; -my $use_xtradb = 0; if(defined $op{'r'}) { @@ -699,15 +698,6 @@ sub get_MySQL_version } else { $have_tokudb_engine = 0; } - - $use_xtradb = $dbh->selectall_arrayref("SELECT 1 FROM INFORMATION_SCHEMA.ENGINES WHERE ENGINE = 'InnoDB' AND COMMENT LIKE 'Percona-XtraDB%';", undef)->[0][0]; - if(defined($use_xtradb) && $use_xtradb eq "1") - { - print "XtraDB detected\n" if $op{debug}; - $use_xtradb = 1; - } else { - $use_xtradb = 0; - } } } @@ -1204,11 +1194,6 @@ sub write_InnoDB $~ = 'IB'; write; - if($use_xtradb) - { - $~ = 'IB_XTRADB'; - write; - } # Innodb_row_lock_ values were added in MySQL 5.0.3 if($MySQL_version >= 50003) @@ -1216,11 +1201,6 @@ sub write_InnoDB $~ = 'IB_LOCK'; write; } - if($use_xtradb) - { - $~ = 'IB_LOCK_XTRADB'; - write; - } # Data, Pages, Rows $~ = 'IB_DPR'; @@ -1511,11 +1491,6 @@ Flushes @>>>>>>>> @>>>>>/s make_short($stats{'Innodb_buffer_pool_pages_flushed'}), t($stats{'Innodb_buffer_pool_pages_flushed'}) . -format IB_XTRADB = - LRU @>>>>>>>> @>>>>>/s %LRU: @>>>>> -make_short($stats{'Innodb_buffer_pool_pages_lru_flushed'}), t($stats{'Innodb_buffer_pool_pages_lru_flushed'}), perc($stats{'Innodb_buffer_pool_pages_lru_flushed'}, $stats{'Innodb_buffer_pool_pages_flushed'}) -. - format IB_LOCK = __ InnoDB Lock _________________________________________________________ @@ -1532,11 +1507,6 @@ $stats{'Innodb_row_lock_time_avg'} $stats{'Innodb_row_lock_time_max'} . -format IB_LOCK_XTRADB = -Trx history @>>>>>>>> -make_short($stats{'Innodb_history_list_length'}) -. - format IB_DPR = __ InnoDB Data, Pages, Rows ____________________________________________ diff --git a/debian/apparmor-profile b/debian/apparmor-profile index 4ffb7eab550..b1f229b33b4 100644 --- a/debian/apparmor-profile +++ b/debian/apparmor-profile @@ -1,4 +1,4 @@ -# This file is intensionally empty to disable apparmor by default for newer +# This file is intentionally empty to disable apparmor by default for newer # versions of MariaDB, while providing seamless upgrade from older versions # and from mysql, where apparmor is used. # @@ -11,5 +11,5 @@ # be used. # # When upgrading from previous version, users who modified the profile -# will be promptet to keep or discard it, while for default installs +# will be prompted to keep or discard it, while for default installs # we will automatically disable the profile. diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 687f2356153..4dba4de26b7 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -6,16 +6,11 @@ # Exit immediately on any error set -e -# On Buildbot, don't run the mysql-test-run test suite as part of build. -# It takes a lot of time, and we will do a better test anyway in -# Buildbot, running the test suite from installed .debs on a clean VM. -# On Travis-CI we want to simulate the full build, including tests. -# Also on Travis-CI it is useful not to override the DEB_BUILD_OPTIONS -# at this stage at all. -if [[ ! $TRAVIS ]] -then - export DEB_BUILD_OPTIONS="nocheck" -fi +# This file is invocated from Buildbot and Travis-CI to build deb packages. +# As both of those CI systems have many parallel jobs that include different +# parts of the test suite, we don't need to run the mysql-test-run at all when +# building the deb packages here. +export DEB_BUILD_OPTIONS="nocheck $DEB_BUILD_OPTIONS" # Travis-CI optimizations if [[ $TRAVIS ]] @@ -26,22 +21,27 @@ then # Don't include test suite package on Travis-CI to make the build time shorter sed '/Package: mariadb-test-data/,/^$/d' -i debian/control sed '/Package: mariadb-test/,/^$/d' -i debian/control + + # Don't build the test package at all to save time and disk space + sed 's|DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test|DINSTALL_MYSQLTESTDIR=false|' -i debian/rules + + # Also skip building RocksDB and TokuDB to save even more time and disk space + sed 's|-DDEB|-DPLUGIN_TOKUDB=NO -DPLUGIN_MROONGA=NO -DPLUGIN_ROCKSDB=NO -DPLUGIN_SPIDER=NO -DPLUGIN_OQGRAPH=NO -DPLUGIN_PERFSCHEMA=NO -DPLUGIN_SPHINX=NO -WITH_EMBEDDED_SERVER=OFF -DDEB|' -i debian/rules fi +# Convert gcc version to numberical value. Format is Mmmpp where M is Major +# version, mm is minor version and p is patch. +# -dumpfullversion & -dumpversion to make it uniform across old and new (>=7) +GCCVERSION=$(gcc -dumpfullversion -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' \ + -e 's/\.\([0-9]\)/0\1/g' \ + -e 's/^[0-9]\{3,4\}$/&00/') # 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 +# Debian policy and targeting Debian Sid. Then case-by-case run in autobake-deb.sh # tests for backwards compatibility and strip away parts on older builders. -# If iproute2 is not available (before Debian Jessie and Ubuntu Trusty) -# fall back to the old iproute package. -if ! apt-cache madison iproute2 | grep 'iproute2 *|' >/dev/null 2>&1 -then - sed 's/iproute2/iproute/' -i debian/control -fi - # 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 @@ -67,20 +67,32 @@ then 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 + sed '/galera_new_cluster/d' -i debian/mariadb-server-10.3.install + sed '/galera_recovery/d' -i debian/mariadb-server-10.3.install + sed '/mariadb-service-convert/d' -i debian/mariadb-server-10.3.install +fi + +# If libzstd-dev is not available (before Debian Stretch and Ubuntu Xenial) +# remove the dependency from server and rocksdb so it can build properly +if ! apt-cache madison libzstd-dev | grep 'libzstd-dev' >/dev/null 2>&1 +then + sed '/libzstd-dev/d' -i debian/control + sed '/libzstd1/d' -i debian/control +fi + +# The binaries should be fully hardened by default. However TokuDB compilation seems to fail on +# Debian Jessie and older and on Ubuntu Xenial and older with the following error message: +# /usr/bin/ld.bfd.real: /tmp/ccOIwjFo.ltrans0.ltrans.o: relocation R_X86_64_PC32 against symbol +# `toku_product_name_strings' can not be used when making a shared object; recompile with -fPIC +# Therefore we need to disable PIE on those releases using gcc as proxy for detection. +if [[ $GCCVERSION -lt 60000 ]] +then + sed 's/hardening=+all$/hardening=+all,-pie/' -i debian/rules fi -# Convert gcc version to numberical value. Format is Mmmpp where M is Major -# version, mm is minor version and p is patch. -# -dumpfullversion & -dumpversion to make it uniform across old and new (>=7) -GCCVERSION=$(gcc -dumpfullversion -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' \ - -e 's/\.\([0-9]\)/0\1/g' \ - -e 's/^[0-9]\{3,4\}$/&00/') # Don't build rocksdb package if gcc version is less than 4.8 or we are running on # x86 32 bit. -if [[ $GCCVERSION -lt 40800 ]] || [[ $(arch) =~ i[346]86 ]] +if [[ $GCCVERSION -lt 40800 ]] || [[ $(arch) =~ i[346]86 ]] || [[ $TRAVIS ]] then sed '/Package: mariadb-plugin-rocksdb/,/^$/d' -i debian/control fi @@ -94,6 +106,17 @@ then sed '/Package: mariadb-plugin-cassandra/,/^$/d' -i debian/control fi +# Mroonga, TokuDB never built on Travis CI anyway, see build flags above +if [[ $TRAVIS ]] +then + sed -i -e "/Package: mariadb-plugin-tokudb/,/^$/d" debian/control + sed -i -e "/Package: mariadb-plugin-mroonga/,/^$/d" debian/control + sed -i -e "/Package: mariadb-plugin-spider/,/^$/d" debian/control + sed -i -e "/Package: mariadb-plugin-oqgraph/,/^$/d" debian/control + sed -i -e "/usr\/lib\/mysql\/plugin\/ha_sphinx.so/d" debian/mariadb-server-10.3.install + sed -i -e "/Package: libmariadbd-dev/,/^$/d" debian/control +fi + # Adjust changelog, add new version echo "Incrementing changelog and starting build scripts" @@ -103,10 +126,7 @@ UPSTREAM="${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${ PATCHLEVEL="+maria" LOGSTRING="MariaDB build" CODENAME="$(lsb_release -sc)" -VERNUM="$(lsb_release -sr)" -if [[ "${VERNUM%.*}" -ge 18 ]]; then - EPOCH="1:" -fi +EPOCH="1:" dch -b -D ${CODENAME} -v "${EPOCH}${UPSTREAM}${PATCHLEVEL}~${CODENAME}" "Automatic build with ${LOGSTRING}." @@ -122,7 +142,7 @@ fi # Build the package # Pass -I so that .git and other unnecessary temporary and source control files # will be ignored by dpkg-source when creating the tar.gz source package. -fakeroot dpkg-buildpackage -us -uc -I $BUILDPACKAGE_FLAGS +fakeroot dpkg-buildpackage -us -uc -I $BUILDPACKAGE_FLAGS -j$(nproc) # If the step above fails due to missing dependencies, you can manually run # sudo mk-build-deps debian/control -r -i diff --git a/debian/changelog b/debian/changelog index 31ba0ab81cc..dec49bd4282 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +mariadb-10.3 (1:10.3.0) unstable; urgency=low + + * Bump epoch to supersede 1:10.1.29-6 in Debian + + -- Otto Kekäläinen <otto@mariadb.org> Sat, 31 Mar 2018 22:34:34 +0300 + +mariadb-10.3 (10.3.0) unstable; urgency=low + + * Initial release. + + -- Vicențiu Ciorbaru <vicentiu@mariadb.org> Wed, 5 Apr 2017 21:18:02 +0200 + mariadb-10.2 (10.2.0) unstable; urgency=low * Initial release. diff --git a/debian/control b/debian/control index ba6243c38dd..8896f4d1dcd 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: mariadb-10.2 +Source: mariadb-10.3 Section: database Priority: optional Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net> @@ -8,23 +8,24 @@ Build-Depends: bison, debhelper (>= 9), dh-apparmor, dh-systemd, - dpatch, gdb, libaio-dev [linux-any], libboost-dev, libcrack2-dev (>= 2.9.0), + libcurl3-dev, libjemalloc-dev (>= 3.0.0~) [linux-any], libjudy-dev, libkrb5-dev, libncurses5-dev (>= 5.0-6~), - libnuma-dev, + libnuma-dev [!armhf], libpam0g-dev, libpcre3-dev (>= 2:8.35-3.2~), libreadline-gplv2-dev, - libssl-dev | libssl1.0-dev, libsnappy-dev, + libssl-dev | libssl1.0-dev, libsystemd-dev, libxml2-dev, + libzstd-dev, lsb-release, perl (>= 5.6.0), po-debconf, @@ -37,89 +38,163 @@ Homepage: http://mariadb.org/ Vcs-Browser: https://github.com/MariaDB/server/ Vcs-Git: https://github.com/MariaDB/server.git +Package: libmariadb-dev +Architecture: any +Multi-Arch: same +Section: libdevel +Depends: libmariadb3 (= ${binary:Version}), + zlib1g-dev, + ${misc:Depends}, + ${shlibs:Depends} +Breaks: libmariadbclient-dev +Replaces: libmariadbclient-dev +Conflicts: libmariadbclient16-dev +Provides: libmariadbclient-dev +Description: MariaDB database development 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 includes development libraries and header files. To allow sources + expecting the MariaDB Connector/C to build. Sources that expect the MySQL + Client libraries should use files from the libmariadb-dev-compat package. + +Package: libmariadb-dev-compat +Architecture: any +Multi-Arch: same +Section: libdevel +Priority: extra +Depends: libmariadb-dev (= ${binary:Version}), + ${misc:Depends} +Conflicts: libmariadb-client-lgpl-dev-compat, + libmariadbclient-dev-compat, + libmysqlclient-dev, + libmysqlclient10-dev, + libmysqlclient12-dev, + libmysqlclient14-dev, + libmysqlclient15-dev, + libmysqlclient16-dev +Provides: libmariadb-client-lgpl-dev-compat, + libmariadbclient-dev-compat, + libmysqlclient-dev +Replaces: libmariadb-client-lgpl-dev-compat, + libmariadbclient-dev-compat, + libmysqlclient-dev +Description: MariaDB Connector/C, compatibility symlinks + 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 compatibility symlinks to allow sources expecting the + MySQL client libraries to be built against MariaDB Connector/C. + Package: libmariadb3 Architecture: any +Multi-Arch: same Section: libs -Depends: mariadb-common, ${misc:Depends}, ${shlibs:Depends} -Conflicts: mariadb-galera-server-10.0 (<< 10.0.5), +Depends: mariadb-common, + ${misc:Depends}, + ${shlibs:Depends} +Conflicts: libmariadbclient18 (<< 10.2.0), + mariadb-galera-server-10.0 (<< 10.0.5), mariadb-galera-server-5.5 (<< 5.5.33), mariadb-server-10.0 (<< 10.0.5), mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3, - mariadb-server-5.5 (<< 5.5.33), - libmariadbclient18 (<< 10.2.0) + mariadb-server-5.5 (<< 5.5.33) Breaks: libmariadbclient18 (<< ${source:Version}) -Replaces: libmariadbclient18 (<< ${source:Version}), - libmysqlclient19, +Replaces: libmariadbclient18 (<< ${source:Version}) +Description: MariaDB database client library + 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 client library. + +Package: libmariadb3-compat +Architecture: any +Section: libs +Depends: libmariadb3, + mariadb-common, + ${misc:Depends}, + ${shlibs:Depends} +Breaks: libmysqlclient19, + libmysqlclient20 +Replaces: libmysqlclient19, libmysqlclient20 Provides: libmysqlclient19, libmysqlclient20 -Description: MariaDB database client library +Description: MariaDB database client library MySQL compat package 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 client library. + This package includes the client runtime libraries that simulate and replace + the equivalents found in MySQL 5.6 and 5.7 (mysqlclient19 and 20). Package: libmariadbclient18 Section: libs Architecture: any -Depends: libmariadb3 (= ${binary:Version}), ${misc:Depends} +Depends: libmariadb3 (= ${binary:Version}), + ${misc:Depends} Replaces: libmariadbclient18 Provides: libmariadbclient18 -Description: Virtual package to satisfy external depends +Description: Virtual package to satisfy external libmariadbclient18 depends 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 provides compatibility symlinks for libmariadb3 + This package provides compatibility symlinks for binaries that expect to find + libmariadbclient.so.18 will automatically use libmariadb.so.3 instead. Package: libmysqlclient18 Section: libs Architecture: any -Depends: libmariadb3 (= ${binary:Version}), ${misc:Depends} +Depends: libmariadb3 (= ${binary:Version}), + ${misc:Depends} Replaces: libmysqlclient18 Provides: libmysqlclient18 -Description: Virtual package to satisfy external depends +Description: Virtual package to satisfy external libmysqlclient18 depends 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 provides compatibility symlinks for libmariadb3 + This package provides compatibility symlinks for binaries that expect to find + libmysqlclient.so.18 will automatically use libmariadb.so.3 instead. -Package: libmariadb-dev +Package: libmariadbd-dev Architecture: any +Multi-Arch: same Section: libdevel -Depends: libmariadb3 (= ${binary:Version}), - zlib1g-dev, +Provides: libmysqld-dev +Pre-Depends: ${misc:Pre-Depends} +Depends: libmariadb-dev (= ${binary:Version}), + libmariadbd19 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} -Breaks: libmariadbclient-dev, libmysqlclient-dev -Replaces: libmariadbclient-dev, libmysqlclient-dev -Conflicts: libmariadbclient16-dev, - libmysqlclient10-dev, - libmysqlclient12-dev, - libmysqlclient14-dev, - libmysqlclient15-dev, - libmysqlclient16-dev -Provides: libmariadbclient-dev, libmariadbclient-dev-compat, libmysqlclient-dev -Description: MariaDB database development files +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 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 development libraries and header files. + This package includes the embedded server library development and header files. Package: libmariadbd19 Architecture: any -Section: libs -Depends: ${misc:Depends}, ${shlibs:Depends} Multi-Arch: same +Section: libs +Depends: ${misc:Depends}, + ${shlibs:Depends} Breaks: libmariadbd-dev (<< ${source:Version}) Replaces: libmariadbd-dev (<< ${source:Version}) Description: MariaDB embedded database, shared library @@ -130,28 +205,10 @@ Description: MariaDB embedded database, shared library . This package includes a shared library for embedded MariaDB applications -Package: libmariadbd-dev -Architecture: any -Section: libdevel -Provides: libmysqld-dev -Pre-Depends: ${misc:Pre-Depends} -Depends: libmariadb-dev (= ${binary:Version}), - libmariadbd19 (= ${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 - 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 embedded server library development and header files. - Package: mysql-common Architecture: all -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends}, + ${shlibs:Depends} Description: MariaDB database common files (e.g. /etc/mysql/my.cnf) MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -163,7 +220,9 @@ Description: MariaDB database common files (e.g. /etc/mysql/my.cnf) Package: mariadb-common Architecture: all -Depends: mysql-common, ${misc:Depends}, ${shlibs:Depends} +Depends: mysql-common, + ${misc:Depends}, + ${shlibs:Depends} Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf) MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -173,19 +232,21 @@ Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf) This package includes files needed by all versions of the client library (e.g. /etc/mysql/conf.d/mariadb.cnf). -Package: mariadb-client-core-10.2 +Package: mariadb-client-core-10.3 Architecture: any Depends: mariadb-common (>= ${source:Version}), libmariadb3, ${misc:Depends}, ${shlibs:Depends} Conflicts: mariadb-client-10.0, mariadb-client-10.1, + mariadb-client-10.2, mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3, mariadb-client-5.5, mariadb-client-core-10.0, mariadb-client-core-10.1, + mariadb-client-core-10.2, mariadb-client-core-5.1, mariadb-client-core-5.2, mariadb-client-core-5.3, @@ -201,12 +262,14 @@ Conflicts: mariadb-client-10.0, virtual-mysql-client-core Replaces: mariadb-client-10.0, mariadb-client-10.1, + mariadb-client-10.2, mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3, mariadb-client-5.5, mariadb-client-core-10.0, mariadb-client-core-10.1, + mariadb-client-core-10.2, mariadb-client-core-5.1, mariadb-client-core-5.2, mariadb-client-core-5.3, @@ -235,10 +298,10 @@ Description: MariaDB database core client binaries . This package includes the core client files, as used by Akonadi. -Package: mariadb-client-10.2 +Package: mariadb-client-10.3 Architecture: any Depends: debianutils (>=1.6), - mariadb-client-core-10.2 (>= ${source:Version}), + mariadb-client-core-10.3 (>= ${source:Version}), mariadb-common, ${misc:Depends}, ${perl:Depends}, @@ -246,6 +309,7 @@ Depends: debianutils (>=1.6), Conflicts: mariadb-client (<< ${source:Version}), mariadb-client-10.0, mariadb-client-10.1, + mariadb-client-10.2, mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3, @@ -260,6 +324,7 @@ Conflicts: mariadb-client (<< ${source:Version}), Replaces: mariadb-client (<< ${source:Version}), mariadb-client-10.0, mariadb-client-10.1, + mariadb-client-10.2, mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3, @@ -279,7 +344,9 @@ Provides: default-mysql-client, mysql-client-5.6, mysql-client-5.7, virtual-mysql-client -Recommends: libdbd-mysql-perl (>= 1.2202), libdbi-perl, libterm-readkey-perl +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 @@ -289,7 +356,7 @@ Description: MariaDB database client binaries This package includes the client binaries and the additional tools innotop and mysqlreport. -Package: mariadb-server-core-10.2 +Package: mariadb-server-core-10.3 Architecture: any Depends: mariadb-common (>= ${source:Version}), ${misc:Depends}, @@ -309,14 +376,17 @@ Conflicts: mariadb-server-core-10.0, virtual-mysql-server-core Breaks: mariadb-client-10.0, mariadb-client-10.1, - mariadb-client-10.2 (<< ${source:Version}), - mariadb-server-10.2 (<< ${source:Version}) + mariadb-client-10.2, + mariadb-client-10.3 (<< ${source:Version}), + mariadb-server-10.3 (<< ${source:Version}) Replaces: mariadb-client-10.0, mariadb-client-10.1, - mariadb-client-10.2 (<< ${source:Version}), - mariadb-server-10.2 (<< ${source:Version}), + mariadb-client-10.2, + mariadb-client-10.3 (<< ${source:Version}), + mariadb-server-10.3 (<< ${source:Version}), mariadb-server-core-10.0, mariadb-server-core-10.1, + mariadb-server-core-10.2, mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.3, @@ -343,22 +413,24 @@ Description: MariaDB database core server files . This package includes the core server files, as used by Akonadi. -Package: mariadb-server-10.2 +Package: mariadb-server-10.3 Architecture: any -Suggests: mailx, mariadb-test, netcat-openbsd, tinyca +Suggests: mailx, + mariadb-test, + netcat-openbsd, + tinyca Recommends: libhtml-template-perl -Pre-Depends: adduser (>= 3.40), debconf, mariadb-common (>= ${source:Version}) -Depends: bsdutils, - coreutils, - findutils, - galera-3 (>=25.3), +Pre-Depends: adduser (>= 3.40), + debconf, + mariadb-common (>= ${source:Version}) +Depends: galera-3 (>=25.3), gawk, iproute | iproute2, libdbi-perl, lsb-base (>= 3.0-10), lsof, - mariadb-client-10.2 (>= ${source:Version}), - mariadb-server-core-10.2 (>= ${binary:Version}), + mariadb-client-10.3 (>= ${source:Version}), + mariadb-server-core-10.3 (>= ${binary:Version}), passwd, perl (>= 5.6), psmisc, @@ -369,12 +441,14 @@ Depends: bsdutils, Conflicts: mariadb-server (<< ${source:Version}), mariadb-server-10.0, mariadb-server-10.1, + mariadb-server-10.2, mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3, mariadb-server-5.5, mariadb-tokudb-engine-10.0, mariadb-tokudb-engine-10.1, + mariadb-tokudb-engine-10.2, mariadb-tokudb-engine-5.5, mysql-server (<< ${source:Version}), mysql-server-4.1, @@ -389,12 +463,14 @@ Replaces: libmariadbclient-dev (<< 5.5.0), mariadb-server (<< ${source:Version}), mariadb-server-10.0, mariadb-server-10.1, + mariadb-server-10.2, mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3, mariadb-server-5.5, mariadb-tokudb-engine-10.0, mariadb-tokudb-engine-10.1, + mariadb-tokudb-engine-10.2, mariadb-tokudb-engine-5.5, mysql-server (<< ${source:Version}), mysql-server-4.1, @@ -404,7 +480,8 @@ Replaces: libmariadbclient-dev (<< 5.5.0), mysql-server-5.6, mysql-server-5.7, virtual-mysql-server -Provides: default-mysql-server, virtual-mysql-server +Provides: default-mysql-server, + 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 @@ -415,10 +492,11 @@ Description: MariaDB database server binaries Package: mariadb-server Architecture: all -Depends: mariadb-server-10.2 (>= ${source:Version}), ${misc:Depends} +Depends: mariadb-server-10.3 (>= ${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 + mariadb-server (currently mariadb-server-10.3), as determined by the MariaDB maintainers. Install this package if in doubt about which MariaDB version you need. That will install the version recommended by the package maintainers. @@ -430,22 +508,27 @@ 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.3 (>= ${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 + mariadb-client (currently mariadb-client-10.3), as determined by the MariaDB maintainers. Install this package if in doubt about which MariaDB version you want, as this is the one considered to be in the best shape. Package: mariadb-plugin-connect Architecture: any Depends: libxml2, - mariadb-server-10.2 (= ${binary:Version}), + mariadb-server-10.3 (= ${binary:Version}), 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 +Breaks: mariadb-connect-engine-10.1, + mariadb-connect-engine-10.2, + mariadb-connect-engine-10.3 +Replaces: mariadb-connect-engine-10.1, + mariadb-connect-engine-10.2, + mariadb-connect-engine-10.3 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 @@ -453,10 +536,15 @@ Description: Connect storage engine for MariaDB This package contains the Connect plugin for MariaDB. Package: mariadb-plugin-rocksdb -Architecture: any -Depends: mariadb-server-10.2 (= ${binary:Version}), +Architecture: amd64 arm64 mips64el ppc64el +Depends: mariadb-server-10.3 (= ${binary:Version}), + libzstd1, ${misc:Depends}, ${shlibs:Depends} +Breaks: mariadb-rocksdb-engine-10.2, + mariadb-rocksdb-engine-10.3 +Replaces: mariadb-rocksdb-engine-10.2, + mariadb-rocksdb-engine-10.3 Recommends: python-mysqldb Description: RocksDB storage engine for MariaDB The RocksDB storage engine is a high performance storage engine, aimed @@ -466,28 +554,34 @@ Description: RocksDB storage engine for MariaDB Package: mariadb-plugin-oqgraph Architecture: any Depends: libjudydebian1, - mariadb-server-10.2 (= ${binary:Version}), + mariadb-server-10.3 (= ${binary:Version}), ${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 +Breaks: mariadb-oqgraph-engine-10.1, + mariadb-oqgraph-engine-10.2, + mariadb-oqgraph-engine-10.3 +Replaces: mariadb-oqgraph-engine-10.1, + mariadb-oqgraph-engine-10.2, + mariadb-oqgraph-engine-10.3 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-plugin-tokudb -Architecture: any -Depends: mariadb-server-10.2 (= ${binary:Version}), +Architecture: amd64 +Depends: mariadb-server-10.3 (= ${binary:Version}), libjemalloc1 (>= 3.0.0~) | libjemalloc2, ${misc:Depends}, ${shlibs:Depends} Breaks: mariadb-server-10.0, mariadb-server-10.1, - mariadb-server-10.2 (<< ${source:Version}) + mariadb-server-10.2, + mariadb-server-10.3 (<< ${source:Version}) Replaces: mariadb-server-10.0, mariadb-server-10.1, - mariadb-server-10.2 (<< ${source:Version}) + mariadb-server-10.2, + mariadb-server-10.3 (<< ${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 @@ -495,16 +589,18 @@ Description: TokuDB storage engine for MariaDB This package contains the TokuDB plugin for MariaDB. Package: mariadb-plugin-mroonga -Architecture: any -Depends: mariadb-server-10.2 (= ${binary:Version}), +Architecture: any-alpha any-amd64 any-arm any-arm64 any-i386 any-ia64 any-mips64el any-mips64r6el any-mipsel any-mipsr6el any-nios2 any-powerpcel any-ppc64el any-sh3 any-sh4 any-tilegx +Depends: mariadb-server-10.3 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Breaks: mariadb-server-10.0, mariadb-server-10.1, - mariadb-server-10.2 (<< ${source:Version}) + mariadb-server-10.2, + mariadb-server-10.3 (<< ${source:Version}) Replaces: mariadb-server-10.0, mariadb-server-10.1, - mariadb-server-10.2 (<< ${source:Version}) + mariadb-server-10.2, + mariadb-server-10.3 (<< ${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. @@ -512,15 +608,17 @@ Description: Mroonga storage engine for MariaDB Package: mariadb-plugin-spider Architecture: any -Depends: mariadb-server-10.2 (= ${binary:Version}), +Depends: mariadb-server-10.3 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Breaks: mariadb-server-10.0, mariadb-server-10.1, - mariadb-server-10.2 (<< ${source:Version}) + mariadb-server-10.2, + mariadb-server-10.3 (<< ${source:Version}) Replaces: mariadb-server-10.0, mariadb-server-10.1, - mariadb-server-10.2 (<< ${source:Version}) + mariadb-server-10.2, + mariadb-server-10.3 (<< ${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 @@ -529,15 +627,17 @@ Description: Spider storage engine for MariaDB Package: mariadb-plugin-cassandra Architecture: any -Depends: mariadb-server-10.2 (= ${binary:Version}), +Depends: mariadb-server-10.3 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Breaks: mariadb-server-10.0, mariadb-server-10.1, - mariadb-server-10.2 (<< ${source:Version}) + mariadb-server-10.2, + mariadb-server-10.3 (<< ${source:Version}) Replaces: mariadb-server-10.0, mariadb-server-10.1, - mariadb-server-10.2 (<< ${source:Version}) + mariadb-server-10.2, + mariadb-server-10.3 (<< ${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 @@ -549,66 +649,76 @@ Description: Cassandra storage engine for MariaDB Package: mariadb-plugin-gssapi-server Architecture: any Depends: libgssapi-krb5-2, - mariadb-server-10.2, + mariadb-server-10.3, ${misc:Depends}, ${shlibs:Depends} -Breaks: mariadb-gssapi-server-10.1, mariadb-gssapi-server-10.2 -Replaces: mariadb-gssapi-server-10.1, mariadb-gssapi-server-10.2 +Breaks: mariadb-gssapi-server-10.1, + mariadb-gssapi-server-10.2, + mariadb-gssapi-server-10.3 +Replaces: mariadb-gssapi-server-10.1, + mariadb-gssapi-server-10.2, + mariadb-gssapi-server-10.3 Description: GSSAPI authentication plugin for MariaDB server + This plugin includes support for Kerberos on Unix, but can also be used for + Windows authentication with or without domain environment. + . + This package contains the server parts. Package: mariadb-plugin-gssapi-client Architecture: any Depends: libgssapi-krb5-2, - mariadb-client-10.2, + mariadb-client-10.3, ${misc:Depends}, ${shlibs:Depends} -Breaks: mariadb-gssapi-client-10.1, mariadb-gssapi-client-10.2 -Replaces: mariadb-gssapi-client-10.1, mariadb-gssapi-client-10.2 +Breaks: mariadb-gssapi-client-10.1, + mariadb-gssapi-client-10.2, + mariadb-gssapi-client-10.3 +Replaces: mariadb-gssapi-client-10.1, + mariadb-gssapi-client-10.2, + mariadb-gssapi-client-10.3 Description: GSSAPI authentication plugin for MariaDB client + This plugin includes support for Kerberos on Unix, but can also be used for + Windows authentication with or without domain environment. + . + This package contains the client parts. -Package: mariadb-backup-10.2 -Section: database +Package: mariadb-backup Architecture: any -Breaks: mariadb-backup-10.1 -Replaces: mariadb-backup-10.1 -Depends: mariadb-client-core-10.2 (= ${binary:Version}), +Breaks: mariadb-backup-10.1, + mariadb-backup-10.2 +Replaces: mariadb-backup-10.1, + mariadb-backup-10.2 +Depends: mariadb-client-core-10.3 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Description: Backup tool for MariaDB server + This backup tool is guaranteed to be compatible with MariaDB. + Based on Xtrabackup, but improved to work with MariaDB. + . + Plese refer to the MariaDB Knowledge Base on more information on + how to use this tool. Package: mariadb-plugin-cracklib-password-check Architecture: any Depends: libcrack2 (>= 2.9.0), - mariadb-server-10.2, + mariadb-server-10.3, ${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. -Package: mariadb-plugin-aws-key-management-10.2 -Section: database -Architecture: any -Breaks: mariadb-aws-key-management-10.1 -Replaces: mariadb-aws-key-management-10.1 -Depends: mariadb-server-10.2, - ${misc:Depends}, - ${shlibs:Depends} -Description: Amazon Web Service Key Management Service Plugin for MariaDB - This encryption key management plugin gives an interface to the Amazon Web - Services Key Management Service for managing encryption keys used for MariaDB - data-at-rest encryption. - Package: mariadb-test Architecture: any -Depends: mariadb-client-10.2 (= ${binary:Version}), - mariadb-server-10.2 (= ${binary:Version}), +Depends: mariadb-client-10.3 (= ${binary:Version}), + mariadb-server-10.3 (= ${binary:Version}), mariadb-test-data (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} Breaks: mariadb-server-5.5, mariadb-test-10.0, mariadb-test-10.1, + mariadb-test-10.2, mariadb-test-5.5, mysql-testsuite, mysql-testsuite-5.5, @@ -618,6 +728,7 @@ Breaks: mariadb-server-5.5, Replaces: mariadb-server-5.5, mariadb-test-10.0, mariadb-test-10.1, + mariadb-test-10.2, mariadb-test-5.5, mysql-testsuite, mysql-testsuite-5.5, @@ -636,9 +747,11 @@ Description: MariaDB database regression test suite Package: mariadb-test-data Architecture: all +Multi-Arch: foreign Depends: ${misc:Depends} Breaks: mariadb-test-10.0, mariadb-test-10.1, + mariadb-test-10.2, mariadb-test-5.5, mariadb-test-data-10.0, mysql-testsuite, @@ -647,6 +760,7 @@ Breaks: mariadb-test-10.0, mysql-testsuite-5.7 Replaces: mariadb-test-10.0, mariadb-test-10.1, + mariadb-test-10.2, mariadb-test-5.5, mariadb-test-data-10.0, mysql-testsuite, diff --git a/debian/copyright b/debian/copyright index 2f27c03a8fc..836fe89f4c3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,7 +5,7 @@ The Debian package of MySQL was first debianzed on 1997-04-12 by Christian Schwarz <schwarz@debian.org> and ist maintained since 1999-04-20 by Christian Hammers <ch@debian.org>. -The MariaDB packages were initally made by http://ourdelta.org/, and +The MariaDB packages were initially made by http://ourdelta.org/, and are now managed by the MariaDB development team, maria-developers@lists.launchpad.net diff --git a/debian/libmariadb-dev-compat.install b/debian/libmariadb-dev-compat.install new file mode 100644 index 00000000000..7fe10c50f69 --- /dev/null +++ b/debian/libmariadb-dev-compat.install @@ -0,0 +1,4 @@ +usr/lib/*/libmysqlclient.a +usr/lib/*/libmysqlclient.so +usr/lib/*/libmysqlclient_r.a +usr/lib/*/libmysqlclient_r.so diff --git a/debian/libmariadb-dev-compat.links b/debian/libmariadb-dev-compat.links new file mode 100644 index 00000000000..11e0dbce225 --- /dev/null +++ b/debian/libmariadb-dev-compat.links @@ -0,0 +1,3 @@ +usr/bin/mariadb_config usr/bin/mysql_config +usr/include/mariadb usr/include/mysql +usr/share/pkgconfig/mariadb.pc usr/share/pkgconfig/mysqlclient.pc diff --git a/debian/libmariadb-dev.install b/debian/libmariadb-dev.install index e62aad1b43f..72798dec379 100644 --- a/debian/libmariadb-dev.install +++ b/debian/libmariadb-dev.install @@ -1,9 +1,9 @@ -usr/bin/mysql_config -usr/include/mysql +usr/bin/mariadb_config +usr/include/mariadb usr/lib/*/libmariadb.so -usr/lib/*/libmysqlclient.so -usr/lib/*/libmariadbclient.so usr/lib/*/libmariadbclient.a +usr/lib/*/libmariadbclient.so usr/lib/*/libmysqlservices.a usr/share/aclocal/mysql.m4 +usr/share/man/man1/mysql_config.1 usr/share/pkgconfig/mariadb.pc diff --git a/debian/libmariadb-dev.links b/debian/libmariadb-dev.links new file mode 100644 index 00000000000..6a7bf707ca7 --- /dev/null +++ b/debian/libmariadb-dev.links @@ -0,0 +1 @@ +usr/share/man/man1/mysql_config.1.gz usr/share/man/man1/mariadb_config.1.gz diff --git a/debian/libmariadb-dev.manpages b/debian/libmariadb-dev.manpages deleted file mode 100644 index 3aac7f4b4a9..00000000000 --- a/debian/libmariadb-dev.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/share/man/man1/mysql_config.1 diff --git a/debian/libmariadb3-compat.install b/debian/libmariadb3-compat.install new file mode 100644 index 00000000000..4e0d631d6c8 --- /dev/null +++ b/debian/libmariadb3-compat.install @@ -0,0 +1,2 @@ +usr/lib/*/libmysqlclient.so.19 +usr/lib/*/libmysqlclient.so.20 diff --git a/debian/libmariadb3.install b/debian/libmariadb3.install index 065adc67a91..8636166a493 100644 --- a/debian/libmariadb3.install +++ b/debian/libmariadb3.install @@ -1,6 +1,5 @@ -usr/lib/*/libmysqlclient.so.19 -usr/lib/*/libmysqlclient.so.20 usr/lib/*/libmariadb.so.* +usr/lib/mysql/plugin/client_ed25519.so usr/lib/mysql/plugin/dialog.so usr/lib/mysql/plugin/mysql_clear_password.so -usr/lib/mysql/plugin/client_ed25519.so +usr/lib/mysql/plugin/sha256_password.so diff --git a/debian/libmariadbd-dev.install b/debian/libmariadbd-dev.install index 6fe225b15ba..2c14af5ab31 100644 --- a/debian/libmariadbd-dev.install +++ b/debian/libmariadbd-dev.install @@ -1,3 +1,4 @@ -usr/bin/mariadb_config usr/lib/*/libmysqld.a +usr/lib/*/libmariadbd.a usr/lib/*/libmysqld.so +usr/lib/*/libmariadbd.so diff --git a/debian/libmariadbd19.install b/debian/libmariadbd19.install index fb5f4771734..cb627204432 100644 --- a/debian/libmariadbd19.install +++ b/debian/libmariadbd19.install @@ -1 +1 @@ -usr/lib/*/libmysqld.so.* +usr/lib/*/libmariadbd.so.* diff --git a/debian/mariadb-backup-10.2.install b/debian/mariadb-backup.install index 734117c92e2..734117c92e2 100644 --- a/debian/mariadb-backup-10.2.install +++ b/debian/mariadb-backup.install diff --git a/debian/mariadb-client-10.2.install b/debian/mariadb-client-10.2.install deleted file mode 100644 index 271f2a2f417..00000000000 --- a/debian/mariadb-client-10.2.install +++ /dev/null @@ -1,12 +0,0 @@ -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 diff --git a/debian/mariadb-client-10.2.manpages b/debian/mariadb-client-10.2.manpages deleted file mode 100644 index 504619785bc..00000000000 --- a/debian/mariadb-client-10.2.manpages +++ /dev/null @@ -1,12 +0,0 @@ -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 diff --git a/debian/mariadb-client-10.2.README.Debian b/debian/mariadb-client-10.3.README.Debian index b245638f9c9..64f0f509951 100644 --- a/debian/mariadb-client-10.2.README.Debian +++ b/debian/mariadb-client-10.3.README.Debian @@ -1,4 +1,4 @@ FAQ: -Q: My <tab> completition is gone, why? +Q: My <tab> completion is gone, why? A: You have "no-auto-rehash" in the "[mysql]" section of /etc/mysql/my.cnf! diff --git a/debian/mariadb-client-10.2.docs b/debian/mariadb-client-10.3.docs index 8117d689011..c09092629c3 100644 --- a/debian/mariadb-client-10.2.docs +++ b/debian/mariadb-client-10.3.docs @@ -1,2 +1,2 @@ -debian/additions/innotop/changelog.innotop README.md +debian/additions/innotop/changelog.innotop diff --git a/debian/mariadb-client-10.3.install b/debian/mariadb-client-10.3.install new file mode 100644 index 00000000000..945bf77c689 --- /dev/null +++ b/debian/mariadb-client-10.3.install @@ -0,0 +1,22 @@ +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 +usr/share/man/man1/mysql_find_rows.1 +usr/share/man/man1/mysql_fix_extensions.1 +usr/share/man/man1/mysql_waitpid.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/mysqlimport.1 +usr/share/man/man1/mysqlshow.1 +usr/share/man/man1/mysqlslap.1 diff --git a/debian/mariadb-client-10.2.links b/debian/mariadb-client-10.3.links index 0b86e87f2e9..4a504969246 100644 --- a/debian/mariadb-client-10.2.links +++ b/debian/mariadb-client-10.3.links @@ -1,6 +1,6 @@ -usr/bin/mysqlcheck usr/bin/mysqlrepair usr/bin/mysqlcheck usr/bin/mysqlanalyze usr/bin/mysqlcheck usr/bin/mysqloptimize -usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqlrepair.1.gz +usr/bin/mysqlcheck usr/bin/mysqlrepair usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqlanalyze.1.gz usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqloptimize.1.gz +usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqlrepair.1.gz diff --git a/debian/mariadb-client-10.3.manpages b/debian/mariadb-client-10.3.manpages new file mode 100644 index 00000000000..6f3e2bc188c --- /dev/null +++ b/debian/mariadb-client-10.3.manpages @@ -0,0 +1,2 @@ +debian/additions/innotop/innotop.1 +debian/additions/mysqlreport.1 diff --git a/debian/mariadb-client-10.2.menu b/debian/mariadb-client-10.3.menu index c08678536d1..1894442ca20 100644 --- a/debian/mariadb-client-10.2.menu +++ b/debian/mariadb-client-10.3.menu @@ -1,3 +1,3 @@ # According to /usr/share/menu/ policy 1.4, not /usr/share/doc/debian-policy/ -?package(mariadb-client-10.2):needs="text" section="Applications/Data Management"\ +?package(mariadb-client-10.3):needs="text" section="Applications/Data Management"\ title="Innotop" command="/usr/bin/innotop" diff --git a/debian/mariadb-client-core-10.2.install b/debian/mariadb-client-core-10.2.install deleted file mode 100644 index 6308d769930..00000000000 --- a/debian/mariadb-client-core-10.2.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin/mysql -usr/bin/mysqlcheck diff --git a/debian/mariadb-client-core-10.2.manpages b/debian/mariadb-client-core-10.2.manpages deleted file mode 100644 index 2be91d81f9a..00000000000 --- a/debian/mariadb-client-core-10.2.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/share/man/man1/mysql.1 -debian/tmp/usr/share/man/man1/mysqlcheck.1 diff --git a/debian/mariadb-client-core-10.3.install b/debian/mariadb-client-core-10.3.install new file mode 100644 index 00000000000..a2781309439 --- /dev/null +++ b/debian/mariadb-client-core-10.3.install @@ -0,0 +1,4 @@ +usr/bin/mysql +usr/bin/mysqlcheck +usr/share/man/man1/mysql.1 +usr/share/man/man1/mysqlcheck.1 diff --git a/debian/mariadb-common.install b/debian/mariadb-common.install index 78dbc22b9f6..611c7d4d36e 100644 --- a/debian/mariadb-common.install +++ b/debian/mariadb-common.install @@ -1 +1 @@ -debian/additions/mariadb.cnf etc/mysql/conf.d +debian/additions/mariadb.cnf etc/mysql/ diff --git a/debian/mariadb-plugin-aws-key-management-10.2.install b/debian/mariadb-plugin-aws-key-management-10.2.install deleted file mode 100644 index ed966b4115d..00000000000 --- a/debian/mariadb-plugin-aws-key-management-10.2.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/mysql/plugin/aws_key_management.so -debian/additions/enable_encryption.preset etc/mysql/conf.d/ diff --git a/debian/mariadb-plugin-aws-key-management.install b/debian/mariadb-plugin-aws-key-management.install new file mode 100644 index 00000000000..199d4c87950 --- /dev/null +++ b/debian/mariadb-plugin-aws-key-management.install @@ -0,0 +1,3 @@ +debian/additions/enable_encryption.preset etc/mysql/mariadb.conf.d +etc/mysql/conf.d/aws_key_management.cnf etc/mysql/mariadb.conf.d +usr/lib/mysql/plugin/aws_key_management.so diff --git a/debian/mariadb-plugin-connect.install b/debian/mariadb-plugin-connect.install index 8a7aee412df..22d73c7df05 100644 --- a/debian/mariadb-plugin-connect.install +++ b/debian/mariadb-plugin-connect.install @@ -1,2 +1,2 @@ -etc/mysql/conf.d/connect.cnf +etc/mysql/conf.d/connect.cnf etc/mysql/mariadb.conf.d usr/lib/mysql/plugin/ha_connect.so diff --git a/debian/mariadb-plugin-mroonga.install b/debian/mariadb-plugin-mroonga.install index c28fde2fd18..fedcf62eef0 100644 --- a/debian/mariadb-plugin-mroonga.install +++ b/debian/mariadb-plugin-mroonga.install @@ -1,3 +1,5 @@ usr/lib/mysql/plugin/ha_mroonga.so +usr/share/mysql/mroonga/AUTHORS +usr/share/mysql/mroonga/COPYING usr/share/mysql/mroonga/install.sql usr/share/mysql/mroonga/uninstall.sql diff --git a/debian/mariadb-plugin-rocksdb.install b/debian/mariadb-plugin-rocksdb.install index fd71995b6a3..b9a6f7dc432 100644 --- a/debian/mariadb-plugin-rocksdb.install +++ b/debian/mariadb-plugin-rocksdb.install @@ -1,5 +1,5 @@ etc/mysql/conf.d/rocksdb.cnf etc/mysql/mariadb.conf.d -usr/lib/mysql/plugin/ha_rocksdb.so usr/bin/mysql_ldb usr/bin/myrocks_hotbackup usr/bin/sst_dump +usr/lib/mysql/plugin/ha_rocksdb.so diff --git a/debian/mariadb-plugin-tokudb.install b/debian/mariadb-plugin-tokudb.install index 48d16ffb2c0..e8925c1d4f1 100644 --- a/debian/mariadb-plugin-tokudb.install +++ b/debian/mariadb-plugin-tokudb.install @@ -1,5 +1,8 @@ etc/mysql/conf.d/tokudb.cnf etc/mysql/mariadb.conf.d etc/systemd/system/mariadb.service.d/tokudb.conf +usr/bin/tokuft_logprint 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 +usr/share/doc/mariadb-server-10.3/README.md usr/share/doc/mariadb-plugin-tokudb/README.md +usr/share/man/man1/tokuft_logprint.1 +usr/share/man/man1/tokuftdump.1 diff --git a/debian/mariadb-server-10.2.manpages b/debian/mariadb-server-10.2.manpages deleted file mode 100644 index 1825b7655da..00000000000 --- a/debian/mariadb-server-10.2.manpages +++ /dev/null @@ -1,25 +0,0 @@ -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 diff --git a/debian/mariadb-server-10.2.mysql.default b/debian/mariadb-server-10.2.mysql.default deleted file mode 100644 index 22f08e54427..00000000000 --- a/debian/mariadb-server-10.2.mysql.default +++ /dev/null @@ -1,8 +0,0 @@ -# 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" diff --git a/debian/mariadb-server-10.2.README.Debian b/debian/mariadb-server-10.3.README.Debian index be2e33d705d..1e8b86f867c 100644 --- a/debian/mariadb-server-10.2.README.Debian +++ b/debian/mariadb-server-10.3.README.Debian @@ -40,9 +40,9 @@ https://mariadb.com/kb * PASSWORDS: ============ It is strongly recommended you create an admin users for your database -adminstration needs. +administration needs. -If your your local unix account is the one you want to have local super user +If your local unix account is the one you want to have local super user access on your database with you can create the following account that will only work for the local unix user connecting to the database locally. @@ -57,14 +57,14 @@ the DB server over the network: sudo /usr/bin/mysql -e "GRANT ALL ON *.* TO 'USERNAME'@'%' IDENTIFIED BY 'password' WITH GRANT OPTION" -Scripts should run as a user have have the required grants and be identified via unix_socket. +Scripts should run as a user have the required grants and be identified via unix_socket. If you are too tired to type the password in every time and unix_socket auth doesn't suit your needs, you can store it in the file $HOME/.my.cnf. It should -be chmod 0600 (-rw------- username username .my.cnf) to ensure that nobody else +be chmod 0600 (-rw------- username usergroup .my.cnf) to ensure that nobody else can read it. Every other configuration parameter can be stored there, too. -For more information in the MariaDB manual in/usr/share/doc/mariadb-doc or +For more information in the MariaDB manual in/usr/share/doc/mariadb-doc or https://mariadb.com/kb/en/configuring-mariadb-with-mycnf/. ATTENTION: It is necessary, that a ~/.my.cnf from root always contains a "user" diff --git a/debian/mariadb-server-10.2.config b/debian/mariadb-server-10.3.config index 44640f2a441..44640f2a441 100644 --- a/debian/mariadb-server-10.2.config +++ b/debian/mariadb-server-10.3.config diff --git a/debian/mariadb-server-10.2.dirs b/debian/mariadb-server-10.3.dirs index 5057fe806c3..5057fe806c3 100644 --- a/debian/mariadb-server-10.2.dirs +++ b/debian/mariadb-server-10.3.dirs diff --git a/debian/mariadb-server-10.2.install b/debian/mariadb-server-10.3.install index 37aab2ad1ba..9447446a6b5 100644 --- a/debian/mariadb-server-10.2.install +++ b/debian/mariadb-server-10.3.install @@ -19,7 +19,6 @@ 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 @@ -34,11 +33,9 @@ usr/bin/replace usr/bin/resolve_stack_dump usr/bin/resolveip usr/bin/wsrep_sst_common +usr/bin/wsrep_sst_mariabackup usr/bin/wsrep_sst_mysqldump usr/bin/wsrep_sst_rsync -usr/bin/wsrep_sst_xtrabackup -usr/bin/wsrep_sst_xtrabackup-v2 -usr/bin/wsrep_sst_mariabackup usr/lib/mysql/plugin/auth_ed25519.so usr/lib/mysql/plugin/auth_pam.so usr/lib/mysql/plugin/auth_socket.so @@ -54,14 +51,44 @@ 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/share/apport/package-hooks/source_mariadb-10.2.py -usr/share/doc/mariadb-server-10.2/mysqld.sym.gz +usr/share/apport/package-hooks/source_mariadb-10.3.py +usr/share/doc/mariadb-server-10.3/mysqld.sym.gz +usr/share/man/man1/aria_chk.1 +usr/share/man/man1/aria_dump_log.1 +usr/share/man/man1/aria_ftdump.1 +usr/share/man/man1/aria_pack.1 +usr/share/man/man1/aria_read_log.1 +usr/share/man/man1/galera_new_cluster.1 +usr/share/man/man1/galera_recovery.1 +usr/share/man/man1/mariadb-service-convert.1 +usr/share/man/man1/msql2mysql.1 +usr/share/man/man1/my_print_defaults.1 +usr/share/man/man1/myisam_ftdump.1 +usr/share/man/man1/myisamchk.1 +usr/share/man/man1/myisamlog.1 +usr/share/man/man1/myisampack.1 +usr/share/man/man1/mysql_convert_table_format.1 +usr/share/man/man1/mysql_plugin.1 +usr/share/man/man1/mysql_secure_installation.1 +usr/share/man/man1/mysql_setpermission.1 +usr/share/man/man1/mysql_tzinfo_to_sql.1 +usr/share/man/man1/mysqlbinlog.1 +usr/share/man/man1/mysqld_multi.1 +usr/share/man/man1/mysqld_safe.1 +usr/share/man/man1/mysqld_safe_helper.1 +usr/share/man/man1/mysqlhotcopy.1 +usr/share/man/man1/perror.1 +usr/share/man/man1/replace.1 +usr/share/man/man1/resolve_stack_dump.1 +usr/share/man/man1/resolveip.1 +usr/share/man/man1/wsrep_sst_common.1 +usr/share/man/man1/wsrep_sst_mysqldump.1 +usr/share/man/man1/wsrep_sst_rsync.1 +usr/share/man/man1/wsrep_sst_mariabackup.1 usr/share/mysql/errmsg-utf8.txt usr/share/mysql/fill_help_tables.sql usr/share/mysql/maria_add_gis_sp_bootstrap.sql @@ -69,4 +96,5 @@ 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/mysql_test_db.sql usr/share/mysql/wsrep_notify diff --git a/debian/mariadb-server-10.2.logcheck.ignore.paranoid b/debian/mariadb-server-10.3.logcheck.ignore.paranoid index 00cc5c3e29d..00cc5c3e29d 100644 --- a/debian/mariadb-server-10.2.logcheck.ignore.paranoid +++ b/debian/mariadb-server-10.3.logcheck.ignore.paranoid diff --git a/debian/mariadb-server-10.2.logcheck.ignore.server b/debian/mariadb-server-10.3.logcheck.ignore.server index a0b4792ecda..a0b4792ecda 100644 --- a/debian/mariadb-server-10.2.logcheck.ignore.server +++ b/debian/mariadb-server-10.3.logcheck.ignore.server diff --git a/debian/mariadb-server-10.2.logcheck.ignore.workstation b/debian/mariadb-server-10.3.logcheck.ignore.workstation index a0b4792ecda..a0b4792ecda 100644 --- a/debian/mariadb-server-10.2.logcheck.ignore.workstation +++ b/debian/mariadb-server-10.3.logcheck.ignore.workstation diff --git a/debian/mariadb-server-10.2.mysql-server.logrotate b/debian/mariadb-server-10.3.mysql-server.logrotate index 4111a276dc3..4111a276dc3 100644 --- a/debian/mariadb-server-10.2.mysql-server.logrotate +++ b/debian/mariadb-server-10.3.mysql-server.logrotate diff --git a/debian/mariadb-server-10.3.mysql.default b/debian/mariadb-server-10.3.mysql.default new file mode 100644 index 00000000000..146c5a87a84 --- /dev/null +++ b/debian/mariadb-server-10.3.mysql.default @@ -0,0 +1,23 @@ +# +# NOTE: This file is read only by the traditional SysV init script. +# Debian 9 and Ubuntu 17.04 onwards do not normally read this file as they use +# systemd by default. +# +# For similar behaviour, systemd users should override ExecStart by dropping +# files into /etc/systemd/system/mariadb.service.d/ +# +# See also: +# https://wiki.debian.org/Teams/pkg-systemd/Packaging#overriding_options_and_.2Fetc.2Fdefault_handling +# https://mariadb.com/kb/en/mariadb/systemd/ +# +# Note also that MariaDB systemd does _not_ utilize mysqld_safe nor debian-start. + + +# 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" diff --git a/debian/mariadb-server-10.2.mysql.init b/debian/mariadb-server-10.3.mysql.init index 0d8128cb7d3..35a52d5d8db 100644 --- a/debian/mariadb-server-10.2.mysql.init +++ b/debian/mariadb-server-10.3.mysql.init @@ -25,7 +25,7 @@ SELF=$(cd $(dirname $0); pwd -P)/$(basename $0) MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf" -# priority can be overriden and "-s" adds output to stderr +# priority can be overridden and "-s" adds output to stderr ERR_LOGGER="logger -p daemon.err -t /etc/init.d/mysql -i" if [ -f /etc/default/mysql ]; then @@ -158,7 +158,7 @@ case "${1:-''}" in if ! mysqld_status check_dead warn; then log_end_msg 1 - log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-10.2/README.Debian.gz!" + log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-10.3/README.Debian.gz!" exit -1 else log_end_msg 0 diff --git a/debian/mariadb-server-10.2.postinst b/debian/mariadb-server-10.3.postinst index b68d2362387..7874a691268 100644 --- a/debian/mariadb-server-10.2.postinst +++ b/debian/mariadb-server-10.3.postinst @@ -135,7 +135,7 @@ EOF # 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 + touch $mysql_datadir/debian-10.3.flag # initiate databases. Output is not allowed by debconf :-( # This will fail if we are upgrading an existing database; in this case @@ -144,7 +144,9 @@ EOF # 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 + bash /usr/bin/mysql_install_db --rpm --cross-bootstrap --user=mysql \ + --disable-log-bin --skip-test-db 2>&1 | \ + $ERR_LOGGER set -e diff --git a/debian/mariadb-server-10.2.postrm b/debian/mariadb-server-10.3.postrm index f8a95df54ea..6ab40df2e12 100644 --- a/debian/mariadb-server-10.2.postrm +++ b/debian/mariadb-server-10.3.postrm @@ -49,9 +49,9 @@ if [ "$1" = "purge" -a ! \( -x /usr/sbin/mysqld -o -L /usr/sbin/mysqld \) ]; the rm -f /var/log/mysql.{log,err}{,.0,.[1234567].gz} rm -rf /var/log/mysql - db_input high mariadb-server-10.2/postrm_remove_databases || true + db_input high mariadb-server-10.3/postrm_remove_databases || true db_go || true - db_get mariadb-server-10.2/postrm_remove_databases || true + db_get mariadb-server-10.3/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! diff --git a/debian/mariadb-server-10.2.preinst b/debian/mariadb-server-10.3.preinst index ed987507d18..cbfc4640c41 100644 --- a/debian/mariadb-server-10.2.preinst +++ b/debian/mariadb-server-10.3.preinst @@ -49,7 +49,7 @@ stop_server() { ################################ main() ########################## -this_version=10.2 +this_version=10.3 max_upgradeable_version=5.7 # Check if a flag file is found that indicates a previous MariaDB or MySQL @@ -113,7 +113,7 @@ fi # 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_input critical mariadb-server-10.3/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 diff --git a/debian/mariadb-server-10.2.prerm b/debian/mariadb-server-10.3.prerm index 0371bbfc844..0371bbfc844 100644 --- a/debian/mariadb-server-10.2.prerm +++ b/debian/mariadb-server-10.3.prerm diff --git a/debian/mariadb-server-10.2.py b/debian/mariadb-server-10.3.py index 7881029a24c..99d3f0fd913 100644 --- a/debian/mariadb-server-10.2.py +++ b/debian/mariadb-server-10.3.py @@ -1,4 +1,4 @@ -'''apport package hook for mariadb-10.2 +'''apport package hook for mariadb-10.3 (c) 2009 Canonical Ltd. Author: Mathias Gug <mathias.gug@canonical.com> @@ -20,7 +20,7 @@ def _add_my_conf_files(report, filename): continue def add_info(report): - attach_conffiles(report, 'mariadb-server-10.2', conffiles=None) + attach_conffiles(report, 'mariadb-server-10.3', conffiles=None) key = 'Logs' + path_to_key('/var/log/daemon.log') report[key] = "" for line in read_file('/var/log/daemon.log').split('\n'): diff --git a/debian/mariadb-server-10.2.templates b/debian/mariadb-server-10.3.templates index dd30daed90d..8ef29264678 100644 --- a/debian/mariadb-server-10.2.templates +++ b/debian/mariadb-server-10.3.templates @@ -7,7 +7,7 @@ # Even minor modifications require translation updates and such # changes should be coordinated with translators and reviewers. -Template: mariadb-server-10.2/old_data_directory_saved +Template: mariadb-server-10.3/old_data_directory_saved Type: note _Description: The old data directory will be saved at new location A file named /var/lib/mysql/debian-*.flag exists on this system. @@ -19,7 +19,7 @@ _Description: The old data directory will be saved at new location . Please manually export/import your data (e.g. with mysqldump) if needed. -Template: mariadb-server-10.2/nis_warning +Template: mariadb-server-10.3/nis_warning Type: note #flag:translate!:3,5 _Description: Important note for NIS/YP users @@ -33,7 +33,7 @@ _Description: Important note for NIS/YP users . /var/lib/mysql: drwxr-xr-x mysql mysql -Template: mariadb-server-10.2/postrm_remove_databases +Template: mariadb-server-10.3/postrm_remove_databases Type: boolean Default: false _Description: Remove all MariaDB databases? @@ -66,7 +66,7 @@ _Description: Unable to set password for the MariaDB "root" user . You should check the account's password after the package installation. . - Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file + Please read the /usr/share/doc/mariadb-server-10.3/README.Debian file for more information. Template: mysql-server/password_mismatch diff --git a/debian/mariadb-server-10.2.triggers b/debian/mariadb-server-10.3.triggers index d1f5f5e14f1..d1f5f5e14f1 100644 --- a/debian/mariadb-server-10.2.triggers +++ b/debian/mariadb-server-10.3.triggers diff --git a/debian/mariadb-server-core-10.2.manpages b/debian/mariadb-server-core-10.2.manpages deleted file mode 100644 index 234108cde50..00000000000 --- a/debian/mariadb-server-core-10.2.manpages +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/debian/mariadb-server-core-10.2.install b/debian/mariadb-server-core-10.3.install index d882bd53f52..46c116b618d 100644 --- a/debian/mariadb-server-core-10.2.install +++ b/debian/mariadb-server-core-10.3.install @@ -1,6 +1,11 @@ usr/bin/innochecksum +usr/bin/mysql_install_db usr/bin/mysql_upgrade usr/sbin/mysqld +usr/share/man/man1/innochecksum.1 +usr/share/man/man1/mysql_install_db.1 +usr/share/man/man1/mysql_upgrade.1 +usr/share/man/man8/mysqld.8 usr/share/mysql/charsets usr/share/mysql/czech usr/share/mysql/danish diff --git a/debian/mariadb-test-data.install b/debian/mariadb-test-data.install index 3cd11e1aea9..9e5356d061f 100644 --- a/debian/mariadb-test-data.install +++ b/debian/mariadb-test-data.install @@ -1,9 +1,7 @@ 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/main 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 diff --git a/debian/mariadb-test.install b/debian/mariadb-test.install index 605620dc28c..f715825274c 100644 --- a/debian/mariadb-test.install +++ b/debian/mariadb-test.install @@ -16,10 +16,17 @@ 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/lib/mysql/plugin/test_versioning.so +usr/share/man/man1/mysql-stress-test.pl.1 +usr/share/man/man1/mysql-test-run.pl.1 +usr/share/man/man1/mysql_client_test.1 +usr/share/man/man1/mysql_client_test_embedded.1 +usr/share/man/man1/mysqltest.1 +usr/share/man/man1/mysqltest_embedded.1 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/dgcov.pl usr/share/mysql/mysql-test/lib usr/share/mysql/mysql-test/mysql-stress-test.pl usr/share/mysql/mysql-test/mysql-test-run.pl diff --git a/debian/mariadb-test.links b/debian/mariadb-test.links index 082680fe5ed..884b25a81da 100644 --- a/debian/mariadb-test.links +++ b/debian/mariadb-test.links @@ -1,2 +1,2 @@ -usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mysql-test-run usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mtr +usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mysql-test-run diff --git a/debian/mariadb-test.manpages b/debian/mariadb-test.manpages deleted file mode 100644 index 33ce8710ea7..00000000000 --- a/debian/mariadb-test.manpages +++ /dev/null @@ -1,4 +0,0 @@ -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 diff --git a/debian/mysql-common.install b/debian/mysql-common.install index 5ff685f42ff..56c1c4a03f6 100644 --- a/debian/mysql-common.install +++ b/debian/mysql-common.install @@ -1,2 +1 @@ debian/additions/my.cnf etc/mysql -usr/share/mysql-common/internal-use-only
\ No newline at end of file diff --git a/debian/not-installed b/debian/not-installed new file mode 100644 index 00000000000..c151cf753e6 --- /dev/null +++ b/debian/not-installed @@ -0,0 +1,127 @@ +lib/systemd/system/mariadb.service # Installed by rules file +lib/systemd/system/mariadb@.service # Installed by rules file +usr/bin/mysql_config # We already have the MariaDB variant +usr/bin/mysql_embedded # Huge 500 MB file. Not intended for distribution via any disto package. +usr/bin/mytop # Mytop is distributed from a separate source package +usr/lib/sysusers.d/sysusers.conf +usr/lib/tmpfiles.d/tmpfiles.conf +usr/lib/mysql/plugin/JavaWrappers.jar # These are only built if JNI/libjawt.so is installed from e.g. openjdk-8-jre-headless +usr/lib/mysql/plugin/JdbcInterface.jar # These are only built if JNI/libjawt.so is installed from e.g. openjdk-8-jre-headless +usr/share/doc/mariadb-server-10.3/COPYING +usr/share/doc/mariadb-server-10.3/COPYING.AGPLv3 +usr/share/doc/mariadb-server-10.3/COPYING.GPLv2 +usr/share/doc/mariadb-server-10.3/COPYING.thirdparty +usr/share/doc/mariadb-server-10.3/CREDITS +usr/share/doc/mariadb-server-10.3/EXCEPTIONS-CLIENT +usr/share/doc/mariadb-server-10.3/INSTALL-BINARY +usr/share/doc/mariadb-server-10.3/PATENTS +usr/share/doc/mariadb-server-10.3/README-wsrep +usr/share/groonga/COPYING +usr/share/groonga-normalizer-mysql/lgpl-2.0.txt +usr/share/groonga-normalizer-mysql/README.md +usr/share/groonga/README.md +usr/share/man/man1/my_safe_process.1 +usr/share/man/man1/mysql.server.1 +usr/share/mysql/binary-configure +usr/share/mysql/magic +usr/share/mysql/maria_add_gis_sp.sql +usr/share/mysql/mysqld_multi.server +usr/share/mysql/mysql-log-rotate +usr/share/mysql/mysql.server +usr/share/mysql/mysql-test/mtr # Already created by mariadb-test.links +usr/share/mysql/mysql-test/mysql-test-run # Already created by mariadb-test.links +usr/share/mysql/mysql_to_mariadb.sql +usr/share/mysql/policy/apparmor/README # In MariaDB we don't want to use AppArmor at the moment +usr/share/mysql/policy/apparmor/usr.sbin.mysqld # In MariaDB we don't want to use AppArmor at the moment +usr/share/mysql/policy/apparmor/usr.sbin.mysqld.local # In MariaDB we don't want to use AppArmor at the moment +usr/share/mysql/policy/selinux/mariadb-server.fc # In MariaDB we don't want to use SELinux at the moment +usr/share/mysql/policy/selinux/mariadb-server.te # In MariaDB we don't want to use SELinux at the moment +usr/share/mysql/policy/selinux/mariadb.te # In MariaDB we don't want to use SELinux at the moment +usr/share/mysql/policy/selinux/README # In MariaDB we don't want to use SELinux at the moment +usr/share/mysql/systemd/mariadb.service # Installed by rules file +usr/share/mysql/systemd/mariadb@.service # Installed by rules file +usr/share/mysql/systemd/use_galera_new_cluster.conf +usr/share/mysql/wsrep.cnf +usr/sql-bench/bench-count-distinct +usr/sql-bench/bench-init.pl # SQL-bench is distributed from a separate source package +usr/sql-bench/compare-results +usr/sql-bench/copy-db +usr/sql-bench/crash-me +usr/sql-bench/Data/ATIS/aircraft.txt +usr/sql-bench/Data/ATIS/airline.txt +usr/sql-bench/Data/ATIS/airport_service.txt +usr/sql-bench/Data/ATIS/airport.txt +usr/sql-bench/Data/ATIS/city.txt +usr/sql-bench/Data/ATIS/class_of_service.txt +usr/sql-bench/Data/ATIS/code_description.txt +usr/sql-bench/Data/ATIS/compound_class.txt +usr/sql-bench/Data/ATIS/connect_leg.txt +usr/sql-bench/Data/ATIS/date_day.txt +usr/sql-bench/Data/ATIS/day_name.txt +usr/sql-bench/Data/ATIS/dual_carrier.txt +usr/sql-bench/Data/ATIS/fare.txt +usr/sql-bench/Data/ATIS/fconnection.txt +usr/sql-bench/Data/ATIS/flight_class.txt +usr/sql-bench/Data/ATIS/flight_day.txt +usr/sql-bench/Data/ATIS/flight_fare.txt +usr/sql-bench/Data/ATIS/flight.txt +usr/sql-bench/Data/ATIS/food_service.txt +usr/sql-bench/Data/ATIS/ground_service.txt +usr/sql-bench/Data/ATIS/month_name.txt +usr/sql-bench/Data/ATIS/restrict_carrier.txt +usr/sql-bench/Data/ATIS/restrict_class.txt +usr/sql-bench/Data/ATIS/restriction.txt +usr/sql-bench/Data/ATIS/state.txt +usr/sql-bench/Data/ATIS/stop1.txt +usr/sql-bench/Data/ATIS/stop.txt +usr/sql-bench/Data/ATIS/time_interval.txt +usr/sql-bench/Data/ATIS/time_zone.txt +usr/sql-bench/Data/ATIS/transport.txt +usr/sql-bench/Data/Wisconsin/onek.data +usr/sql-bench/Data/Wisconsin/tenk.data +usr/sql-bench/graph-compare-results +usr/sql-bench/innotest1 +usr/sql-bench/innotest1a +usr/sql-bench/innotest1b +usr/sql-bench/innotest2 +usr/sql-bench/innotest2a +usr/sql-bench/innotest2b +usr/sql-bench/limits/access.cfg +usr/sql-bench/limits/access_odbc.cfg +usr/sql-bench/limits/Adabas.cfg +usr/sql-bench/limits/db2.cfg +usr/sql-bench/limits/empress.cfg +usr/sql-bench/limits/frontbase.cfg +usr/sql-bench/limits/Informix.cfg +usr/sql-bench/limits/interbase.cfg +usr/sql-bench/limits/interbase-dialect1.cfg +usr/sql-bench/limits/interbase-dialect3.cfg +usr/sql-bench/limits/interbase-superserver.cfg +usr/sql-bench/limits/mimer.cfg +usr/sql-bench/limits/msql.cfg +usr/sql-bench/limits/ms-sql65.cfg +usr/sql-bench/limits/ms-sql.cfg +usr/sql-bench/limits/mysql-3.22.cfg +usr/sql-bench/limits/mysql-3.23.cfg +usr/sql-bench/limits/mysql-4.0.cfg +usr/sql-bench/limits/mysql-4.1.cfg +usr/sql-bench/limits/mysql.cfg +usr/sql-bench/limits/oracle.cfg +usr/sql-bench/limits/pg.cfg +usr/sql-bench/limits/solid.cfg +usr/sql-bench/limits/solid-nt4.cfg +usr/sql-bench/limits/sybase.cfg +usr/sql-bench/myisam.cnf +usr/sql-bench/README +usr/sql-bench/run-all-tests +usr/sql-bench/server-cfg +usr/sql-bench/test-alter-table +usr/sql-bench/test-ATIS +usr/sql-bench/test-big-tables +usr/sql-bench/test-connect +usr/sql-bench/test-create +usr/sql-bench/test-insert +usr/sql-bench/test-select +usr/sql-bench/test-table-elimination +usr/sql-bench/test-transactions +usr/sql-bench/test-wisconsin diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index 5d090c644f1..00000000000 --- a/debian/patches/00list +++ /dev/null @@ -1,5 +0,0 @@ -33_scripts__mysql_create_system_tables__no_test.dpatch -38_scripts__mysqld_safe.sh__signals.dpatch -41_scripts__mysql_install_db.sh__no_test.dpatch -50_mysql-test__db_test.dpatch -61_replace_dash_with_bash_mbug675185.dpatch diff --git a/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch b/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch deleted file mode 100755 index a961cfce8a0..00000000000 --- a/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch +++ /dev/null @@ -1,39 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 33_scripts__mysql_create_system_tables__no_test.dpatch by <ch@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: scripts__mysql_create_system_tables__no_test -## DP: A user with no password prevents a normal user from login under certain -## DP: circumstances as it is checked first. See #301741. -## DP: http://bugs.mysql.com/bug.php?id=6901 - -@DPATCH@ ---- a/scripts/mysql_system_tables_data.sql -+++ b/scripts/mysql_system_tables_data.sql -@@ -26,16 +26,6 @@ - -- a plain character - SELECT LOWER( REPLACE((SELECT REPLACE(@@hostname,'_','\_')),'%','\%') )INTO @current_hostname; - -- ---- Fill "db" table with default grants for anyone to ---- access database 'test' and 'test_%' if "db" table didn't exist --CREATE TEMPORARY TABLE tmp_db LIKE db; --INSERT INTO tmp_db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y'); --INSERT INTO tmp_db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y'); --INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0; --DROP TABLE tmp_db; -- -- - -- Fill "user" table with default users allowing root access - -- from local machine if "user" table didn't exist before - CREATE TEMPORARY TABLE tmp_user_nopasswd LIKE user; -@@ -51,9 +41,6 @@ INSERT INTO tmp_user_socket VALUES ('localhost',IFNULL(@auth_root_socket, 'root' - IF @auth_root_socket is not null THEN - IF not exists(select 1 from information_schema.plugins where plugin_name='unix_socket') THEN - INSTALL SONAME 'auth_socket'; END IF; END IF; ---- Anonymous user with no privileges. --INSERT INTO tmp_user_anonymous (host,user) VALUES ('localhost',''); --INSERT INTO tmp_user_anonymous (host,user) SELECT @current_hostname,'' FROM dual WHERE @current_hostname != 'localhost'; - - INSERT INTO user SELECT * FROM tmp_user_nopasswd WHERE @had_user_table=0 AND @skip_auth_root_nopasswd IS NULL; - INSERT INTO user SELECT * FROM tmp_user_socket WHERE @had_user_table=0 AND @auth_root_socket IS NOT NULL; diff --git a/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch b/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch deleted file mode 100755 index 5a9c3a59698..00000000000 --- a/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch +++ /dev/null @@ -1,43 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 38_scripts__mysqld_safe.sh__signals.dpatch by <ch@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Executes /etc/init.d/mysql on signals -## DP: Reported as http://bugs.mysql.com/bug.php?id=31361 - -@DPATCH@ - ---- a/scripts/mysqld_safe.sh 2013-01-11 16:02:41 +0000 -+++ b/scripts/mysqld_safe.sh 2013-01-11 16:03:14 +0000 -@@ -32,7 +32,6 @@ err_log= - syslog_tag_mysqld=mysqld - syslog_tag_mysqld_safe=mysqld_safe - --trap '' 1 2 3 15 # we shouldn't let anyone kill us - - # MySQL-specific environment variable. First off, it's not really a umask, - # it's the desired mode. Second, it follows umask(2), not umask(3) in that -@@ -163,7 +162,7 @@ eval_log_error () { - # sed buffers output (only GNU sed supports a -u (unbuffered) option) - # which means that messages may not get sent to syslog until the - # mysqld process quits. -- cmd="$cmd 2>&1 | logger -t '$syslog_tag_mysqld' -p daemon.error" -+ cmd="$cmd 2>&1 | logger -t '$syslog_tag_mysqld' -p daemon.error & wait" - ;; - *) - echo "Internal program error (non-fatal):" \ -@@ -805,6 +804,13 @@ then - fi - - # -+# From now on, we catch signals to do a proper shutdown of mysqld -+# when signalled to do so. -+# -+trap '/usr/bin/mysqladmin --defaults-extra-file=/etc/mysql/debian.cnf refresh & wait' 1 # HUP -+trap '/usr/bin/mysqladmin --defaults-extra-file=/etc/mysql/debian.cnf shutdown' 2 3 15 # INT QUIT and TERM -+ -+# - # Uncomment the following lines if you want all tables to be automatically - # checked and repaired during startup. You should add sensible key_buffer - # and sort_buffer values to my.cnf to improve check performance or require - diff --git a/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch b/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch deleted file mode 100755 index 9593cd7c3e0..00000000000 --- a/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 41_scripts__mysql_install_db.sh__no_test.dpatch by <ch@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: scripts__mysql_install_db.sh__no_test -## DP: http://bugs.mysql.com/bug.php?id=6901 - -@DPATCH@ - ---- a/scripts/mysql_install_db.sh -+++ b/scripts/mysql_install_db.sh -@@ -36,7 +36,6 @@ in_rpm=0 - ip_only=0 - cross_bootstrap=0 - install_params="create database if not exists mysql; --create database if not exists test; - use mysql;" - auth_root_authentication_method=normal - auth_root_socket_user='root' diff --git a/debian/patches/50_mysql-test__db_test.dpatch b/debian/patches/50_mysql-test__db_test.dpatch deleted file mode 100755 index 14c0fc4acf6..00000000000 --- a/debian/patches/50_mysql-test__db_test.dpatch +++ /dev/null @@ -1,24 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 50_mysql-test__db_test.dpatch by Christian Hammers <ch@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Patch 33_scripts__mysql_create_system_tables__no_test removes the -## DP: rights for anybody to connect to the test database but the test -## DP: suite depends on them. - -@DPATCH@ - ---- old/mysql-test/mysql-test-run.pl 2009-06-16 14:24:09.000000000 +0200 -+++ new/mysql-test/mysql-test-run.pl 2009-07-04 00:03:34.000000000 +0200 -@@ -3578,6 +3578,11 @@ sub mysql_install_db { - mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql", - $bootstrap_sql_file); - -+ mtr_tofile($bootstrap_sql_file, "-- Debian removed the default privileges on the 'test' database\n"); -+ mtr_tofile($bootstrap_sql_file, "INSERT INTO mysql.db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');\n"); -+ mtr_tofile($bootstrap_sql_file, "INSERT INTO mysql.db VALUES ('%','test\\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');\n"); -+ -+ - # Add test data for timezone - this is just a subset, on a real - # system these tables will be populated either by mysql_tzinfo_to_sql - # or by downloading the timezone table package from our website diff --git a/debian/patches/61_replace_dash_with_bash_mbug675185.dpatch b/debian/patches/61_replace_dash_with_bash_mbug675185.dpatch deleted file mode 100755 index 2a4ee8cd648..00000000000 --- a/debian/patches/61_replace_dash_with_bash_mbug675185.dpatch +++ /dev/null @@ -1,20 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 61_replace_dash_with_bash_mbug675185.dpatch by <knielsen@knielsen-hq.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: 61_replace_dash_with_bash_mbug675185 -## DP: A race in dash causes mysqld_safe to occasionally loop infinitely. -## DP: Fix by using bash instead. -## DP: https://bugs.launchpad.net/ubuntu/+source/mysql-dfsg-5.0/+bug/675185 - -@DPATCH@ -=== modified file 'scripts/mysqld_safe.sh' ---- old/scripts/mysqld_safe.sh 2010-04-09 11:47:18 +0000 -+++ new/scripts/mysqld_safe.sh 2010-11-21 09:40:50 +0000 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - # Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB - # This file is public domain and comes with NO WARRANTY of any kind - # - diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in index be16669a512..f2af9ac992f 100644 --- a/debian/po/POTFILES.in +++ b/debian/po/POTFILES.in @@ -1 +1 @@ -[type: gettext/rfc822deb] mariadb-server-10.2.templates +[type: gettext/rfc822deb] mariadb-server-10.3.templates diff --git a/debian/po/ar.po b/debian/po/ar.po index 3b11740a365..69ff80df4fa 100644 --- a/debian/po/ar.po +++ b/debian/po/ar.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: templates\n" -"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.3@packages.debian.org\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n" "PO-Revision-Date: 2007-05-01 13:04+0300\n" "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n" @@ -27,13 +27,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "The old data directory will be saved at new location" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "A file named /var/lib/mysql/debian-*.flag exists on this system. The number " "indicates a database binary format version that cannot automatically be " @@ -42,7 +42,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." @@ -50,20 +50,20 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "Important note for NIS/YP users" msgstr "ملاحظة هامة لمستخدمي NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -71,7 +71,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 #, fuzzy #| msgid "" #| "You should also check the permissions and the owner of the /var/lib/mysql " @@ -83,13 +83,13 @@ msgstr "عليك أيضاً أن تقوم بالتأكد من صلاحيات م #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "Remove all MariaDB databases?" msgstr "إزالة جميع قواعد بيانات MariaDB؟" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -97,7 +97,7 @@ msgstr "الدليل /var/lib/mysql الذي يحتوي قواعد بيانات #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -108,13 +108,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "New password for the MariaDB \"root\" user:" msgstr "كلمة المرور الجديدة لمستخد \"root\" الخاص بـMariaDB:" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -124,7 +124,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 #, fuzzy #| msgid "If that field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed." @@ -132,7 +132,7 @@ msgstr "إن ترك الحقل فارغاً، فلن يتم تغيير كلمة #. Type: password #. Description -#: ../mariadb-server-10.2.templates:6001 +#: ../mariadb-server-10.3.templates:6001 #, fuzzy #| msgid "New password for the MariaDB \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -140,13 +140,13 @@ msgstr "كلمة المرور الجديدة لمستخد \"root\" الخاص ب #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "تعذر تعيين كلمة مرور للمستخدم \"root\" الخاص بـMariaDB." #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -158,7 +158,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 #, fuzzy #| msgid "" #| "You should check the account's password after tha package installation." @@ -167,27 +167,27 @@ msgstr "يجب عليك التحقق من كلمة مرور الحساب عقب #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 #, fuzzy #| msgid "" #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.3/README.Debian file for " "more information." msgstr "" -"الرجاء قراءة الملف /usr/share/doc/mariadb-server-10.2/README.Debian للمزيد " +"الرجاء قراءة الملف /usr/share/doc/mariadb-server-10.3/README.Debian للمزيد " "من المعلومات." #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" diff --git a/debian/po/ca.po b/debian/po/ca.po index 107741fc003..3e1465208d5 100644 --- a/debian/po/ca.po +++ b/debian/po/ca.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-4.1\n" -"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.3@packages.debian.org\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n" "PO-Revision-Date: 2004-01-31 19:20GMT\n" "Last-Translator: Aleix Badia i Bosch <abadia@ica.es>\n" @@ -17,13 +17,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "The old data directory will be saved at new location" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "A file named /var/lib/mysql/debian-*.flag exists on this system. The number " "indicates a database binary format version that cannot automatically be " @@ -32,7 +32,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." @@ -40,14 +40,14 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 #, fuzzy #| msgid "Important note for NIS/YP users!" msgid "Important note for NIS/YP users" @@ -55,7 +55,7 @@ msgstr "Nota important pels usuaris de NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -63,7 +63,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -71,13 +71,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "Remove all MariaDB databases?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -85,7 +85,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -94,13 +94,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "New password for the MariaDB \"root\" user:" msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -108,25 +108,25 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "If this field is left blank, the password will not be changed." msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:6001 +#: ../mariadb-server-10.3.templates:6001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -135,27 +135,27 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "You should check the account's password after the package installation." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "" -"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.3/README.Debian file for " "more information." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" diff --git a/debian/po/cs.po b/debian/po/cs.po index dab52d819f9..8c8d812636e 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1\n" -"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.3@packages.debian.org\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n" "PO-Revision-Date: 2007-05-01 13:01+0200\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" @@ -26,13 +26,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "The old data directory will be saved at new location" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "A file named /var/lib/mysql/debian-*.flag exists on this system. The number " "indicates a database binary format version that cannot automatically be " @@ -41,7 +41,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." @@ -49,20 +49,20 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "Important note for NIS/YP users" msgstr "Důležitá poznámka pro uživatele NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -70,7 +70,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 #, fuzzy #| msgid "" #| "You should also check the permissions and the owner of the /var/lib/mysql " @@ -83,13 +83,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Odstranit všechny MariaDB databáze?" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -99,7 +99,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -111,13 +111,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.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:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -127,7 +127,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 #, fuzzy #| msgid "If that field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed." @@ -135,7 +135,7 @@ msgstr "Ponecháte-li pole prázdné, heslo se nezmění." #. Type: password #. Description -#: ../mariadb-server-10.2.templates:6001 +#: ../mariadb-server-10.3.templates:6001 #, fuzzy #| msgid "New password for the MySQL \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -143,13 +143,13 @@ msgstr "Nové heslo MariaDB uživatele \"root\":" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.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:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -161,7 +161,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 #, fuzzy #| msgid "" #| "You should check the account's password after tha package installation." @@ -170,26 +170,26 @@ msgstr "Po instalaci balíku byste měli heslo ověřit." #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 #, fuzzy #| msgid "" #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.3/README.Debian file for " "more information." msgstr "" -"Více informací naleznete v /usr/share/doc/mariadb-server-10.2/README.Debian." +"Více informací naleznete v /usr/share/doc/mariadb-server-10.3/README.Debian." #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" diff --git a/debian/po/da.po b/debian/po/da.po index 80259ba6a34..06f2cd0ffee 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-4.1\n" -"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.3@packages.debian.org\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n" "PO-Revision-Date: 2007-05-30 22:41+0200\n" "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n" @@ -27,13 +27,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "The old data directory will be saved at new location" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "A file named /var/lib/mysql/debian-*.flag exists on this system. The number " "indicates a database binary format version that cannot automatically be " @@ -42,7 +42,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." @@ -50,20 +50,20 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "Important note for NIS/YP users" msgstr "Vigtig oplysning til NIS/YP-brugere" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -71,7 +71,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 #, fuzzy #| msgid "" #| "You should also check the permissions and the owner of the /var/lib/mysql " @@ -84,13 +84,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Fjern alle MariaDB-databaser?" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -100,7 +100,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -112,13 +112,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.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:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -128,7 +128,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.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." @@ -136,7 +136,7 @@ msgstr "Hvis du lader dette felt st tomt, vil adgangskoden ikke blive ndret." #. Type: password #. Description -#: ../mariadb-server-10.2.templates:6001 +#: ../mariadb-server-10.3.templates:6001 #, fuzzy #| msgid "New password for the MySQL \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -144,13 +144,13 @@ msgstr "Ny adgangskode for MariaDB's \"root\"-bruger:" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "Kunne ikke stte adgangskoden for MariaDB's \"root\"-bruger" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.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 " @@ -163,33 +163,33 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "You should check the account's password after the package installation." msgstr "Du br tjekke kontoens adgangskode efter pakkeinstallationen." #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 #, fuzzy #| msgid "" #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.3/README.Debian file for " "more information." msgstr "" -"Se filen /usr/share/doc/mariadb-server-10.2/README.Debian for yderligere " +"Se filen /usr/share/doc/mariadb-server-10.3/README.Debian for yderligere " "oplysninger." #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" diff --git a/debian/po/de.po b/debian/po/de.po index 4a0ec4282d4..2e75376cc21 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1_5.1.37-1_de\n" -"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.3@packages.debian.org\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n" "PO-Revision-Date: 2009-08-27 22:41+0200\n" "Last-Translator: Thomas Mueller <thomas.mueller@tmit.eu>\n" @@ -29,13 +29,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "The old data directory will be saved at new location" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "A file named /var/lib/mysql/debian-*.flag exists on this system. The number " "indicates a database binary format version that cannot automatically be " @@ -44,7 +44,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." @@ -52,20 +52,20 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "Important note for NIS/YP users" msgstr "Wichtige Anmerkung für NIS/YP-Benutzer!" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -75,7 +75,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -85,13 +85,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Alle MariaDB-Datenbanken entfernen?" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -101,7 +101,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -113,13 +113,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.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:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -129,25 +129,25 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.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:6001 +#: ../mariadb-server-10.3.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:7001 +#: ../mariadb-server-10.3.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:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -160,7 +160,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "You should check the account's password after the package installation." msgstr "" "Sie sollten das Passwort des administrativen Benutzers nach der " @@ -168,13 +168,13 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 #, fuzzy #| msgid "" #| "Please read the /usr/share/doc/mariadb-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.3/README.Debian file for " "more information." msgstr "" "Für weitere Informationen lesen Sie /usr/share/doc/mariadb-server-5.1/README." @@ -182,13 +182,13 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "Password input error" msgstr "Passwort-Eingabefehler" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" "Die beiden von Ihnen eingegebenen Passwörter sind nicht identisch. Bitte " diff --git a/debian/po/es.po b/debian/po/es.po index ed2cf509dbb..d44b29e5d5c 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -40,7 +40,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1_5.0.24-3\n" -"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.3@packages.debian.org\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n" "PO-Revision-Date: 2007-05-28 22:21+0200\n" "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n" @@ -52,13 +52,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "The old data directory will be saved at new location" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "A file named /var/lib/mysql/debian-*.flag exists on this system. The number " "indicates a database binary format version that cannot automatically be " @@ -67,7 +67,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." @@ -75,20 +75,20 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "Important note for NIS/YP users" msgstr "Nota importante para los usuarios de NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -96,7 +96,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 #, fuzzy #| msgid "" #| "You should also check the permissions and the owner of the /var/lib/mysql " @@ -110,13 +110,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "Remove all MariaDB databases?" msgstr "¿Desea eliminar todas las bases de datos MariaDB?" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -126,7 +126,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -138,13 +138,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.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:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -154,7 +154,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 #, fuzzy #| msgid "If that field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed." @@ -162,7 +162,7 @@ msgstr "No se modificará la contraseña si deja el espacio en blanco." #. Type: password #. Description -#: ../mariadb-server-10.2.templates:6001 +#: ../mariadb-server-10.3.templates:6001 #, fuzzy #| msgid "New password for the MySQL \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -170,13 +170,13 @@ msgstr "Nueva contraseña para el usuario «root» de MariaDB:" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.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:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -189,7 +189,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "You should check the account's password after the package installation." msgstr "" "Debería comprobar la contraseña de la cuenta después de la instalación del " @@ -197,27 +197,27 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 #, fuzzy #| msgid "" #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.3/README.Debian file for " "more information." msgstr "" -"Consulte /usr/share/doc/mariadb-server-10.2/README.Debian para más " +"Consulte /usr/share/doc/mariadb-server-10.3/README.Debian para más " "información." #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" diff --git a/debian/po/eu.po b/debian/po/eu.po index 22b0f337fd1..91b7f1e341d 100644 --- a/debian/po/eu.po +++ b/debian/po/eu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: eu\n" -"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.3@packages.debian.org\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n" "PO-Revision-Date: 2009-07-29 11:59+0200\n" "Last-Translator: Piarres Beobide <pi@beobide.net>\n" @@ -20,13 +20,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "The old data directory will be saved at new location" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "A file named /var/lib/mysql/debian-*.flag exists on this system. The number " "indicates a database binary format version that cannot automatically be " @@ -35,7 +35,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." @@ -43,20 +43,20 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "Important note for NIS/YP users" msgstr "NIS/YP erabiltzaileentzat ohar garrantzitsua" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -64,7 +64,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 #, fuzzy #| msgid "" #| "You should also check the permissions and the owner of the /var/lib/mysql " @@ -78,13 +78,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Ezabatu MariaDB datubase guztiak?" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -93,7 +93,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -105,13 +105,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "New password for the MariaDB \"root\" user:" msgstr "MariaDB \"root\" erabiltzailearen pasahitz berria:" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -121,7 +121,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 #, fuzzy #| msgid "If that field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed." @@ -129,19 +129,19 @@ msgstr "Eremua hau zurian utziaz gero ez da pasahitza aldatuko." #. Type: password #. Description -#: ../mariadb-server-10.2.templates:6001 +#: ../mariadb-server-10.3.templates:6001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "Errepikatu MariaDB \"root\" erabiltzailearen pasahitza:" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.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:7001 +#: ../mariadb-server-10.3.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,34 +153,34 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.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:7001 +#: ../mariadb-server-10.3.templates:7001 #, fuzzy #| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " +#| "Please read the /usr/share/doc/mariadb-server-10.3/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.3/README.Debian file for " "more information." msgstr "" -"Mesedez irakurri /usr/share/doc/mariadb-server-10.2/README.Debian fitxategia " +"Mesedez irakurri /usr/share/doc/mariadb-server-10.3/README.Debian fitxategia " "xehetasun gehiagorako." #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "Password input error" msgstr "Pasahitz sarrera errorea" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "Idatzi dituzun bi pasahitzak ez dira berdina. Mesedez saiatu berriz." diff --git a/debian/po/fr.po b/debian/po/fr.po index cae8d7e903b..192d7de496e 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" -"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.3@packages.debian.org\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n" "PO-Revision-Date: 2009-08-08 14:56+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" @@ -22,13 +22,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "The old data directory will be saved at new location" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "A file named /var/lib/mysql/debian-*.flag exists on this system. The number " "indicates a database binary format version that cannot automatically be " @@ -37,7 +37,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." @@ -45,20 +45,20 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "Important note for NIS/YP users" msgstr "Note importante pour les utilisateurs NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -68,7 +68,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -78,13 +78,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Faut-il supprimer toutes les bases de données MariaDB ?" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -94,7 +94,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -105,13 +105,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.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:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -121,26 +121,26 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.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:6001 +#: ../mariadb-server-10.3.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:7001 +#: ../mariadb-server-10.3.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:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -152,7 +152,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "You should check the account's password after the package installation." msgstr "" "Vous devriez vérifier le mot de passe de ce compte après l'installation du " @@ -160,27 +160,27 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 #, fuzzy #| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " +#| "Please read the /usr/share/doc/mariadb-server-10.3/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.3/README.Debian file for " "more information." msgstr "" -"Veuillez consulter le fichier /usr/share/doc/mysql-server-10.2/README.Debian " +"Veuillez consulter le fichier /usr/share/doc/mysql-server-10.3/README.Debian " "pour plus d'informations." #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "Password input error" msgstr "Erreur de saisie du mot de passe" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" "Le mot de passe et sa confirmation ne sont pas identiques. Veuillez " diff --git a/debian/po/gl.po b/debian/po/gl.po index 64b5a8d7458..cc17ee481a8 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1\n" -"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.3@packages.debian.org\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n" "PO-Revision-Date: 2007-04-20 09:44+0200\n" "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n" @@ -17,13 +17,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "The old data directory will be saved at new location" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "A file named /var/lib/mysql/debian-*.flag exists on this system. The number " "indicates a database binary format version that cannot automatically be " @@ -32,7 +32,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." @@ -40,20 +40,20 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "Important note for NIS/YP users" msgstr "Nota importante para os usuarios de NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -61,7 +61,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 #, fuzzy #| msgid "" #| "You should also check the permissions and the owner of the /var/lib/mysql " @@ -75,13 +75,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "Remove all MariaDB databases?" msgstr "¿Eliminar tódalas bases de datos de MariaDB?" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -91,7 +91,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -103,13 +103,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.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:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -119,7 +119,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 #, fuzzy #| msgid "If that field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed." @@ -127,7 +127,7 @@ msgstr "Se deixa o campo en branco, non se ha cambiar o contrasinal." #. Type: password #. Description -#: ../mariadb-server-10.2.templates:6001 +#: ../mariadb-server-10.3.templates:6001 #, fuzzy #| msgid "New password for the MySQL \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -135,13 +135,13 @@ msgstr "Novo contrasinal para o usuario \"root\" de MariaDB:" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.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:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -153,7 +153,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 #, fuzzy #| msgid "" #| "You should check the account's password after tha package installation." @@ -162,27 +162,27 @@ msgstr "Debería comprobar o contrasinal da conta trala instalación do paquete. #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 #, fuzzy #| msgid "" #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.3/README.Debian file for " "more information." msgstr "" -"Consulte o ficheiro /usr/share/doc/mariadb-server-10.2/README.Debian para " +"Consulte o ficheiro /usr/share/doc/mariadb-server-10.3/README.Debian para " "máis información." #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" diff --git a/debian/po/it.po b/debian/po/it.po index 7fe2c994a08..d1761b879e4 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1 5.1.37 italian debconf templates\n" -"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.3@packages.debian.org\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n" "PO-Revision-Date: 2009-08-08 11:03+0200\n" "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n" @@ -18,13 +18,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "The old data directory will be saved at new location" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "A file named /var/lib/mysql/debian-*.flag exists on this system. The number " "indicates a database binary format version that cannot automatically be " @@ -33,7 +33,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." @@ -41,20 +41,20 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "Important note for NIS/YP users" msgstr "Nota importante per gli utenti NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -64,7 +64,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -74,13 +74,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Eliminare tutti i database MariaDB?" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -90,7 +90,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -102,13 +102,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.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:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -118,25 +118,25 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.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:6001 +#: ../mariadb-server-10.3.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:7001 +#: ../mariadb-server-10.3.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:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -149,34 +149,34 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.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:7001 +#: ../mariadb-server-10.3.templates:7001 #, fuzzy #| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " +#| "Please read the /usr/share/doc/mariadb-server-10.3/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.3/README.Debian file for " "more information." msgstr "" "Per maggiori informazioni si consulti il file /usr/share/doc/mariadb-" -"server-10.2/README.Debian." +"server-10.3/README.Debian." #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "Password input error" msgstr "Errore di inserimento della password" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "Le due password inserite sono diverse. Riprovare." diff --git a/debian/po/ja.po b/debian/po/ja.po index 1d4d5d36896..8ca7993a140 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1 5.1.37-1\n" -"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.3@packages.debian.org\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n" "PO-Revision-Date: 2009-09-01 08:25+0900\n" "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n" @@ -27,13 +27,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "The old data directory will be saved at new location" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "A file named /var/lib/mysql/debian-*.flag exists on this system. The number " "indicates a database binary format version that cannot automatically be " @@ -42,7 +42,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." @@ -50,20 +50,20 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "Important note for NIS/YP users" msgstr "NIS/YP ユーザへの重要な注意" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -73,7 +73,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -81,13 +81,13 @@ msgstr "/var/lib/mysql の所有者権限をチェックする必要もありま #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "Remove all MariaDB databases?" msgstr "すべての MariaDB データベースを削除しますか?" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -97,7 +97,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -109,13 +109,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "New password for the MariaDB \"root\" user:" msgstr "MariaDB の \"root\" ユーザに対する新しいパスワード:" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -125,25 +125,25 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "If this field is left blank, the password will not be changed." msgstr "この値を空のままにしておいた場合は、パスワードは変更されません。" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:6001 +#: ../mariadb-server-10.3.templates:6001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "MariaDB の \"root\" ユーザに対する新しいパスワード:" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "MariaDB の \"root\" ユーザのパスワードを設定できません" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -155,33 +155,33 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "You should check the account's password after the package installation." msgstr "" "パッケージのインストール後、アカウントのパスワードを確認する必要があります。" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 #, fuzzy #| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " +#| "Please read the /usr/share/doc/mariadb-server-10.3/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.3/README.Debian file for " "more information." msgstr "" -"詳細は /usr/share/doc/mariadb-server-10.2/README.Debian を参照してください。" +"詳細は /usr/share/doc/mariadb-server-10.3/README.Debian を参照してください。" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "Password input error" msgstr "パスワード入力エラー" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "入力された二つのパスワードが一致しません。再入力してください。" diff --git a/debian/po/nb.po b/debian/po/nb.po index ca8fd6e041d..06acfd8c25c 100644 --- a/debian/po/nb.po +++ b/debian/po/nb.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql_nb\n" -"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.3@packages.debian.org\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n" "PO-Revision-Date: 2007-02-18 12:13+0100\n" "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n" @@ -19,13 +19,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "The old data directory will be saved at new location" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "A file named /var/lib/mysql/debian-*.flag exists on this system. The number " "indicates a database binary format version that cannot automatically be " @@ -34,7 +34,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." @@ -42,14 +42,14 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 #, fuzzy #| msgid "Important note for NIS/YP users!" msgid "Important note for NIS/YP users" @@ -57,7 +57,7 @@ msgstr "Viktig merknad for NIS/YP-brukere!" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -65,7 +65,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -73,13 +73,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "Remove all MariaDB databases?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -87,7 +87,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 #, fuzzy #| msgid "" #| "The script is about to remove the data directory /var/lib/mysql. If it is " @@ -104,7 +104,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 #, fuzzy #| msgid "New password for MySQL \"root\" user:" msgid "New password for the MariaDB \"root\" user:" @@ -112,7 +112,7 @@ msgstr "Nytt passord for MariaDBs «root»-bruker:" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 #, fuzzy #| msgid "" #| "It is highly recommended that you set a password for the MySQL " @@ -126,13 +126,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "If this field is left blank, the password will not be changed." msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:6001 +#: ../mariadb-server-10.3.templates:6001 #, fuzzy #| msgid "New password for MySQL \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -140,7 +140,7 @@ msgstr "Nytt passord for MariaDBs «root»-bruker:" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 #, fuzzy #| msgid "Unable to set password for MySQL \"root\" user" msgid "Unable to set password for the MariaDB \"root\" user" @@ -148,7 +148,7 @@ msgstr "Klarer ikke angi passord for MariaDBs «root»-bruker" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 #, fuzzy #| msgid "" #| "It seems an error occurred while setting the password for the MySQL " @@ -167,27 +167,27 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "You should check the account's password after the package installation." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "" -"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.3/README.Debian file for " "more information." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" diff --git a/debian/po/nl.po b/debian/po/nl.po index b05a30d720d..65112a9f0a0 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1 5.0.30-1\n" -"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.3@packages.debian.org\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n" -"PO-Revision-Date: 2006-02-19 10:20+0100\n" +"PO-Revision-Date: 2006-02-19 10.30+0100\n" "Last-Translator: Thijs Kinkhorst <thijs@debian.org>\n" "Language-Team: Debian-Dutch <debian-l10n-dutch@lists.debian.org>\n" "Language: \n" @@ -18,13 +18,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "The old data directory will be saved at new location" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "A file named /var/lib/mysql/debian-*.flag exists on this system. The number " "indicates a database binary format version that cannot automatically be " @@ -33,7 +33,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." @@ -41,14 +41,14 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 #, fuzzy #| msgid "Important note for NIS/YP users!" msgid "Important note for NIS/YP users" @@ -56,7 +56,7 @@ msgstr "Belangrijke opmerking voor gebruikers van NIS/YP!" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -64,7 +64,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -72,13 +72,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "Remove all MariaDB databases?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -86,7 +86,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 #, fuzzy #| msgid "" #| "The script is about to remove the data directory /var/lib/mysql. If it is " @@ -104,7 +104,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 #, fuzzy #| msgid "New password for MySQL \"root\" user:" msgid "New password for the MariaDB \"root\" user:" @@ -112,7 +112,7 @@ msgstr "Nieuw wachtwoord voor de MariaDB \"root\"-gebruiker:" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 #, fuzzy #| msgid "" #| "It is highly recommended that you set a password for the MySQL " @@ -126,13 +126,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "If this field is left blank, the password will not be changed." msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:6001 +#: ../mariadb-server-10.3.templates:6001 #, fuzzy #| msgid "New password for MySQL \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -140,7 +140,7 @@ msgstr "Nieuw wachtwoord voor de MariaDB \"root\"-gebruiker:" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 #, fuzzy #| msgid "Unable to set password for MySQL \"root\" user" msgid "Unable to set password for the MariaDB \"root\" user" @@ -148,7 +148,7 @@ msgstr "Kan het wachtwoord voor de MariaDB \"root\"-gebruiker niet instellen" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 #, fuzzy #| msgid "" #| "It seems an error occurred while setting the password for the MySQL " @@ -167,27 +167,27 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "You should check the account's password after the package installation." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "" -"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.3/README.Debian file for " "more information." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" diff --git a/debian/po/pt.po b/debian/po/pt.po index 069d74348ed..106802ee87b 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1\n" -"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.3@packages.debian.org\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n" "PO-Revision-Date: 2007-05-05 21:01+0100\n" "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n" @@ -18,13 +18,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "The old data directory will be saved at new location" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "A file named /var/lib/mysql/debian-*.flag exists on this system. The number " "indicates a database binary format version that cannot automatically be " @@ -33,7 +33,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." @@ -41,20 +41,20 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "Important note for NIS/YP users" msgstr "Nota importante para utilizadores de NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -62,7 +62,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 #, fuzzy #| msgid "" #| "You should also check the permissions and the owner of the /var/lib/mysql " @@ -75,13 +75,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Remover todas as bases de dados MariaDB?" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -91,7 +91,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -103,13 +103,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.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:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -119,7 +119,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 #, fuzzy #| msgid "If that field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed." @@ -128,7 +128,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:6001 +#: ../mariadb-server-10.3.templates:6001 #, fuzzy #| msgid "New password for the MySQL \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -136,7 +136,7 @@ msgstr "Nova palavra-passe para o utilizador \"root\" do MariaDB:" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "" "Não foi possível definir a palavra-passe para o utilizador \"root\" do " @@ -144,7 +144,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -157,7 +157,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 #, fuzzy #| msgid "" #| "You should check the account's password after tha package installation." @@ -167,27 +167,27 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 #, fuzzy #| msgid "" #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.3/README.Debian file for " "more information." msgstr "" "Para mais informação por favor leia o ficheiro /usr/share/doc/mariadb-" -"server-10.2/README.Debian." +"server-10.3/README.Debian." #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index a2a39440389..5451f163a1e 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1\n" -"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.3@packages.debian.org\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n" "PO-Revision-Date: 2007-04-21 15:59-0300\n" "Last-Translator: André Luís Lopes <andrelop@debian.org>\n" @@ -21,13 +21,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "The old data directory will be saved at new location" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "A file named /var/lib/mysql/debian-*.flag exists on this system. The number " "indicates a database binary format version that cannot automatically be " @@ -36,7 +36,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." @@ -44,20 +44,20 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "Important note for NIS/YP users" msgstr "Aviso importante para usuários NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -65,7 +65,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 #, fuzzy #| msgid "" #| "You should also check the permissions and the owner of the /var/lib/mysql " @@ -78,13 +78,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Remover todas as bases de dados do MariaDB?" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -94,7 +94,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -106,13 +106,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.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:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -122,7 +122,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 #, fuzzy #| msgid "If that field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed." @@ -130,7 +130,7 @@ msgstr "Caso este campo seja deixado em branco, a senha não sera mudada." #. Type: password #. Description -#: ../mariadb-server-10.2.templates:6001 +#: ../mariadb-server-10.3.templates:6001 #, fuzzy #| msgid "New password for the MySQL \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -138,13 +138,13 @@ msgstr "Nova senha para o usuário \"root\" do MariaDB:" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.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:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -157,7 +157,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 #, fuzzy #| msgid "" #| "You should check the account's password after tha package installation." @@ -166,27 +166,27 @@ msgstr "Você deverá checar a senha dessa conta após a instalação deste paco #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 #, fuzzy #| msgid "" #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.3/README.Debian file for " "more information." msgstr "" -"Por favor, leia o arquivo /usr/share/doc/mariadb-server-10.2/README.Debian " +"Por favor, leia o arquivo /usr/share/doc/mariadb-server-10.3/README.Debian " "para maiores informações." #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" diff --git a/debian/po/ro.po b/debian/po/ro.po index 45ed4aff10b..ad2516da21e 100644 --- a/debian/po/ro.po +++ b/debian/po/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: po-debconf://mysql-dfsg\n" -"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.3@packages.debian.org\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n" "PO-Revision-Date: 2006-12-20 21:27+0200\n" "Last-Translator: stan ioan-eugen <stan.ieugen@gmail.com>\n" @@ -19,13 +19,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "The old data directory will be saved at new location" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "A file named /var/lib/mysql/debian-*.flag exists on this system. The number " "indicates a database binary format version that cannot automatically be " @@ -34,7 +34,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." @@ -42,14 +42,14 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 #, fuzzy #| msgid "Important note for NIS/YP users!" msgid "Important note for NIS/YP users" @@ -57,7 +57,7 @@ msgstr "Notă importantă pentru utilizatorii NIS/YP!" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -65,7 +65,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -73,13 +73,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "Remove all MariaDB databases?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -87,7 +87,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 #, fuzzy #| msgid "" #| "The script is about to remove the data directory /var/lib/mysql. If it is " @@ -104,7 +104,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 #, fuzzy #| msgid "New password for MySQL \"root\" user:" msgid "New password for the MariaDB \"root\" user:" @@ -112,7 +112,7 @@ msgstr "Noua parolă pentru utilizatorul „root” al MariaDB:" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 #, fuzzy #| msgid "" #| "It is highly recommended that you set a password for the MySQL " @@ -126,13 +126,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "If this field is left blank, the password will not be changed." msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:6001 +#: ../mariadb-server-10.3.templates:6001 #, fuzzy #| msgid "New password for MySQL \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -140,7 +140,7 @@ msgstr "Noua parolă pentru utilizatorul „root” al MariaDB:" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 #, fuzzy #| msgid "Unable to set password for MySQL \"root\" user" msgid "Unable to set password for the MariaDB \"root\" user" @@ -148,7 +148,7 @@ msgstr "Nu s-a putut stabili parola pentru utilizatorul „root” al MariaDB" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 #, fuzzy #| msgid "" #| "It seems an error occurred while setting the password for the MySQL " @@ -167,27 +167,27 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "You should check the account's password after the package installation." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "" -"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.3/README.Debian file for " "more information." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" diff --git a/debian/po/ru.po b/debian/po/ru.po index 213f64f6253..2c0bc7fee1f 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1 5.1.37-1\n" -"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.3@packages.debian.org\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n" "PO-Revision-Date: 2009-08-06 20:27+0400\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" @@ -32,13 +32,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "The old data directory will be saved at new location" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "A file named /var/lib/mysql/debian-*.flag exists on this system. The number " "indicates a database binary format version that cannot automatically be " @@ -47,7 +47,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." @@ -55,20 +55,20 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "Important note for NIS/YP users" msgstr "Важное замечание для пользователей NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -78,7 +78,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -86,13 +86,13 @@ msgstr "Также проверьте права доступа и владел #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Удалить все базы данных MariaDB?" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -101,7 +101,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -113,13 +113,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "New password for the MariaDB \"root\" user:" msgstr "Новый пароль для MariaDB пользователя \"root\":" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -129,25 +129,25 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "If this field is left blank, the password will not be changed." msgstr "Если оставить поле пустым, то пароль изменён не будет." #. Type: password #. Description -#: ../mariadb-server-10.2.templates:6001 +#: ../mariadb-server-10.3.templates:6001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "Повторите ввод пароля для MariaDB пользователя \"root\":" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "Невозможно задать пароль MariaDB пользователю \"root\"" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -159,32 +159,32 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "You should check the account's password after the package installation." msgstr "Проверьте пароль учётной записи после установки пакета." #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 #, fuzzy #| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " +#| "Please read the /usr/share/doc/mariadb-server-10.3/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.3/README.Debian file for " "more information." msgstr "" -"Подробности см. в файле /usr/share/doc/mariadb-server-10.2/README.Debian." +"Подробности см. в файле /usr/share/doc/mariadb-server-10.3/README.Debian." #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "Password input error" msgstr "Ошибка ввода пароля" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "Два введённых пароля не одинаковы. Повторите ввод." diff --git a/debian/po/sv.po b/debian/po/sv.po index b7aff17f1a6..ce830bd2319 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1 5.0.21-3\n" -"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.3@packages.debian.org\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n" "PO-Revision-Date: 2009-09-08 21:42+0100\n" "Last-Translator: Martin Bagge <brother@bsnet.se>\n" @@ -21,13 +21,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "The old data directory will be saved at new location" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "A file named /var/lib/mysql/debian-*.flag exists on this system. The number " "indicates a database binary format version that cannot automatically be " @@ -36,7 +36,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." @@ -44,20 +44,20 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "Important note for NIS/YP users" msgstr "Viktig information för NIS/YP-användare" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -67,7 +67,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -77,13 +77,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Ta bort alla MariaDB-databaser?" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -93,7 +93,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -105,13 +105,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.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:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -121,25 +121,25 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.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:6001 +#: ../mariadb-server-10.3.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:7001 +#: ../mariadb-server-10.3.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:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -152,33 +152,33 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.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:7001 +#: ../mariadb-server-10.3.templates:7001 #, fuzzy #| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " +#| "Please read the /usr/share/doc/mariadb-server-10.3/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.3/README.Debian file for " "more information." msgstr "" -"Läs filen /usr/share/doc/mariadb-server-10.2/README.Debian för mer " +"Läs filen /usr/share/doc/mariadb-server-10.3/README.Debian för mer " "information." #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "Password input error" msgstr "Fel vid inmatning av lösenord" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "De två lösenorden du angav stämde inte överrens. Prova igen." diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 258dcde2c81..b0e3ee82576 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mariadb-10.2\n" -"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" +"Project-Id-Version: mariadb-10.3\n" +"Report-Msgid-Bugs-To: mariadb-10.3@packages.debian.org\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" @@ -19,13 +19,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "The old data directory will be saved at new location" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "A file named /var/lib/mysql/debian-*.flag exists on this system. The number " "indicates a database binary format version that cannot automatically be " @@ -34,7 +34,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." @@ -42,20 +42,20 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "Important note for NIS/YP users" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -63,7 +63,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -71,13 +71,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "Remove all MariaDB databases?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -85,7 +85,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -94,13 +94,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "New password for the MariaDB \"root\" user:" msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -108,25 +108,25 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "If this field is left blank, the password will not be changed." msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:6001 +#: ../mariadb-server-10.3.templates:6001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -135,26 +135,26 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "You should check the account's password after the package installation." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "" -"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.3/README.Debian file for " "more information." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" diff --git a/debian/po/tr.po b/debian/po/tr.po index c501fde3db8..9264cfcceb6 100644 --- a/debian/po/tr.po +++ b/debian/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-4.1\n" -"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.3@packages.debian.org\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n" "PO-Revision-Date: 2004-06-05 08:53+0300\n" "Last-Translator: Gürkan Aslan <gurkan@iaslan.com>\n" @@ -18,13 +18,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "The old data directory will be saved at new location" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "A file named /var/lib/mysql/debian-*.flag exists on this system. The number " "indicates a database binary format version that cannot automatically be " @@ -33,7 +33,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." @@ -41,14 +41,14 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:2001 +#: ../mariadb-server-10.3.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 #, fuzzy #| msgid "Important note for NIS/YP users!" msgid "Important note for NIS/YP users" @@ -56,7 +56,7 @@ msgstr "NIS/YP kullanıcıları için önemli not!" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -64,7 +64,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.2.templates:3001 +#: ../mariadb-server-10.3.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -72,13 +72,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "Remove all MariaDB databases?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -86,7 +86,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.2.templates:4001 +#: ../mariadb-server-10.3.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -95,13 +95,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "New password for the MariaDB \"root\" user:" msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -109,25 +109,25 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:5001 +#: ../mariadb-server-10.3.templates:5001 msgid "If this field is left blank, the password will not be changed." msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.2.templates:6001 +#: ../mariadb-server-10.3.templates:6001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -136,27 +136,27 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "You should check the account's password after the package installation." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:7001 +#: ../mariadb-server-10.3.templates:7001 msgid "" -"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.3/README.Debian file for " "more information." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.2.templates:8001 +#: ../mariadb-server-10.3.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" diff --git a/debian/rules b/debian/rules index 3b1952ad2b9..93bfe01e55e 100755 --- a/debian/rules +++ b/debian/rules @@ -5,25 +5,13 @@ export DEB_BUILD_HARDENING=1 # enable Debian Hardening # see: https://wiki.debian.org/Hardening -export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie +export DEB_BUILD_MAINT_OPTIONS = hardening=+all DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/buildflags.mk +include /usr/share/dpkg/default.mk -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) -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) +DEB_VERSION_REVISION := $(shell echo $(DEB_VERSION) | sed -e 's/^.*-//') +RELEASE := $(shell lsb_release -r -s) # Use changelog based DEB_DISTRIBUTION instead? TMP:=$(CURDIR)/debian/tmp CC := $(DEB_HOST_GNU_TYPE)-gcc @@ -33,19 +21,35 @@ CXX := $(DEB_HOST_GNU_TYPE)-g++ # 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) + MAKEFLAGS += -j$(NUMJOBS) else # NUMJOBS cannot be empty as it is used as a parameter to mtr, default to 1. NUMJOBS = 1 endif # Ignore test suite exit code on unstable platforms -ifneq (,$(filter $(ARCH), mips mipsel)) +ifneq (,$(filter $(DEB_HOST_ARCH),mips mipsel mips64el alpha powerpc sh4 hurd-i386 sparc64 kfreebsd-i386 kfreebsd-amd64)) TESTSUITE_FAIL_CMD:=true else TESTSUITE_FAIL_CMD:=exit 1 endif +ifeq (32,$(DEB_HOST_ARCH_BITS)) + CMAKEFLAGS += -DWITHOUT_ROCKSDB=true +endif + +# Skip TokuDB if arch is not amd64 (also disable for kfreebsd-amd64 as it FTBFS) +# Skipped on the x32 ABI too; untested, but unlikely to work given i386 is not +# supported. +ifneq ($(DEB_HOST_ARCH),amd64) + CMAKEFLAGS += -DWITHOUT_TOKUDB=true +endif + +# Disable jemalloc on mips* due to #843926 +ifneq (,$(filter $(DEB_HOST_ARCH), mips mipsel mips64 mips64el)) + CMAKEFLAGS += -DWITH_JEMALLOC=no +endif + # Add support for verbose builds MAKEFLAGS += VERBOSE=1 @@ -67,7 +71,7 @@ override_dh_auto_configure: # 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)) +ifneq (,$(filter $(DEB_HOST_ARCH), kfreebsd-i386 kfreebsd-amd64)) rm debian/libmariadb3.symbols endif @@ -78,19 +82,15 @@ endif cmake -DCMAKE_INSTALL_PREFIX=/usr \ $(CMAKEFLAGS) \ -DCOMPILATION_COMMENT="mariadb.org binary distribution" \ - -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \ - -DSYSTEM_TYPE="debian-$(DEB_BUILD_GNU_SYSTEM)" \ - $${MYSQL_BUILD_CXX:+-DCMAKE_CXX_COMPILER=$${MYSQL_BUILD_CXX}} \ - $${MYSQL_BUILD_CC:+-DCMAKE_C_COMPILER=$${MYSQL_BUILD_CC}} \ - $${MYSQL_COMPILER_LAUNCHER:+-DCMAKE_CXX_COMPILER_LAUNCHER=${MYSQL_COMPILER_LAUNCHER}} \ - $${MYSQL_COMPILER_LAUNCHER:+-DCMAKE_C_COMPILER_LAUNCHER=${MYSQL_COMPILER_LAUNCHER}} \ - -DCMAKE_SYSTEM_PROCESSOR=$(DEB_BUILD_ARCH) \ + -DMYSQL_SERVER_SUFFIX="-$(DEB_VERSION_REVISION)" \ + -DSYSTEM_TYPE="debian-$(DEB_HOST_GNU_SYSTEM)" \ + -DCMAKE_SYSTEM_PROCESSOR=$(DEB_HOST_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 $@ + -DPLUGIN_AWS_KEY_MANAGEMENT=NO \ + -DDEB=$(DEB_VENDOR) ..' # This is needed, otherwise 'make test' will run before binaries have been built override_dh_auto_build: @@ -98,13 +98,12 @@ override_dh_auto_build: # Print build env info to help debug builds on different platforms dpkg-architecture cd $(BUILDDIR) && $(MAKE) - touch $@ override_dh_auto_test: @echo "RULES.$@" dh_testdir # Skip unstable tests if such are defined for arch - [ ! -f debian/unstable-tests.$(ARCH) ] || cat debian/unstable-tests.$(ARCH) >> mysql-test/unstable-tests + [ ! -f debian/unstable-tests.$(DEB_HOST_ARCH) ] || cat debian/unstable-tests.$(DEB_HOST_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) ; @@ -115,14 +114,11 @@ override_dh_auto_install: dh_testdir dh_testroot -# Skip TokuDB if arch is not amd64 -ifneq ($(ARCH), amd64) - sed -i -e "/Package: mariadb-plugin-tokudb/,+16d" debian/control -endif - +ifneq (,$(filter linux,$(DEB_HOST_ARCH_OS))) # Copy systemd files to a location available for dh_installinit - cp $(BUILDDIR)/support-files/mariadb.service debian/mariadb-server-10.2.mariadb.service - cp $(BUILDDIR)/support-files/mariadb@.service debian/mariadb-server-10.2.mariadb@.service + cp $(BUILDDIR)/support-files/mariadb.service debian/mariadb-server-10.3.mariadb.service + cp $(BUILDDIR)/support-files/mariadb@.service debian/mariadb-server-10.3.mariadb@.service +endif # make install cd $(BUILDDIR) && $(MAKE) install DESTDIR=$(TMP) @@ -134,30 +130,22 @@ endif # nm numeric soft is not enough, therefore extra sort in command # to satisfy Debian reproducible build requirements - nm --defined-only $(BUILDDIR)/sql/mysqld | LC_ALL=C sort | gzip -n -9 > $(TMP)/usr/share/doc/mariadb-server-10.2/mysqld.sym.gz - - # For 5.0 -> 10.2 transition - d=$(TMP)/usr/share/mysql-common/internal-use-only/; \ - mkdir -p $$d; \ - cp debian/mariadb-server-10.2.mysql.init $$d/_etc_init.d_mysql; \ - 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; + nm --defined-only $(BUILDDIR)/sql/mysqld | LC_ALL=C sort | gzip -n -9 > $(TMP)/usr/share/doc/mariadb-server-10.3/mysqld.sym.gz # 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 + install -D -m 644 debian/mariadb-server-10.3.py $(TMP)/usr/share/apport/package-hooks/source_mariadb-10.3.py # Install libmariadbclient18 compatibility links - ln -s /usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadbclient.so - ln -s /usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadbclient.so.18 + ln -s libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadbclient.so + ln -s libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadbclient.so.18 # Install libmysqlclientclientXX compatibility links - ln -s /usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so.18 - ln -s /usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so.19 - ln -s /usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so.20 + ln -s libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so.18 + ln -s libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so.19 + ln -s libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so.20 - touch $@ override_dh_installlogrotate-arch: dh_installlogrotate --name mysql-server @@ -178,7 +166,11 @@ override_dh_installcron-arch: get-orig-source: uscan --force-download --verbose +# If a file is not supposed to be included anywhere, add it to the not-installed +# file and document the reason. Note that dh_install supports the above mentioned +# white list file only starting from Debian Stretch and Ubuntu Xenial. +# To find more, grep build logs for 'but is not installed to anywhere'. %: - dh $@ --parallel --with dpatch --with systemd + dh $@ --parallel --with systemd --list-missing # vim: ts=8 |