diff options
Diffstat (limited to 'debian')
120 files changed, 2754 insertions, 3985 deletions
diff --git a/debian/additions/debian-start b/debian/additions/debian-start index ff741b86f79..3202b3abc46 100644..100755 --- a/debian/additions/debian-start +++ b/debian/additions/debian-start @@ -1,27 +1,32 @@ #!/bin/bash # # This script is executed by "/etc/init.d/mysql" on every (re)start. -# +# # Changes to this file will be preserved when updating the Debian package. # source /usr/share/mysql/debian-start.inc.sh +if [ -f /etc/default/mysql ]; then + . /etc/default/mysql +fi + MYSQL="/usr/bin/mysql --defaults-file=/etc/mysql/debian.cnf" MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf" MYUPGRADE="/usr/bin/mysql_upgrade --defaults-extra-file=/etc/mysql/debian.cnf --version-check" MYCHECK="/usr/bin/mysqlcheck --defaults-file=/etc/mysql/debian.cnf" MYCHECK_SUBJECT="WARNING: mysqlcheck has found corrupt tables" MYCHECK_PARAMS="--all-databases --fast --silent" -MYCHECK_RCPT="root" +MYCHECK_RCPT="${MYCHECK_RCPT:-root}" + +## Checking for corrupt, not cleanly closed (only for MyISAM and Aria engines) and upgrade needing tables. # The following commands should be run when the server is up but in background # where they do not block the server start and in one shell instance so that # they run sequentially. They are supposed not to echo anything to stdout. # If you want to disable the check for crashed tables comment -# "check_for_crashed_tables" out. +# "check_for_crashed_tables" out. # (There may be no output to stdout inside the background process!) -echo "Checking for corrupt, not cleanly closed and upgrade needing tables." # Need to ignore SIGHUP, as otherwise a SIGHUP can sometimes abort the upgrade # process in the middle. diff --git a/debian/additions/debian-start.inc.sh b/debian/additions/debian-start.inc.sh index 08ec339bcba..0640bf9c2a6 100644..100755 --- a/debian/additions/debian-start.inc.sh +++ b/debian/additions/debian-start.inc.sh @@ -3,7 +3,7 @@ # This file is included by /etc/mysql/debian-start # -## Check all unclosed tables. +## Check MyISAM and Aria unclosed tables. # - Requires the server to be up. # - Is supposed to run silently in background. function check_for_crashed_tables() { @@ -11,20 +11,27 @@ function check_for_crashed_tables() { set -u # But do it in the background to not stall the boot process. - logger -p daemon.info -i -t$0 "Triggering myisam-recover for all MyISAM tables" + logger -p daemon.info -i -t$0 "Triggering myisam-recover for all MyISAM tables and aria-recover for all Aria tables" # Checking for $? is unreliable so the size of the output is checked. # Some table handlers like HEAP do not support CHECK TABLE. tempfile=`tempfile` - # We have to use xargs in this case, because a for loop barfs on the - # spaces in the thing to be looped over. + + # We have to use xargs in this case, because a for loop barfs on the + # spaces in the thing to be looped over. + + # If a crashed table is encountered, the "mysql" command will return with a status different from 0 + set +e + LC_ALL=C $MYSQL --skip-column-names --batch -e ' select concat('\''select count(*) into @discard from `'\'', TABLE_SCHEMA, '\''`.`'\'', TABLE_NAME, '\''`'\'') - from information_schema.TABLES where ENGINE='\''MyISAM'\' | \ + from information_schema.TABLES where TABLE_SCHEMA<>'\''INFORMATION_SCHEMA'\'' and TABLE_SCHEMA<>'\''PERFORMANCE_SCHEMA'\'' and ( ENGINE='\''MyISAM'\'' or ENGINE='\''Aria'\'' )' | \ xargs -i $MYSQL --skip-column-names --silent --batch \ - --force -e "{}" >$tempfile - if [ -s $tempfile ]; then + --force -e "{}" &>$tempfile + set -e + + if [ -s "$tempfile" ]; then ( /bin/echo -e "\n" \ "Improperly closed tables are also reported if clients are accessing\n" \ diff --git a/debian/additions/echo_stderr b/debian/additions/echo_stderr index 67b3ed7cfb3..67b3ed7cfb3 100644..100755 --- a/debian/additions/echo_stderr +++ b/debian/additions/echo_stderr diff --git a/debian/additions/enable_encryption.preset b/debian/additions/enable_encryption.preset new file mode 100644 index 00000000000..287bc03413a --- /dev/null +++ b/debian/additions/enable_encryption.preset @@ -0,0 +1,20 @@ +# +# !include this file into your my.cnf (or any of *.cnf files in /etc/mysql/conf.d) +# and it will enable data at rest encryption. This is a simple way to +# ensure that everything that can be encrypted will be and your +# data will not leak unencrypted. +# +# DO NOT EDIT THIS FILE! On MariaDB upgrades it might be replaced with a +# newer version and your edits will be lost. Instead, add your edits +# to the .cnf file after the !include directive. +# +# NOTE that you also need to install an encryption plugin for the encryption +# to work. See https://mariadb.com/kb/en/mariadb/data-at-rest-encryption/#encryption-key-management +# +[mariadb] +aria-encrypt-tables +encrypt-binlog +encrypt-tmp-disk-tables +encrypt-tmp-files +loose-innodb-encrypt-log +loose-innodb-encrypt-tables diff --git a/debian/additions/mariadb.cnf b/debian/additions/mariadb.cnf index 927e9d1ce88..da21212faef 100644 --- a/debian/additions/mariadb.cnf +++ b/debian/additions/mariadb.cnf @@ -15,3 +15,5 @@ #collation-server = utf8_general_ci #character_set_server = utf8 #collation_server = utf8_general_ci +# Import all .cnf files from configuration directory +!includedir /etc/mysql/mariadb.conf.d/ diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index bfdba96e487..687f2356153 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -1,77 +1,143 @@ #!/bin/bash - -# Build MariaDB .deb packages. -# Based on OurDelta .deb packaging scripts, which are in turn based on Debian -# MySQL packages. +# +# Build MariaDB .deb packages for test and release at mariadb.org +# # Exit immediately on any error set -e -# Debug script and command lines -#set -x - -# Don't run the mysql-test-run test suite as part of build. +# 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. -export DEB_BUILD_OPTIONS="nocheck" +# 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 -export MARIADB_OPTIONAL_DEBS="" +# Travis-CI optimizations +if [[ $TRAVIS ]] +then + # On Travis-CI, the log must stay under 4MB so make the build less verbose + sed -i -e '/Add support for verbose builds/,+2d' debian/rules + + # 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 +fi -# Find major.minor version. + +# Look up distro-version specific stuff # -source ./VERSION -UPSTREAM="${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}" -RELEASE_EXTRA="" +# Always keep the actual packaging as up-to-date as possible following the latest +# Debian policy and targetting Debian Sid. Then case-by-case run in autobake-deb.sh +# tests for backwards compatibility and strip away parts on older builders. -RELEASE_NAME="" -PATCHLEVEL="+maria" -LOGSTRING="MariaDB build" +# 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 -# Look up distro-version specific stuff. +# If libcrack2 (>= 2.9.0) is not available (before Debian Jessie and Ubuntu Trusty) +# clean away the cracklib stanzas so the package can build without them. +if ! apt-cache madison libcrack2-dev | grep 'libcrack2-dev *| *2\.9' >/dev/null 2>&1 +then + sed '/libcrack2-dev/d' -i debian/control + sed '/Package: mariadb-plugin-cracklib/,/^$/d' -i debian/control +fi -CODENAME="$(lsb_release -sc)" -VERNUM="$(lsb_release -sr)" +# If libpcre3-dev (>= 2:8.35-3.2~) is not available (before Debian Jessie or Ubuntu Wily) +# clean away the PCRE3 stanzas so the package can build without them. +# Update check when version 2:8.40 or newer is available. +if ! apt-cache madison libpcre3-dev | grep 'libpcre3-dev *| *2:8\.3[2-9]' >/dev/null 2>&1 +then + sed '/libpcre3-dev/d' -i debian/control +fi -# add libcrack2 (>= 2.9.0) as a build dependency -# but only where the distribution can possibly satisfy it -if apt-cache madison cracklib2|grep 'cracklib2 *| *2\.[0-8]\.' >/dev/null 2>&1 +# If libsystemd-dev is not available (before Debian Jessie or Ubuntu Wily) +# clean away the systemd stanzas so the package can build without them. +if ! apt-cache madison libsystemd-dev | grep 'libsystemd-dev' >/dev/null 2>&1 then - # Anything in MARIADB_OPTIONAL_DEBS is omitted from the resulting - # packages by snipped in rules file - MARIADB_OPTIONAL_DEBS="${MARIADB_OPTIONAL_DEBS} cracklib-password-check-10.1" - sed -i -e "/\\\${MAYBE_LIBCRACK}/d" debian/control -else - MAYBE_LIBCRACK='libcrack2-dev (>= 2.9.0), cracklib-runtime,' - sed -i -e "s/\\\${MAYBE_LIBCRACK}/${MAYBE_LIBCRACK}/g" debian/control + sed '/dh-systemd/d' -i debian/control + sed '/libsystemd-dev/d' -i debian/control + sed 's/ --with systemd//' -i debian/rules + sed '/systemd/d' -i debian/rules + sed '/\.service/d' -i debian/rules + sed '/galera_new_cluster/d' -i debian/mariadb-server-10.2.install + sed '/galera_recovery/d' -i debian/mariadb-server-10.2.install + sed '/mariadb-service-convert/d' -i debian/mariadb-server-10.2.install fi -# same for OpenSSL. Use the correct dependency -if apt-cache madison libssl-dev|grep 'libssl-dev *| *1\.1\.' >/dev/null 2>&1 +# 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 ]] then - LIBSSL='libssl1.0-dev' -else - LIBSSL='libssl-dev' + sed '/Package: mariadb-plugin-rocksdb/,/^$/d' -i debian/control fi -sed -i -e "s/\\\${LIBSSL}/${LIBSSL}/g" debian/control -# Adjust changelog, add new version. -# +# Always remove aws plugin, see -DNOT_FOR_DISTRIBUTION in CMakeLists.txt +sed '/Package: mariadb-plugin-aws-key-management-10.2/,/^$/d' -i debian/control + +# Don't build cassandra package if thrift is not installed +if [[ ! -f /usr/local/include/thrift/Thrift.h && ! -f /usr/include/thrift/Thrift.h ]] +then + sed '/Package: mariadb-plugin-cassandra/,/^$/d' -i debian/control +fi + +# Adjust changelog, add new version echo "Incrementing changelog and starting build scripts" +# Find major.minor version +source ./VERSION +UPSTREAM="${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}" +PATCHLEVEL="+maria" +LOGSTRING="MariaDB build" +CODENAME="$(lsb_release -sc)" +VERNUM="$(lsb_release -sr)" if [[ "${VERNUM%.*}" -ge 18 ]]; then EPOCH="1:" fi -dch -b -D ${CODENAME} -v "${EPOCH}${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}1~${CODENAME}" "Automatic build with ${LOGSTRING}." -echo "Creating package version ${EPOCH}${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}1~${CODENAME} ... " +dch -b -D ${CODENAME} -v "${EPOCH}${UPSTREAM}${PATCHLEVEL}~${CODENAME}" "Automatic build with ${LOGSTRING}." + +echo "Creating package version ${EPOCH}${UPSTREAM}${PATCHLEVEL}~${CODENAME} ... " + +# On Travis CI, use -b to build binary only packages as there is no need to +# waste time on generating the source package. +if [[ $TRAVIS ]] +then + BUILDPACKAGE_FLAGS="-b" +fi -# Build the package. +# Build the package # Pass -I so that .git and other unnecessary temporary and source control files -# will be ignored by dpkg-source when createing the tar.gz source package -fakeroot dpkg-buildpackage -us -uc -I +# will be ignored by dpkg-source when creating the tar.gz source package. +fakeroot dpkg-buildpackage -us -uc -I $BUILDPACKAGE_FLAGS -[ -e debian/autorm-file ] && rm -vf `cat debian/autorm-file` +# If the step above fails due to missing dependencies, you can manually run +# sudo mk-build-deps debian/control -r -i -echo "Build complete" +# Don't log package contents on Travis-CI to save time and log size +if [[ ! $TRAVIS ]] +then + echo "List package contents ..." + cd .. + for package in `ls *.deb` + do + echo $package | cut -d '_' -f 1 + dpkg-deb -c $package | awk '{print $1 " " $2 " " $6}' | sort -k 3 + echo "------------------------------------------------" + done +fi -# end of autobake script +echo "Build complete" diff --git a/debian/changelog b/debian/changelog index 4d0d74b12c4..31ba0ab81cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mariadb-10.2 (10.2.0) unstable; urgency=low + + * Initial release. + + -- Otto Kekäläinen <otto@mariadb.org> Sat, 14 Nov 2015 21:26:45 +0200 + mariadb-10.1 (10.1.0) unstable; urgency=low * Initial release. diff --git a/debian/control b/debian/control index 71329a870c9..ba6243c38dd 100644 --- a/debian/control +++ b/debian/control @@ -1,49 +1,60 @@ -Source: mariadb-10.1 +Source: mariadb-10.2 Section: database Priority: optional Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net> -Uploaders: MariaDB Developers <maria-developers@lists.launchpad.net> Build-Depends: bison, chrpath, cmake (>= 2.7), - debhelper, + debhelper (>= 9), dh-apparmor, + dh-systemd, dpatch, - libaio-dev, - libarchive-dev, + gdb, + libaio-dev [linux-any], libboost-dev, + libcrack2-dev (>= 2.9.0), + libjemalloc-dev (>= 3.0.0~) [linux-any], libjudy-dev, libkrb5-dev, libncurses5-dev (>= 5.0-6~), + libnuma-dev, libpam0g-dev, + libpcre3-dev (>= 2:8.35-3.2~), libreadline-gplv2-dev, - ${LIBSSL}, + libssl-dev | libssl1.0-dev, + libsnappy-dev, + libsystemd-dev, + libxml2-dev, lsb-release, perl (>= 5.6.0), po-debconf, psmisc, - zlib1g-dev (>= 1:1.1.3-5~), - ${MAYBE_LIBCRACK} - libjemalloc-dev (>= 3.0.0~) [linux-any] + unixodbc-dev, + uuid-dev, + zlib1g-dev (>= 1:1.1.3-5~) Standards-Version: 3.8.2 Homepage: http://mariadb.org/ Vcs-Browser: https://github.com/MariaDB/server/ Vcs-Git: https://github.com/MariaDB/server.git -Package: libmariadbclient18 +Package: libmariadb3 Architecture: any Section: libs -Depends: libmysqlclient18 (= ${source:Version}), - mariadb-common, - ${misc:Depends}, - ${shlibs:Depends} +Depends: mariadb-common, ${misc:Depends}, ${shlibs:Depends} Conflicts: mariadb-galera-server-10.0 (<< 10.0.5), mariadb-galera-server-5.5 (<< 5.5.33), mariadb-server-10.0 (<< 10.0.5), mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3, - mariadb-server-5.5 (<< 5.5.33) + mariadb-server-5.5 (<< 5.5.33), + libmariadbclient18 (<< 10.2.0) +Breaks: libmariadbclient18 (<< ${source:Version}) +Replaces: libmariadbclient18 (<< ${source:Version}), + libmysqlclient19, + libmysqlclient20 +Provides: libmysqlclient19, + libmysqlclient20 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 @@ -52,52 +63,50 @@ Description: MariaDB database client library . This package includes the client library. -Package: libmysqlclient18 +Package: libmariadbclient18 Section: libs Architecture: any -Depends: libmariadbclient18 (= ${source:Version}) -Replaces: libmysqlclient18 (<< ${source:Version}) +Depends: libmariadb3 (= ${binary:Version}), ${misc:Depends} +Replaces: libmariadbclient18 +Provides: libmariadbclient18 Description: Virtual package to satisfy external depends - This is an empty package that provides an updated "best" version of - libmysqlclient18 that does not conflict with the libmariadbclient18 - 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 provides compatibility symlinks for libmariadb3 -Package: libmariadbd-dev +Package: libmysqlclient18 +Section: libs Architecture: any -Section: libdevel -Depends: libmariadbclient-dev (>= ${source:Version}), ${misc:Depends} -Provides: libmysqld-dev -Conflicts: libmysqld-dev -Replaces: libmysqld-dev -Description: MariaDB embedded database, development files +Depends: libmariadb3 (= ${binary:Version}), ${misc:Depends} +Replaces: libmysqlclient18 +Provides: libmysqlclient18 +Description: Virtual package to satisfy external 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 includes the embedded server library and header files. + This package provides compatibility symlinks for libmariadb3 -Package: libmariadbclient-dev +Package: libmariadb-dev Architecture: any Section: libdevel -Depends: libmariadbclient18 (>= ${source:Version}), +Depends: libmariadb3 (= ${binary:Version}), zlib1g-dev, ${misc:Depends}, ${shlibs:Depends} -Replaces: libmariadbclient16-dev, libmysqlclient16-dev +Breaks: libmariadbclient-dev, libmysqlclient-dev +Replaces: libmariadbclient-dev, libmysqlclient-dev Conflicts: libmariadbclient16-dev, - libmysqlclient-dev, libmysqlclient10-dev, libmysqlclient12-dev, libmysqlclient14-dev, libmysqlclient15-dev, libmysqlclient16-dev -Provides: libmysqlclient-dev +Provides: libmariadbclient-dev, libmariadbclient-dev-compat, libmysqlclient-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 @@ -106,6 +115,40 @@ Description: MariaDB database development files . This package includes development libraries and header files. +Package: libmariadbd19 +Architecture: any +Section: libs +Depends: ${misc:Depends}, ${shlibs:Depends} +Multi-Arch: same +Breaks: libmariadbd-dev (<< ${source:Version}) +Replaces: libmariadbd-dev (<< ${source:Version}) +Description: MariaDB embedded database, shared 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 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} @@ -130,23 +173,19 @@ 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.1 +Package: mariadb-client-core-10.2 Architecture: any -Depends: libmariadbclient18 (>= ${source:Version}), - mariadb-common (>= ${source:Version}), +Depends: mariadb-common (>= ${source:Version}), libmariadb3, ${misc:Depends}, ${shlibs:Depends} -Provides: mysql-client-core, - mysql-client-core-5.1, - mysql-client-core-5.5, - mysql-client-core-5.6, - virtual-mysql-client-core Conflicts: mariadb-client-10.0, + mariadb-client-10.1, mariadb-client-5.1, 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-5.1, mariadb-client-core-5.2, mariadb-client-core-5.3, @@ -158,13 +197,16 @@ Conflicts: mariadb-client-10.0, mysql-client-core-5.1, mysql-client-core-5.5, mysql-client-core-5.6, + mysql-client-core-5.7, virtual-mysql-client-core Replaces: mariadb-client-10.0, + mariadb-client-10.1, 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-5.1, mariadb-client-core-5.2, mariadb-client-core-5.3, @@ -176,6 +218,14 @@ Replaces: mariadb-client-10.0, mysql-client-core-5.1, mysql-client-core-5.5, mysql-client-core-5.6, + mysql-client-core-5.7, + virtual-mysql-client-core +Provides: default-mysql-client-core, + mysql-client-core, + mysql-client-core-5.1, + mysql-client-core-5.5, + mysql-client-core-5.6, + mysql-client-core-5.7, virtual-mysql-client-core Description: MariaDB database core client binaries MariaDB is a fast, stable and true multi-user, multi-threaded SQL database @@ -185,26 +235,17 @@ Description: MariaDB database core client binaries . This package includes the core client files, as used by Akonadi. -Package: mariadb-client-10.1 +Package: mariadb-client-10.2 Architecture: any Depends: debianutils (>=1.6), - libdbd-mysql-perl (>= 1.2202), - libdbi-perl, - libmariadbclient18 (>= ${source:Version}), - mariadb-client-core-10.1 (>= ${source:Version}), + mariadb-client-core-10.2 (>= ${source:Version}), mariadb-common, ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends} -Suggests: libterm-readkey-perl -Provides: mysql-client, - mysql-client-4.1, - mysql-client-5.1, - mysql-client-5.5, - mysql-client-5.6, - virtual-mysql-client Conflicts: mariadb-client (<< ${source:Version}), mariadb-client-10.0, + mariadb-client-10.1, mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3, @@ -214,9 +255,11 @@ Conflicts: mariadb-client (<< ${source:Version}), mysql-client-5.1, mysql-client-5.5, mysql-client-5.6, + mysql-client-5.7, virtual-mysql-client Replaces: mariadb-client (<< ${source:Version}), mariadb-client-10.0, + mariadb-client-10.1, mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3, @@ -226,7 +269,17 @@ Replaces: mariadb-client (<< ${source:Version}), mysql-client-5.1, mysql-client-5.5, mysql-client-5.6, + mysql-client-5.7, + virtual-mysql-client +Provides: default-mysql-client, + mysql-client, + mysql-client-4.1, + mysql-client-5.1, + mysql-client-5.5, + mysql-client-5.6, + mysql-client-5.7, virtual-mysql-client +Recommends: libdbd-mysql-perl (>= 1.2202), libdbi-perl, libterm-readkey-perl Description: MariaDB database client binaries MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -236,18 +289,13 @@ Description: MariaDB database client binaries This package includes the client binaries and the additional tools innotop and mysqlreport. -Package: mariadb-server-core-10.1 +Package: mariadb-server-core-10.2 Architecture: any -Depends: libmariadbclient18 (>= ${binary:Version}), - mariadb-common (>= ${source:Version}), +Depends: mariadb-common (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} -Provides: mysql-server-core, - mysql-server-core-5.1, - mysql-server-core-5.5, - mysql-server-core-5.6, - virtual-mysql-server-core Conflicts: mariadb-server-core-10.0, + mariadb-server-core-10.1, mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.3, @@ -257,8 +305,18 @@ Conflicts: mariadb-server-core-10.0, mysql-server-core-5.1, mysql-server-core-5.5, mysql-server-core-5.6, + mysql-server-core-5.7, virtual-mysql-server-core -Replaces: mariadb-server-core-10.0, +Breaks: mariadb-client-10.0, + mariadb-client-10.1, + mariadb-client-10.2 (<< ${source:Version}), + mariadb-server-10.2 (<< ${source:Version}) +Replaces: mariadb-client-10.0, + mariadb-client-10.1, + mariadb-client-10.2 (<< ${source:Version}), + mariadb-server-10.2 (<< ${source:Version}), + mariadb-server-core-10.0, + mariadb-server-core-10.1, mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.3, @@ -268,6 +326,14 @@ Replaces: mariadb-server-core-10.0, mysql-server-core-5.1, mysql-server-core-5.5, mysql-server-core-5.6, + mysql-server-core-5.7, + virtual-mysql-server-core +Provides: default-mysql-server-core, + mysql-server-core, + mysql-server-core-5.1, + mysql-server-core-5.5, + mysql-server-core-5.6, + mysql-server-core-5.7, virtual-mysql-server-core Description: MariaDB database core server files MariaDB is a fast, stable and true multi-user, multi-threaded SQL database @@ -277,67 +343,38 @@ Description: MariaDB database core server files . This package includes the core server files, as used by Akonadi. -Package: mariadb-test-10.1 -Architecture: any -Depends: mariadb-client-10.1 (= ${binary:Version}), - mariadb-server-10.1 (= ${binary:Version}) -Suggests: patch -Conflicts: mariadb-galera-server-5.5 (<< 5.5.33), - mariadb-server-5.5 (<< 5.5.33), - mariadb-test (<< ${source:Version}), - mariadb-test-10.0, - mariadb-test-5.1, - mariadb-test-5.2, - mariadb-test-5.3, - virtual-mysql-testsuite -Replaces: mariadb-test (<< ${source:Version}), - mariadb-test-10.0, - mariadb-test-5.1, - mariadb-test-5.2, - mariadb-test-5.3, - virtual-mysql-testsuite -Provides: virtual-mysql-testsuite -Description: MariaDB database regression test suite - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes the regression test suite. - -Package: mariadb-server-10.1 +Package: mariadb-server-10.2 Architecture: any Suggests: mailx, mariadb-test, netcat-openbsd, tinyca Recommends: libhtml-template-perl -Pre-Depends: mariadb-common, adduser (>= 3.40), debconf +Pre-Depends: adduser (>= 3.40), debconf, mariadb-common (>= ${source:Version}) Depends: bsdutils, coreutils, findutils, galera-3 (>=25.3), gawk, - grep, iproute | iproute2, libdbi-perl, lsb-base (>= 3.0-10), lsof, - mariadb-client-10.1 (>= ${source:Version}), - mariadb-server-core-10.1 (>= ${binary:Version}), + mariadb-client-10.2 (>= ${source:Version}), + mariadb-server-core-10.2 (>= ${binary:Version}), passwd, perl (>= 5.6), psmisc, rsync, socat, - tar, ${misc:Depends}, ${shlibs:Depends} -Provides: mariadb-server, mysql-server, virtual-mysql-server Conflicts: mariadb-server (<< ${source:Version}), mariadb-server-10.0, + mariadb-server-10.1, 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-5.5, mysql-server (<< ${source:Version}), mysql-server-4.1, @@ -345,16 +382,19 @@ Conflicts: mariadb-server (<< ${source:Version}), mysql-server-5.1, mysql-server-5.5, mysql-server-5.6, + mysql-server-5.7, virtual-mysql-server Replaces: libmariadbclient-dev (<< 5.5.0), libmariadbclient16 (<< 5.3.4), mariadb-server (<< ${source:Version}), mariadb-server-10.0, + mariadb-server-10.1, 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-5.5, mysql-server (<< ${source:Version}), mysql-server-4.1, @@ -362,7 +402,9 @@ Replaces: libmariadbclient-dev (<< 5.5.0), mysql-server-5.1, mysql-server-5.5, mysql-server-5.6, + mysql-server-5.7, virtual-mysql-server +Provides: 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 @@ -373,10 +415,10 @@ Description: MariaDB database server binaries Package: mariadb-server Architecture: all -Depends: mariadb-server-10.1 (= ${source:Version}), ${misc:Depends} +Depends: mariadb-server-10.2 (>= ${source:Version}), ${misc:Depends} Description: MariaDB database server (metapackage depending on the latest version) This is an empty package that depends on the current "best" version of - mariadb-server (currently mariadb-server-10.1), as determined by the MariaDB + mariadb-server (currently mariadb-server-10.2), 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. @@ -388,68 +430,233 @@ Description: MariaDB database server (metapackage depending on the latest versio Package: mariadb-client Architecture: all -Depends: mariadb-client-10.1 (= ${source:Version}), ${misc:Depends} +Depends: mariadb-client-10.2 (>= ${source:Version}), ${misc:Depends} Description: MariaDB database client (metapackage depending on the latest version) This is an empty package that depends on the current "best" version of - mariadb-client (currently mariadb-client-10.1), as determined by the MariaDB + mariadb-client (currently mariadb-client-10.2), 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-test -Architecture: all -Depends: mariadb-test-10.1 (= ${source:Version}), ${misc:Depends} -Description: MariaDB database regression test suite (metapackage for the latest version) - This is an empty package that depends on the current "best" version of - mariadb-test (currently mariadb-test-10.1), as determined by the MariaDB - maintainers. - -Package: mariadb-connect-engine-10.1 +Package: mariadb-plugin-connect Architecture: any -Depends: libxml2, mariadb-server-10.1, unixodbc -Build-Depends: libxml2-dev, - mariadb-server-10.1, - unixodbc-dev, - ${misc:Depends}, - ${shlibs:Depends} +Depends: libxml2, + mariadb-server-10.2 (= ${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 Description: Connect storage engine for MariaDB Connect engine supports a number of file formats (dbf, xml, txt, bin, etc), connections to ODBC tables and remote MySQL tables, as well as a number of other interesting features. This package contains the Connect plugin for MariaDB. -Package: mariadb-oqgraph-engine-10.1 +Package: mariadb-plugin-rocksdb +Architecture: any +Depends: mariadb-server-10.2 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Recommends: python-mysqldb +Description: RocksDB storage engine for MariaDB + The RocksDB storage engine is a high performance storage engine, aimed + at maximising storage efficiency while maintaining InnoDB-like performance. + This package contains the RocksDB plugin for MariaDB. + +Package: mariadb-plugin-oqgraph Architecture: any -Depends: libjudydebian1, mariadb-server-10.1, ${misc:Depends}, ${shlibs:Depends} +Depends: libjudydebian1, + mariadb-server-10.2 (= ${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 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-cracklib-password-check-10.1 -Section: database +Package: mariadb-plugin-tokudb Architecture: any -Depends: libcrack2 (>= 2.9.0), mariadb-server-10.1 -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. +Depends: mariadb-server-10.2 (= ${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}) +Replaces: mariadb-server-10.0, + mariadb-server-10.1, + mariadb-server-10.2 (<< ${source:Version}) +Description: TokuDB storage engine for MariaDB + The TokuDB storage engine is for use in high-performance and write-intensive + environments, offering increased compression and better performance based + on fractal indexes. + This package contains the TokuDB plugin for MariaDB. -Package: mariadb-gssapi-server-10.1 -Section: database +Package: mariadb-plugin-mroonga +Architecture: any +Depends: mariadb-server-10.2 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Breaks: mariadb-server-10.0, + mariadb-server-10.1, + mariadb-server-10.2 (<< ${source:Version}) +Replaces: mariadb-server-10.0, + mariadb-server-10.1, + mariadb-server-10.2 (<< ${source:Version}) +Description: Mroonga storage engine for MariaDB + Mroonga (formerly named Groonga Storage Engine) is a storage engine that + provides fast CJK-ready full text searching using column store. + This package contains the Mroonga plugin for MariaDB. + +Package: mariadb-plugin-spider Architecture: any -Depends: libgssapi-krb5-2, mariadb-server-10.1 +Depends: mariadb-server-10.2 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Breaks: mariadb-server-10.0, + mariadb-server-10.1, + mariadb-server-10.2 (<< ${source:Version}) +Replaces: mariadb-server-10.0, + mariadb-server-10.1, + mariadb-server-10.2 (<< ${source:Version}) +Description: Spider storage engine for MariaDB + The Spider storage engine with built-in sharding features. It supports + partitioning and xa transactions, and allows tables of different MariaDB + instances to be handled as if they were on the same insctance. It refers to one + possible implementation of ISO/IEC 9075-9:2008 SQL/MED. + +Package: mariadb-plugin-cassandra +Architecture: any +Depends: mariadb-server-10.2 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Breaks: mariadb-server-10.0, + mariadb-server-10.1, + mariadb-server-10.2 (<< ${source:Version}) +Replaces: mariadb-server-10.0, + mariadb-server-10.1, + mariadb-server-10.2 (<< ${source:Version}) +Description: Cassandra storage engine for MariaDB + The Cassandra Storage Engine allows access to data in a Cassandra cluster from + MariaDB, combining the best of SQL and no-SQL worlds. Cassandra SE (storage + engine) makes Cassandra's column family appear as a table in MariaDB that you + can insert to, update, and select from. You can write joins against this table, + it is possible to join data that's stored in MariaDB with data that's stored in + Cassandra. + +Package: mariadb-plugin-gssapi-server +Architecture: any +Depends: libgssapi-krb5-2, + mariadb-server-10.2, + ${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 Description: GSSAPI authentication plugin for MariaDB server -Package: mariadb-gssapi-client-10.1 -Section: database +Package: mariadb-plugin-gssapi-client Architecture: any -Depends: libgssapi-krb5-2, mariadb-client-10.1 +Depends: libgssapi-krb5-2, + mariadb-client-10.2, + ${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 Description: GSSAPI authentication plugin for MariaDB client - -Package: mariadb-backup-10.1 +Package: mariadb-backup-10.2 Section: database Architecture: any -Depends: mariadb-client-core-10.1 (= ${binary:Version}), +Breaks: mariadb-backup-10.1 +Replaces: mariadb-backup-10.1 +Depends: mariadb-client-core-10.2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Description: Backup tool for MariaDB server + +Package: mariadb-plugin-cracklib-password-check +Architecture: any +Depends: libcrack2 (>= 2.9.0), + mariadb-server-10.2, + ${misc:Depends}, + ${shlibs:Depends} +Description: CrackLib Password Validation Plugin for MariaDB + This password validation plugin uses cracklib to allow only + sufficiently secure (as defined by cracklib) user passwords in MariaDB. + +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}), + mariadb-test-data (= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Breaks: mariadb-server-5.5, + mariadb-test-10.0, + mariadb-test-10.1, + mariadb-test-5.5, + mysql-testsuite, + mysql-testsuite-5.5, + mysql-testsuite-5.6, + mysql-testsuite-5.7, + virtual-mysql-testsuite +Replaces: mariadb-server-5.5, + mariadb-test-10.0, + mariadb-test-10.1, + mariadb-test-5.5, + mysql-testsuite, + mysql-testsuite-5.5, + mysql-testsuite-5.6, + mysql-testsuite-5.7, + virtual-mysql-testsuite +Provides: virtual-mysql-testsuite +Suggests: patch +Description: MariaDB database regression test suite + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the regression test suite. + +Package: mariadb-test-data +Architecture: all +Depends: ${misc:Depends} +Breaks: mariadb-test-10.0, + mariadb-test-10.1, + mariadb-test-5.5, + mariadb-test-data-10.0, + mysql-testsuite, + mysql-testsuite-5.5, + mysql-testsuite-5.6, + mysql-testsuite-5.7 +Replaces: mariadb-test-10.0, + mariadb-test-10.1, + mariadb-test-5.5, + mariadb-test-data-10.0, + mysql-testsuite, + mysql-testsuite-5.5, + mysql-testsuite-5.6, + mysql-testsuite-5.7 +Description: MariaDB database regression test suite - data files + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package has the architecture independent data files for the test suite. diff --git a/debian/copyright b/debian/copyright index 7139259e757..2f27c03a8fc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -9,7 +9,7 @@ The MariaDB packages were initally made by http://ourdelta.org/, and are now managed by the MariaDB development team, maria-developers@lists.launchpad.net -MariaDB can be downloaded from https://downloads.mariadb.org/ +MariaDB can be downloaded from https://downloads.mariadb.org/ Copyright: diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 00000000000..a5af3e1f7e8 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,5 @@ +[DEFAULT] +# Ignore requirement to use branch name 'master' to make it easier +# for contributors to work with feature and bugfix branches +# to Debian packaging +ignore-branch = True diff --git a/debian/libmariadbclient-dev.README.Maintainer b/debian/libmariadb-dev.README.Maintainer index f24cdcd519d..99e1c662c14 100644 --- a/debian/libmariadbclient-dev.README.Maintainer +++ b/debian/libmariadb-dev.README.Maintainer @@ -1,4 +1,3 @@ The examples directory includes files that might be needed by some developers: -- header files not installed by default - the example file udf_example.c diff --git a/debian/libmariadbclient-dev.examples b/debian/libmariadb-dev.examples index f1649c311c4..f1649c311c4 100644 --- a/debian/libmariadbclient-dev.examples +++ b/debian/libmariadb-dev.examples diff --git a/debian/libmariadb-dev.install b/debian/libmariadb-dev.install new file mode 100644 index 00000000000..856cdacfd95 --- /dev/null +++ b/debian/libmariadb-dev.install @@ -0,0 +1,9 @@ +usr/bin/mysql_config +usr/include/mysql +usr/lib/*/libmariadb.so +usr/lib/*/libmysqlclient.so +usr/lib/*/libmariadbclient.so +usr/lib/*/libmariadbclient.a +usr/lib/*/libmysqlservices.a +usr/lib/*/pkgconfig/mariadb.pc +usr/share/aclocal/mysql.m4 diff --git a/debian/libmariadb-dev.manpages b/debian/libmariadb-dev.manpages new file mode 100644 index 00000000000..3aac7f4b4a9 --- /dev/null +++ b/debian/libmariadb-dev.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man1/mysql_config.1 diff --git a/debian/libmariadb3.install b/debian/libmariadb3.install new file mode 100644 index 00000000000..065adc67a91 --- /dev/null +++ b/debian/libmariadb3.install @@ -0,0 +1,6 @@ +usr/lib/*/libmysqlclient.so.19 +usr/lib/*/libmysqlclient.so.20 +usr/lib/*/libmariadb.so.* +usr/lib/mysql/plugin/dialog.so +usr/lib/mysql/plugin/mysql_clear_password.so +usr/lib/mysql/plugin/client_ed25519.so diff --git a/debian/libmariadbclient18.postinst b/debian/libmariadb3.postinst index 29d3b86f978..29d3b86f978 100644 --- a/debian/libmariadbclient18.postinst +++ b/debian/libmariadb3.postinst diff --git a/debian/libmariadbclient-dev.dirs b/debian/libmariadbclient-dev.dirs deleted file mode 100644 index f6ad2870431..00000000000 --- a/debian/libmariadbclient-dev.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/include/ -usr/lib/ diff --git a/debian/libmariadbclient-dev.files b/debian/libmariadbclient-dev.files deleted file mode 100644 index a7595dceffd..00000000000 --- a/debian/libmariadbclient-dev.files +++ /dev/null @@ -1,8 +0,0 @@ -usr/bin/mysql_config -usr/include/mysql -usr/lib/libmysqlclient.a -usr/lib/libmysqlclient_r.a -usr/lib/libmysqlservices.a -usr/share/aclocal/mysql.m4 -usr/share/pkgconfig/mariadb.pc -usr/share/man/man1/mysql_config.1 diff --git a/debian/libmariadbclient-dev.links b/debian/libmariadbclient-dev.links deleted file mode 100644 index 0076791dcfa..00000000000 --- a/debian/libmariadbclient-dev.links +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/libmysqlclient.so.18 usr/lib/libmysqlclient.so -usr/lib/libmysqlclient_r.so.18 usr/lib/libmysqlclient_r.so diff --git a/debian/libmariadbclient18.dirs b/debian/libmariadbclient18.dirs deleted file mode 100644 index 2964de6141b..00000000000 --- a/debian/libmariadbclient18.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib/ diff --git a/debian/libmariadbclient18.files b/debian/libmariadbclient18.files deleted file mode 100644 index 75020ecbd16..00000000000 --- a/debian/libmariadbclient18.files +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/libmysqlclient*.so.* -usr/lib/mysql/plugin/mysql_clear_password.so -usr/lib/mysql/plugin/dialog.so diff --git a/debian/libmariadbclient18.install b/debian/libmariadbclient18.install new file mode 100644 index 00000000000..e3939fa4fc7 --- /dev/null +++ b/debian/libmariadbclient18.install @@ -0,0 +1 @@ +usr/lib/*/libmariadbclient.so.18 diff --git a/debian/libmariadbclient18.links b/debian/libmariadbclient18.links deleted file mode 100644 index b2e8a48302f..00000000000 --- a/debian/libmariadbclient18.links +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/libmysqlclient.so.18.0.0 usr/lib/libmariadbclient.so.18.0.0 -usr/lib/libmysqlclient.so.18 usr/lib/libmariadbclient.so.18 -usr/lib/libmysqlclient.so usr/lib/libmariadbclient.so diff --git a/debian/libmariadbd-dev.files b/debian/libmariadbd-dev.files deleted file mode 100644 index 26cb8d0a606..00000000000 --- a/debian/libmariadbd-dev.files +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/mysql/*.a -usr/lib/mysql/*.la diff --git a/debian/libmariadbd-dev.install b/debian/libmariadbd-dev.install new file mode 100644 index 00000000000..6fe225b15ba --- /dev/null +++ b/debian/libmariadbd-dev.install @@ -0,0 +1,3 @@ +usr/bin/mariadb_config +usr/lib/*/libmysqld.a +usr/lib/*/libmysqld.so diff --git a/debian/libmariadbd19.install b/debian/libmariadbd19.install new file mode 100644 index 00000000000..fb5f4771734 --- /dev/null +++ b/debian/libmariadbd19.install @@ -0,0 +1 @@ +usr/lib/*/libmysqld.so.* diff --git a/debian/libmysqlclient18.install b/debian/libmysqlclient18.install new file mode 100644 index 00000000000..3193873093f --- /dev/null +++ b/debian/libmysqlclient18.install @@ -0,0 +1 @@ +usr/lib/*/libmysqlclient.so.18 diff --git a/debian/mariadb-backup-10.1.files b/debian/mariadb-backup-10.2.install index 734117c92e2..734117c92e2 100644 --- a/debian/mariadb-backup-10.1.files +++ b/debian/mariadb-backup-10.2.install diff --git a/debian/mariadb-client-10.1.dirs b/debian/mariadb-client-10.1.dirs deleted file mode 100644 index ceda5922c5d..00000000000 --- a/debian/mariadb-client-10.1.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin/ -usr/share/man/man1/ -usr/share/perl5/ diff --git a/debian/mariadb-client-10.1.files b/debian/mariadb-client-10.1.files deleted file mode 100644 index e6033952c26..00000000000 --- a/debian/mariadb-client-10.1.files +++ /dev/null @@ -1,27 +0,0 @@ -usr/bin/innochecksum -usr/bin/innotop -usr/bin/mysqlaccess -usr/bin/mysqladmin -usr/bin/mysqlbug -usr/bin/mysqldump -usr/bin/mysqldumpslow -usr/bin/mysql_find_rows -usr/bin/mysql_fix_extensions -usr/bin/mysqlimport -usr/bin/mysqlreport -usr/bin/mysqlshow -usr/bin/mysqlslap -usr/bin/mysql_waitpid -usr/share/man/man1/innotop.1 -usr/share/man/man1/mysqlaccess.1 -usr/share/man/man1/mysqladmin.1 -usr/share/man/man1/mysqlbug.1 -usr/share/man/man1/mysqldump.1 -usr/share/man/man1/mysqldumpslow.1 -usr/share/man/man1/mysql_find_rows.1 -usr/share/man/man1/mysql_fix_extensions.1 -usr/share/man/man1/mysqlimport.1 -usr/share/man/man1/mysqlreport.1 -usr/share/man/man1/mysqlshow.1 -usr/share/man/man1/mysqlslap.1 -usr/share/man/man1/mysql_waitpid.1 diff --git a/debian/mariadb-client-10.1.menu b/debian/mariadb-client-10.1.menu deleted file mode 100644 index 1378555c423..00000000000 --- a/debian/mariadb-client-10.1.menu +++ /dev/null @@ -1,3 +0,0 @@ -# According to /usr/share/menu/ policy 1.4, not /usr/share/doc/debian-policy/ -?package(innotop):needs="text" section="Applications/Data Management"\ - title="innotop" command="/usr/bin/innotop" diff --git a/debian/mariadb-client-10.1.README.Debian b/debian/mariadb-client-10.2.README.Debian index 64f0f509951..b245638f9c9 100644 --- a/debian/mariadb-client-10.1.README.Debian +++ b/debian/mariadb-client-10.2.README.Debian @@ -1,4 +1,4 @@ FAQ: -Q: My <tab> completion is gone, why? +Q: My <tab> completition is gone, why? A: You have "no-auto-rehash" in the "[mysql]" section of /etc/mysql/my.cnf! diff --git a/debian/mariadb-client-10.1.docs b/debian/mariadb-client-10.2.docs index 21446855f51..8117d689011 100644 --- a/debian/mariadb-client-10.1.docs +++ b/debian/mariadb-client-10.2.docs @@ -1,2 +1,2 @@ debian/additions/innotop/changelog.innotop -README +README.md diff --git a/debian/mariadb-client-10.2.install b/debian/mariadb-client-10.2.install new file mode 100644 index 00000000000..271f2a2f417 --- /dev/null +++ b/debian/mariadb-client-10.2.install @@ -0,0 +1,12 @@ +debian/additions/innotop/innotop usr/bin/ +debian/additions/mysqlreport usr/bin/ +usr/bin/mysql_find_rows +usr/bin/mysql_fix_extensions +usr/bin/mysql_waitpid +usr/bin/mysqlaccess +usr/bin/mysqladmin +usr/bin/mysqldump +usr/bin/mysqldumpslow +usr/bin/mysqlimport +usr/bin/mysqlshow +usr/bin/mysqlslap diff --git a/debian/mariadb-client-10.1.links b/debian/mariadb-client-10.2.links index 0b86e87f2e9..0b86e87f2e9 100644 --- a/debian/mariadb-client-10.1.links +++ b/debian/mariadb-client-10.2.links diff --git a/debian/mariadb-client-10.2.manpages b/debian/mariadb-client-10.2.manpages new file mode 100644 index 00000000000..504619785bc --- /dev/null +++ b/debian/mariadb-client-10.2.manpages @@ -0,0 +1,12 @@ +debian/additions/innotop/innotop.1 +debian/tmp/usr/share/man/man1/mysqlaccess.1 +debian/tmp/usr/share/man/man1/mysqladmin.1 +debian/tmp/usr/share/man/man1/mysqldump.1 +debian/tmp/usr/share/man/man1/mysqldumpslow.1 +debian/tmp/usr/share/man/man1/mysql_find_rows.1 +debian/tmp/usr/share/man/man1/mysql_fix_extensions.1 +debian/tmp/usr/share/man/man1/mysqlimport.1 +debian/additions/mysqlreport.1 +debian/tmp/usr/share/man/man1/mysqlshow.1 +debian/tmp/usr/share/man/man1/mysqlslap.1 +debian/tmp/usr/share/man/man1/mysql_waitpid.1 diff --git a/debian/mariadb-client-10.2.menu b/debian/mariadb-client-10.2.menu new file mode 100644 index 00000000000..c08678536d1 --- /dev/null +++ b/debian/mariadb-client-10.2.menu @@ -0,0 +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"\ + title="Innotop" command="/usr/bin/innotop" diff --git a/debian/mariadb-client-core-10.1.files b/debian/mariadb-client-core-10.1.files deleted file mode 100644 index a2781309439..00000000000 --- a/debian/mariadb-client-core-10.1.files +++ /dev/null @@ -1,4 +0,0 @@ -usr/bin/mysql -usr/bin/mysqlcheck -usr/share/man/man1/mysql.1 -usr/share/man/man1/mysqlcheck.1 diff --git a/debian/mariadb-client-core-10.2.install b/debian/mariadb-client-core-10.2.install new file mode 100644 index 00000000000..6308d769930 --- /dev/null +++ b/debian/mariadb-client-core-10.2.install @@ -0,0 +1,2 @@ +usr/bin/mysql +usr/bin/mysqlcheck diff --git a/debian/mariadb-client-core-10.2.manpages b/debian/mariadb-client-core-10.2.manpages new file mode 100644 index 00000000000..2be91d81f9a --- /dev/null +++ b/debian/mariadb-client-core-10.2.manpages @@ -0,0 +1,2 @@ +debian/tmp/usr/share/man/man1/mysql.1 +debian/tmp/usr/share/man/man1/mysqlcheck.1 diff --git a/debian/mariadb-common.dirs b/debian/mariadb-common.dirs new file mode 100644 index 00000000000..87c71c1c2f5 --- /dev/null +++ b/debian/mariadb-common.dirs @@ -0,0 +1 @@ +etc/mysql/mariadb.conf.d/ diff --git a/debian/mariadb-common.files b/debian/mariadb-common.files deleted file mode 100644 index f37e46c45fe..00000000000 --- a/debian/mariadb-common.files +++ /dev/null @@ -1 +0,0 @@ -etc/mysql/conf.d/mariadb.cnf diff --git a/debian/mariadb-common.install b/debian/mariadb-common.install new file mode 100644 index 00000000000..78dbc22b9f6 --- /dev/null +++ b/debian/mariadb-common.install @@ -0,0 +1 @@ +debian/additions/mariadb.cnf etc/mysql/conf.d diff --git a/debian/mariadb-cracklib-password-check-10.1.files b/debian/mariadb-cracklib-password-check-10.1.files deleted file mode 100644 index 3fe06639703..00000000000 --- a/debian/mariadb-cracklib-password-check-10.1.files +++ /dev/null @@ -1 +0,0 @@ -usr/lib/mysql/plugin/cracklib_password_check.so diff --git a/debian/mariadb-gssapi-server-10.1.files b/debian/mariadb-gssapi-server-10.1.files deleted file mode 100644 index d5e7b362a74..00000000000 --- a/debian/mariadb-gssapi-server-10.1.files +++ /dev/null @@ -1 +0,0 @@ -usr/lib/mysql/plugin/auth_gssapi.so diff --git a/debian/mariadb-oqgraph-engine-10.1.files b/debian/mariadb-oqgraph-engine-10.1.files deleted file mode 100644 index f67b0cd9d13..00000000000 --- a/debian/mariadb-oqgraph-engine-10.1.files +++ /dev/null @@ -1 +0,0 @@ -usr/lib/mysql/plugin/ha_oqgraph.so diff --git a/debian/mariadb-plugin-aws-key-management-10.2.install b/debian/mariadb-plugin-aws-key-management-10.2.install new file mode 100644 index 00000000000..ed966b4115d --- /dev/null +++ b/debian/mariadb-plugin-aws-key-management-10.2.install @@ -0,0 +1,2 @@ +usr/lib/mysql/plugin/aws_key_management.so +debian/additions/enable_encryption.preset etc/mysql/conf.d/ diff --git a/debian/mariadb-plugin-cassandra.install b/debian/mariadb-plugin-cassandra.install new file mode 100644 index 00000000000..ca195058a17 --- /dev/null +++ b/debian/mariadb-plugin-cassandra.install @@ -0,0 +1,2 @@ +etc/mysql/conf.d/cassandra.cnf etc/mysql/mariadb.conf.d +usr/lib/mysql/plugin/ha_cassandra.so diff --git a/debian/mariadb-connect-engine-10.1.files b/debian/mariadb-plugin-connect.install index 0b042607c36..8a7aee412df 100644 --- a/debian/mariadb-connect-engine-10.1.files +++ b/debian/mariadb-plugin-connect.install @@ -1,2 +1,2 @@ -usr/lib/mysql/plugin/ha_connect.so etc/mysql/conf.d/connect.cnf +usr/lib/mysql/plugin/ha_connect.so diff --git a/debian/mariadb-plugin-cracklib-password-check.install b/debian/mariadb-plugin-cracklib-password-check.install new file mode 100644 index 00000000000..7cc3fdc2b3e --- /dev/null +++ b/debian/mariadb-plugin-cracklib-password-check.install @@ -0,0 +1,2 @@ +etc/mysql/conf.d/cracklib_password_check.cnf etc/mysql/mariadb.conf.d +usr/lib/mysql/plugin/cracklib_password_check.so diff --git a/debian/mariadb-gssapi-client-10.1.files b/debian/mariadb-plugin-gssapi-client.install index 5a089e9352e..5a089e9352e 100644 --- a/debian/mariadb-gssapi-client-10.1.files +++ b/debian/mariadb-plugin-gssapi-client.install diff --git a/debian/mariadb-plugin-gssapi-server.install b/debian/mariadb-plugin-gssapi-server.install new file mode 100644 index 00000000000..537f459d2d2 --- /dev/null +++ b/debian/mariadb-plugin-gssapi-server.install @@ -0,0 +1,2 @@ +etc/mysql/conf.d/auth_gssapi.cnf etc/mysql/mariadb.conf.d +usr/lib/mysql/plugin/auth_gssapi.so diff --git a/debian/mariadb-plugin-mroonga.install b/debian/mariadb-plugin-mroonga.install new file mode 100644 index 00000000000..c28fde2fd18 --- /dev/null +++ b/debian/mariadb-plugin-mroonga.install @@ -0,0 +1,3 @@ +usr/lib/mysql/plugin/ha_mroonga.so +usr/share/mysql/mroonga/install.sql +usr/share/mysql/mroonga/uninstall.sql diff --git a/debian/mariadb-plugin-mroonga.postinst b/debian/mariadb-plugin-mroonga.postinst new file mode 100644 index 00000000000..fea327c204d --- /dev/null +++ b/debian/mariadb-plugin-mroonga.postinst @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +# Install Mroonga +mysql --defaults-file=/etc/mysql/debian.cnf < /usr/share/mysql/mroonga/install.sql || true +# Always exit with success instead of leaving dpkg in a broken state + + +#DEBHELPER# diff --git a/debian/mariadb-plugin-mroonga.prerm b/debian/mariadb-plugin-mroonga.prerm new file mode 100755 index 00000000000..cdd26ebbc45 --- /dev/null +++ b/debian/mariadb-plugin-mroonga.prerm @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +# Uninstall Mroonga +mysql --defaults-file=/etc/mysql/debian.cnf < /usr/share/mysql/mroonga/uninstall.sql || true +# Always exit with success instead of leaving dpkg in a broken state + + +#DEBHELPER# diff --git a/debian/mariadb-plugin-oqgraph.install b/debian/mariadb-plugin-oqgraph.install new file mode 100644 index 00000000000..5e2a892d9e9 --- /dev/null +++ b/debian/mariadb-plugin-oqgraph.install @@ -0,0 +1,2 @@ +etc/mysql/conf.d/oqgraph.cnf etc/mysql/mariadb.conf.d +usr/lib/mysql/plugin/ha_oqgraph.so diff --git a/debian/mariadb-plugin-rocksdb.install b/debian/mariadb-plugin-rocksdb.install new file mode 100644 index 00000000000..fd71995b6a3 --- /dev/null +++ b/debian/mariadb-plugin-rocksdb.install @@ -0,0 +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 diff --git a/debian/mariadb-plugin-spider.install b/debian/mariadb-plugin-spider.install new file mode 100644 index 00000000000..89652fe2f3c --- /dev/null +++ b/debian/mariadb-plugin-spider.install @@ -0,0 +1,2 @@ +usr/lib/mysql/plugin/ha_spider.so +usr/share/mysql/install_spider.sql diff --git a/debian/mariadb-plugin-spider.postinst b/debian/mariadb-plugin-spider.postinst new file mode 100644 index 00000000000..d4ddaa53156 --- /dev/null +++ b/debian/mariadb-plugin-spider.postinst @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +# Install Spider +mysql --defaults-file=/etc/mysql/debian.cnf < /usr/share/mysql/install_spider.sql || true +# Always exit with success instead of leaving dpkg in a broken state + + +#DEBHELPER# diff --git a/debian/mariadb-plugin-tokudb.install b/debian/mariadb-plugin-tokudb.install new file mode 100644 index 00000000000..48d16ffb2c0 --- /dev/null +++ b/debian/mariadb-plugin-tokudb.install @@ -0,0 +1,5 @@ +etc/mysql/conf.d/tokudb.cnf etc/mysql/mariadb.conf.d +etc/systemd/system/mariadb.service.d/tokudb.conf +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 diff --git a/debian/mariadb-server-10.1.dirs b/debian/mariadb-server-10.1.dirs deleted file mode 100644 index 64b49db4af9..00000000000 --- a/debian/mariadb-server-10.1.dirs +++ /dev/null @@ -1,10 +0,0 @@ -etc/init.d -etc/logrotate.d -etc/mysql/conf.d -usr/bin -usr/sbin -usr/share/man/man8 -usr/share/mysql -usr/share/doc/mariadb-server-10.1 -var/run/mysqld -var/lib/mysql-upgrade diff --git a/debian/mariadb-server-10.1.mysql.init b/debian/mariadb-server-10.1.mysql.init deleted file mode 100644 index c15983c13d0..00000000000 --- a/debian/mariadb-server-10.1.mysql.init +++ /dev/null @@ -1,197 +0,0 @@ -#!/bin/bash -# -### BEGIN INIT INFO -# Provides: mysql -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Should-Start: $network $named $time -# Should-Stop: $network $named $time -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Start and stop the mysql database server daemon -# Description: Controls the main MariaDB database server daemon "mysqld" -# and its wrapper script "mysqld_safe". -### END INIT INFO -# -set -e -set -u -${DEBIAN_SCRIPT_DEBUG:+ set -v -x} - -test -x /usr/sbin/mysqld || exit 0 - -. /lib/lsb/init-functions - -SELF=$(cd $(dirname $0); pwd -P)/$(basename $0) -CONF=/etc/mysql/my.cnf -MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf" - -# priority can be overridden and "-s" adds output to stderr -ERR_LOGGER="logger -p daemon.err -t /etc/init.d/mysql -i" - -# Safeguard (relative paths, core dumps..) -cd / -umask 077 - -# mysqladmin likes to read /root/.my.cnf. This is usually not what I want -# as many admins e.g. only store a password without a username there and -# so break my scripts. -export HOME=/etc/mysql/ - -# Source default config file. -[ -r /etc/default/mariadb ] && . /etc/default/mariadb - -## Fetch a particular option from mysql's invocation. -# -# Usage: void mysqld_get_param option -mysqld_get_param() { - /usr/sbin/mysqld --print-defaults \ - | tr " " "\n" \ - | grep -- "--$1" \ - | tail -n 1 \ - | cut -d= -f2 -} - -## Do some sanity checks before even trying to start mysqld. -sanity_checks() { - # check for config file - if [ ! -r /etc/mysql/my.cnf ]; then - log_warning_msg "$0: WARNING: /etc/mysql/my.cnf cannot be read. See README.Debian.gz" - echo "WARNING: /etc/mysql/my.cnf cannot be read. See README.Debian.gz" | $ERR_LOGGER - fi - - # check for diskspace shortage - datadir=`mysqld_get_param datadir` - if LC_ALL=C BLOCKSIZE= df --portability $datadir/. | tail -n 1 | awk '{ exit ($4>4096) }'; then - log_failure_msg "$0: ERROR: The partition with $datadir is too full!" - echo "ERROR: The partition with $datadir is too full!" | $ERR_LOGGER - exit 1 - fi -} - -## Checks if there is a server running and if so if it is accessible. -# -# check_alive insists on a pingable server -# check_dead also fails if there is a lost mysqld in the process list -# -# Usage: boolean mysqld_status [check_alive|check_dead] [warn|nowarn] -mysqld_status () { - ping_output=`$MYADMIN ping 2>&1`; ping_alive=$(( ! $? )) - - ps_alive=0 - pidfile=`mysqld_get_param pid-file` - if [ -f "$pidfile" ] && ps `cat $pidfile` >/dev/null 2>&1; then ps_alive=1; fi - - if [ "$1" = "check_alive" -a $ping_alive = 1 ] || - [ "$1" = "check_dead" -a $ping_alive = 0 -a $ps_alive = 0 ]; then - return 0 # EXIT_SUCCESS - else - if [ "$2" = "warn" ]; then - echo -e "$ps_alive processes alive and '$MYADMIN ping' resulted in\n$ping_output\n" | $ERR_LOGGER -p daemon.debug - fi - return 1 # EXIT_FAILURE - fi -} - -# -# main() -# - -case "${1:-''}" in - 'start') - sanity_checks; - # Start daemon - log_daemon_msg "Starting MariaDB database server" "mysqld" - if mysqld_status check_alive nowarn; then - log_progress_msg "already running" - log_end_msg 0 - else - # Could be removed during boot - test -e /var/run/mysqld || install -m 755 -o mysql -g root -d /var/run/mysqld - - # Start MariaDB! - /usr/bin/mysqld_safe "${@:2}" > /dev/null 2>&1 & - - # 6s was reported in #352070 to be too little - for i in $(seq 1 "${MYSQLD_STARTUP_TIMEOUT:-60}"); do - sleep 1 - if mysqld_status check_alive nowarn ; then break; fi - log_progress_msg "." - done - if mysqld_status check_alive warn; then - log_end_msg 0 - # Now start mysqlcheck or whatever the admin wants. - output=$(/etc/mysql/debian-start) - [ -n "$output" ] && log_action_msg "$output" - else - log_end_msg 1 - log_failure_msg "Please take a look at the syslog" - fi - fi - ;; - - 'stop') - # * As a passwordless mysqladmin (e.g. via ~/.my.cnf) must be possible - # at least for cron, we can rely on it here, too. (although we have - # to specify it explicit as e.g. sudo environments points to the normal - # users home and not /root) - log_daemon_msg "Stopping MariaDB database server" "mysqld" - if ! mysqld_status check_dead nowarn; then - set +e - shutdown_out=`$MYADMIN shutdown 2>&1`; r=$? - set -e - if [ "$r" -ne 0 ]; then - log_end_msg 1 - [ "$VERBOSE" != "no" ] && log_failure_msg "Error: $shutdown_out" - log_daemon_msg "Killing MariaDB database server by signal" "mysqld" - killall -15 mysqld - server_down= - for i in `seq 1 600`; do - sleep 1 - if mysqld_status check_dead nowarn; then server_down=1; break; fi - done - if test -z "$server_down"; then killall -9 mysqld; fi - fi - fi - - 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.1/README.Debian.gz!" - exit -1 - else - log_end_msg 0 - fi - ;; - - 'restart') - set +e; $SELF stop; set -e - $SELF start - ;; - - 'reload'|'force-reload') - log_daemon_msg "Reloading MariaDB database server" "mysqld" - $MYADMIN reload - log_end_msg 0 - ;; - - 'status') - if mysqld_status check_alive nowarn; then - log_action_msg "$($MYADMIN version)" - else - log_action_msg "MariaDB is stopped." - exit 3 - fi - ;; - - 'bootstrap') - # Bootstrap the cluster, start the first node - # that initiates the cluster - log_daemon_msg "Bootstrapping the cluster" "mysqld" - $SELF start "${@:2}" --wsrep-new-cluster - ;; - - *) - echo "Usage: $SELF start|stop|restart|reload|force-reload|status|bootstrap" - exit 1 - ;; -esac - diff --git a/debian/mariadb-server-10.1.preinst b/debian/mariadb-server-10.1.preinst deleted file mode 100644 index 1df01b2dcee..00000000000 --- a/debian/mariadb-server-10.1.preinst +++ /dev/null @@ -1,170 +0,0 @@ -#!/bin/bash -e -# -# summary of how this script can be called: -# * <new-preinst> install -# * <new-preinst> install <old-version> -# * <new-preinst> upgrade <old-version> -# * <old-preinst> abort-upgrade <new-version> -# - -. /usr/share/debconf/confmodule - -if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi -${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 } - -export PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin -MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf" -DATADIR=/var/lib/mysql -LOGDIR=/var/log/mysql -UPGRADEDIR=/var/lib/mysql-upgrade - -# Try to stop the server in a sane way. If it does not success let the admin -# do it himself. No database directories should be removed while the server -# is running! Another mysqld in e.g. a different chroot is fine for us. -stop_server() { - if [ ! -x /etc/init.d/mysql ]; then return; fi - - set +e - if [ -x /usr/sbin/invoke-rc.d ]; then - cmd="invoke-rc.d mysql stop" - else - cmd="/etc/init.d/mysql stop" - fi - $cmd - errno=$? - set -e - - # 0=ok, 100=no init script (fresh install) - if [ "$errno" != 0 -a "$errno" != 100 ]; then - echo "${cmd/ */} returned $errno" 1>&2 - echo "There is a MySQL server running, but we failed in our attempts to stop it." 1>&2 - echo "Stop it yourself and try again!" 1>&2 - db_stop - exit 1 - fi -} - -################################ main() ########################## - -this_version=10.1 - -# Safe the user from stupidities. -show_downgrade_warning=0 -for i in `ls $DATADIR/debian-*.flag 2>/dev/null`; do - found_version=`echo $i | sed 's/.*debian-\([0-9\.]\+\).flag/\1/'` - if dpkg --compare-versions "$this_version" '<<' "$found_version"; then - show_downgrade_warning=1 - break; - fi -done -if [ "$show_downgrade_warning" = 1 ]; then - db_fset mariadb-server-$this_version/really_downgrade seen false || true - db_input medium mariadb-server-$this_version/really_downgrade || true - db_go - db_get mariadb-server-$this_version/really_downgrade || true - if [ "$RET" = "true" ]; then - rm -f $DATADIR/debian-*.flag - touch $DATADIR/debian-$this_version.flag - else - echo "Aborting downgrade from (at least) $found_version to $this_version." 1>&2 - echo "If are sure you want to downgrade to $this_version, remove the file" 1>&2 - echo "$DATADIR/debian-*.flag and try installing again." 1>&2 - db_stop - exit 1 - fi -fi - -# to be sure -stop_server - -# If we use NIS then errors should be tolerated. It's up to the -# user to ensure that the mysql user is correctly setup. -# Beware that there are two ypwhich one of them needs the 2>/dev/null! -if test -n "`which ypwhich 2>/dev/null`" && ypwhich >/dev/null 2>&1; then - set +e -fi - -# -# Now we have to ensure the following state: -# /etc/passwd: mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false -# /etc/group: mysql:x:101: -# -# Sadly there could any state be present on the system so we have to -# modify everything carefully i.e. not doing a chown before creating -# the user etc... -# - -# creating mysql group if he isn't already there -if ! getent group mysql >/dev/null; then - # Adding system group: mysql. - addgroup --system mysql >/dev/null -fi - -# creating mysql user if he isn't already there -if ! getent passwd mysql >/dev/null; then - # Adding system user: mysql. - adduser \ - --system \ - --disabled-login \ - --ingroup mysql \ - --home $DATADIR \ - --gecos "MySQL Server" \ - --shell /bin/false \ - mysql >/dev/null -fi - -# end of NIS tolerance zone -set -e - -# if there's a symlink, let's store where it's pointing, because otherwise -# it's going to be lost in some situations -for dir in DATADIR LOGDIR; do - checkdir=`eval echo "$"$dir` - if [ -L "$checkdir" ]; then - mkdir -p "$UPGRADEDIR" - cp -d "$checkdir" "$UPGRADEDIR/$dir.link" - fi -done - -# creating mysql home directory -if [ ! -d $DATADIR -a ! -L $DATADIR ]; then - mkdir $DATADIR -fi - -# checking disc space -if LC_ALL=C BLOCKSIZE= df --portability $DATADIR/. | tail -n 1 | awk '{ exit ($4>1000) }'; then - echo "ERROR: There's not enough space in $DATADIR/" 1>&2 - db_stop - exit 1 -fi - -# Since the home directory was created before putting the user into -# the mysql group and moreover we cannot guarantee that the -# permissions were correctly *before* calling this script, we fix them now. -# In case we use NIS and no mysql user is present then this script should -# better fail now than later.. -# The "set +e" is necessary as e.g. a ".journal" of a ext3 partition is -# not chgrp'able (#318435). -set +e -chown mysql:mysql $DATADIR -find $DATADIR -follow -not -group mysql -print0 2>/dev/null \ - | xargs -0 --no-run-if-empty chgrp mysql -set -e - -# Some files below /etc/ were possibly in the mysql-server-5.0/etch package -# before. They get overwritten by current ones to avoid unnecessary dpkg questions. -while read md5 file; do - if [ "`md5sum $file 2>/dev/null`" = "$md5 $file" ]; then - cp /usr/share/mysql-common/internal-use-only/`echo $file | sed 's/_g'` $file - fi -done <<EOT -6691f2fdc5c6d27ff0260eb79813e1bc /etc/init.d/mysql -b53b9552d44661361d39157c3c7c51d3 /etc/logrotate.d/mysql-server -57f3e58f72582ca55100dc1ba0f1a8ae /etc/mysql/debian-start -EOT - -db_stop - -#DEBHELPER# - -exit 0 diff --git a/debian/mariadb-server-10.1.README.Debian b/debian/mariadb-server-10.2.README.Debian index be2e33d705d..be2e33d705d 100644 --- a/debian/mariadb-server-10.1.README.Debian +++ b/debian/mariadb-server-10.2.README.Debian diff --git a/debian/mariadb-server-10.1.config b/debian/mariadb-server-10.2.config index 162017caf71..44640f2a441 100644 --- a/debian/mariadb-server-10.1.config +++ b/debian/mariadb-server-10.2.config @@ -1,18 +1,17 @@ -#!/bin/bash -e +#!/bin/bash + +set -e . /usr/share/debconf/confmodule if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 } -CNF=/etc/mysql/my.cnf - # Beware that there are two ypwhich one of them needs the 2>/dev/null! if test -n "`which ypwhich 2>/dev/null`" && ypwhich >/dev/null 2>&1; then - db_input high mysql-server-5.1/nis_warning || true + db_input high mariadb-server-10.0/nis_warning || true db_go fi - # only ask this question on fresh installs, during "reconfiguration" and when # not upgrading from an existing 5.0 installation. # there is also an additional check for empty root passwords in the diff --git a/debian/mariadb-server-10.2.dirs b/debian/mariadb-server-10.2.dirs new file mode 100644 index 00000000000..5057fe806c3 --- /dev/null +++ b/debian/mariadb-server-10.2.dirs @@ -0,0 +1 @@ +var/lib/mysql-upgrade diff --git a/debian/mariadb-server-10.1.files.in b/debian/mariadb-server-10.2.install index cb935541186..d35fdf87b94 100644 --- a/debian/mariadb-server-10.1.files.in +++ b/debian/mariadb-server-10.2.install @@ -1,49 +1,31 @@ -usr/lib/mysql/plugin/auth_pam.so -usr/lib/mysql/plugin/auth_socket.so -usr/lib/mysql/plugin/disks.so -usr/lib/mysql/plugin/file_key_management.so -usr/lib/mysql/plugin/ha_archive.so -usr/lib/mysql/plugin/ha_blackhole.so -usr/lib/mysql/plugin/ha_federated.so -usr/lib/mysql/plugin/ha_federatedx.so -usr/lib/mysql/plugin/ha_innodb.so -usr/lib/mysql/plugin/ha_mroonga.so -usr/lib/mysql/plugin/ha_sphinx.so -usr/lib/mysql/plugin/handlersocket.so -usr/lib/mysql/plugin/locales.so -usr/lib/mysql/plugin/metadata_lock_info.so -usr/lib/mysql/plugin/query_cache_info.so -usr/lib/mysql/plugin/query_response_time.so -usr/lib/mysql/plugin/semisync_master.so -usr/lib/mysql/plugin/semisync_slave.so -usr/lib/mysql/plugin/server_audit.so -usr/lib/mysql/plugin/simple_password_check.so -usr/lib/mysql/plugin/sql_errlog.so -usr/lib/mysql/plugin/wsrep_info.so -usr/lib/libhsclient.so.* +debian/additions/debian-start etc/mysql +debian/additions/debian-start.inc.sh usr/share/mysql +debian/additions/echo_stderr usr/share/mysql +debian/additions/mysqld_safe_syslog.cnf etc/mysql/conf.d etc/apparmor.d/usr.sbin.mysqld -usr/share/apport/package-hooks/source_mariadb-10.1.py -etc/mysql/debian-start -etc/mysql/conf.d/mysqld_safe_syslog.cnf +etc/security/user_map.conf +lib/systemd/system/mariadb@bootstrap.service.d/use_galera_new_cluster.conf +lib/*/security/pam_user_map.so +usr/bin/aria_chk +usr/bin/aria_dump_log +usr/bin/aria_ftdump +usr/bin/aria_pack +usr/bin/aria_read_log +usr/bin/galera_new_cluster +usr/bin/galera_recovery +usr/bin/mariadb-service-convert usr/bin/msql2mysql usr/bin/my_print_defaults -usr/bin/myisamchk usr/bin/myisam_ftdump +usr/bin/myisamchk usr/bin/myisamlog usr/bin/myisampack -usr/bin/aria_pack -usr/bin/aria_read_log -usr/bin/aria_ftdump -usr/bin/aria_chk -usr/bin/aria_dump_log usr/bin/mysql_convert_table_format usr/bin/mysql_install_db usr/bin/mysql_plugin usr/bin/mysql_secure_installation usr/bin/mysql_setpermission usr/bin/mysql_tzinfo_to_sql -usr/bin/mysql_upgrade -usr/bin/mysql_zap usr/bin/mysqlbinlog usr/bin/mysqld_multi usr/bin/mysqld_safe @@ -59,44 +41,35 @@ usr/bin/wsrep_sst_rsync usr/bin/wsrep_sst_xtrabackup usr/bin/wsrep_sst_xtrabackup-v2 usr/bin/wsrep_sst_mariabackup -usr/share/doc/mariadb-server-10.1/mysqld.sym.gz -usr/share/doc/mariadb-server-10.1/INFO_SRC -usr/share/doc/mariadb-server-10.1/INFO_BIN -usr/share/man/man1/msql2mysql.1 -usr/share/man/man1/myisamchk.1 -usr/share/man/man1/myisam_ftdump.1 -usr/share/man/man1/myisamlog.1 -usr/share/man/man1/myisampack.1 -usr/share/man/man1/my_print_defaults.1 -usr/share/man/man1/mysqlbinlog.1 -usr/share/man/man1/mysql_convert_table_format.1 -usr/share/man/man1/mysqld_multi.1 -usr/share/man/man1/mysqld_safe.1 -usr/share/man/man1/mysqlhotcopy.1 -usr/share/man/man1/mysql_install_db.1 -usr/share/man/man1/mysql_secure_installation.1 -usr/share/man/man1/mysql_setpermission.1 -usr/share/man/man1/mysql_upgrade.1 -usr/share/man/man1/mysql_zap.1 -usr/share/man/man1/perror.1 -usr/share/man/man1/replace.1 -usr/share/man/man1/resolveip.1 -usr/share/man/man1/resolve_stack_dump.1 -usr/share/man/man1/innochecksum.1 -usr/share/man/man1/mysql_tzinfo_to_sql.1 -usr/share/mysql/debian-start.inc.sh -usr/share/mysql/echo_stderr +usr/lib/mysql/plugin/auth_ed25519.so +usr/lib/mysql/plugin/auth_pam.so +usr/lib/mysql/plugin/auth_socket.so +usr/lib/mysql/plugin/disks.so +usr/lib/mysql/plugin/file_key_management.so +usr/lib/mysql/plugin/ha_archive.so +usr/lib/mysql/plugin/ha_blackhole.so +usr/lib/mysql/plugin/ha_federated.so +usr/lib/mysql/plugin/ha_federatedx.so +usr/lib/mysql/plugin/ha_sphinx.so +usr/lib/mysql/plugin/handlersocket.so +usr/lib/mysql/plugin/locales.so +usr/lib/mysql/plugin/metadata_lock_info.so +usr/lib/mysql/plugin/query_cache_info.so +usr/lib/mysql/plugin/query_response_time.so +usr/lib/mysql/plugin/semisync_master.so +usr/lib/mysql/plugin/semisync_slave.so +usr/lib/mysql/plugin/server_audit.so +usr/lib/mysql/plugin/simple_password_check.so +usr/lib/mysql/plugin/sql_errlog.so +usr/lib/mysql/plugin/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/mysql/errmsg-utf8.txt usr/share/mysql/fill_help_tables.sql usr/share/mysql/maria_add_gis_sp_bootstrap.sql -usr/share/mysql/mroonga/install.sql -usr/share/mysql/mroonga/uninstall.sql -usr/share/mysql/mysql_system_tables_data.sql -usr/share/mysql/mysql_system_tables.sql usr/share/mysql/mysql_performance_tables.sql +usr/share/mysql/mysql_system_tables.sql +usr/share/mysql/mysql_system_tables_data.sql usr/share/mysql/mysql_test_data_timezone.sql +usr/share/mysql/mysql_test_db.sql usr/share/mysql/wsrep_notify -@CASSANDRA_DEB_FILES@ -@SPIDER_DEB_FILES@ -@TOKUDB_DEB_FILES@ -@SYSTEMD_DEB_FILES@ diff --git a/debian/mariadb-server-10.1.logcheck.ignore.paranoid b/debian/mariadb-server-10.2.logcheck.ignore.paranoid index 00cc5c3e29d..00cc5c3e29d 100644 --- a/debian/mariadb-server-10.1.logcheck.ignore.paranoid +++ b/debian/mariadb-server-10.2.logcheck.ignore.paranoid diff --git a/debian/mariadb-server-10.1.logcheck.ignore.server b/debian/mariadb-server-10.2.logcheck.ignore.server index 37f25cb01ea..a0b4792ecda 100644 --- a/debian/mariadb-server-10.1.logcheck.ignore.server +++ b/debian/mariadb-server-10.2.logcheck.ignore.server @@ -19,7 +19,7 @@ mysqld_safe\[[0-9]+\]: ended$ mysqld_safe\[[0-9]+\]: http://www.mysql.com$ mysqld_safe\[[0-9]+\]: NOTE: If you are upgrading from a MySQL <= 3.22.10 you should run$ mysqld_safe\[[0-9]+\]: PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !$ -mysqld_safe\[[0-9]+\]: Please report any problems with the /usr/bin/mysqlbug script!$ +mysqld_safe\[[0-9]+\]: Please report any problems at http://mariadb.org/jira$ mysqld_safe\[[0-9]+\]: See the manual for more instructions.$ mysqld_safe\[[0-9]+\]: started$ mysqld_safe\[[0-9]+\]: Support MySQL by buying support/licenses at https://order.mysql.com$ diff --git a/debian/mariadb-server-10.1.logcheck.ignore.workstation b/debian/mariadb-server-10.2.logcheck.ignore.workstation index 37f25cb01ea..a0b4792ecda 100644 --- a/debian/mariadb-server-10.1.logcheck.ignore.workstation +++ b/debian/mariadb-server-10.2.logcheck.ignore.workstation @@ -19,7 +19,7 @@ mysqld_safe\[[0-9]+\]: ended$ mysqld_safe\[[0-9]+\]: http://www.mysql.com$ mysqld_safe\[[0-9]+\]: NOTE: If you are upgrading from a MySQL <= 3.22.10 you should run$ mysqld_safe\[[0-9]+\]: PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !$ -mysqld_safe\[[0-9]+\]: Please report any problems with the /usr/bin/mysqlbug script!$ +mysqld_safe\[[0-9]+\]: Please report any problems at http://mariadb.org/jira$ mysqld_safe\[[0-9]+\]: See the manual for more instructions.$ mysqld_safe\[[0-9]+\]: started$ mysqld_safe\[[0-9]+\]: Support MySQL by buying support/licenses at https://order.mysql.com$ diff --git a/debian/mariadb-server-10.2.manpages b/debian/mariadb-server-10.2.manpages new file mode 100644 index 00000000000..1825b7655da --- /dev/null +++ b/debian/mariadb-server-10.2.manpages @@ -0,0 +1,25 @@ +debian/tmp/usr/share/man/man1/aria_chk.1 +debian/tmp/usr/share/man/man1/aria_dump_log.1 +debian/tmp/usr/share/man/man1/aria_ftdump.1 +debian/tmp/usr/share/man/man1/aria_pack.1 +debian/tmp/usr/share/man/man1/aria_read_log.1 +debian/tmp/usr/share/man/man1/msql2mysql.1 +debian/tmp/usr/share/man/man1/myisamchk.1 +debian/tmp/usr/share/man/man1/myisam_ftdump.1 +debian/tmp/usr/share/man/man1/myisamlog.1 +debian/tmp/usr/share/man/man1/myisampack.1 +debian/tmp/usr/share/man/man1/my_print_defaults.1 +debian/tmp/usr/share/man/man1/mysqlbinlog.1 +debian/tmp/usr/share/man/man1/mysql_convert_table_format.1 +debian/tmp/usr/share/man/man1/mysqld_multi.1 +debian/tmp/usr/share/man/man1/mysqld_safe.1 +debian/tmp/usr/share/man/man1/mysqlhotcopy.1 +debian/tmp/usr/share/man/man1/mysql_install_db.1 +debian/tmp/usr/share/man/man1/mysql_plugin.1 +debian/tmp/usr/share/man/man1/mysql_secure_installation.1 +debian/tmp/usr/share/man/man1/mysql_setpermission.1 +debian/tmp/usr/share/man/man1/mysql_tzinfo_to_sql.1 +debian/tmp/usr/share/man/man1/perror.1 +debian/tmp/usr/share/man/man1/replace.1 +debian/tmp/usr/share/man/man1/resolveip.1 +debian/tmp/usr/share/man/man1/resolve_stack_dump.1 diff --git a/debian/mariadb-server-10.1.mysql-server.logrotate b/debian/mariadb-server-10.2.mysql-server.logrotate index dbe2a7e7dfe..4111a276dc3 100644 --- a/debian/mariadb-server-10.1.mysql-server.logrotate +++ b/debian/mariadb-server-10.2.mysql-server.logrotate @@ -1,8 +1,8 @@ -# - I put everything in one block and added sharedscripts, so that mysql gets +# - I put everything in one block and added sharedscripts, so that mysql gets # flush-logs'd only once. # Else the binary logs would automatically increase by n times every day. # - The error log is obsolete, messages go to syslog now. -/var/log/mysql.log /var/log/mysql/mysql.log /var/log/mysql/mariadb-slow.log { +/var/log/mysql/mysql.log /var/log/mysql/mysql-slow.log /var/log/mysql/mariadb-slow.log /var/log/mysql/error.log { daily rotate 7 missingok @@ -11,7 +11,6 @@ sharedscripts postrotate test -x /usr/bin/mysqladmin || exit 0 - if [ -f `my_print_defaults --mysqld | grep -oP "pid-file=\K[^$]+"` ]; then # If this fails, check debian.conf! mysqladmin --defaults-file=/etc/mysql/debian.cnf --local flush-error-log \ diff --git a/debian/mariadb-server-10.2.mysql.default b/debian/mariadb-server-10.2.mysql.default new file mode 100644 index 00000000000..22f08e54427 --- /dev/null +++ b/debian/mariadb-server-10.2.mysql.default @@ -0,0 +1,8 @@ +# The delay in seconds the init script waits for the server to be up and running after having started "mysqld_safe" to run the "/etc/mysql/debian-start" script. +# If the server is still not responding after the delay, the script won't be executed and an error will be thrown on the syslog. +# Default: 30 +#MYSQLD_STARTUP_TIMEOUT=30 + +# The email recipient(s) of the output of the check for crashed and improperly closed MyISAM and Aria tables done at each server start by the "/etc/mysql/debian-start" script. +# Default: root +#MYCHECK_RCPT="root" diff --git a/debian/mariadb-server-10.2.mysql.init b/debian/mariadb-server-10.2.mysql.init new file mode 100644 index 00000000000..0d8128cb7d3 --- /dev/null +++ b/debian/mariadb-server-10.2.mysql.init @@ -0,0 +1,193 @@ +#!/bin/bash +# +### BEGIN INIT INFO +# Provides: mysql +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Should-Start: $network $named $time +# Should-Stop: $network $named $time +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start and stop the mysql database server daemon +# Description: Controls the main MariaDB database server daemon "mysqld" +# and its wrapper script "mysqld_safe". +### END INIT INFO +# +set -e +set -u +${DEBIAN_SCRIPT_DEBUG:+ set -v -x} + +test -x /usr/sbin/mysqld || exit 0 + +. /lib/lsb/init-functions + +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 +ERR_LOGGER="logger -p daemon.err -t /etc/init.d/mysql -i" + +if [ -f /etc/default/mysql ]; then + . /etc/default/mysql +fi + +# Safeguard (relative paths, core dumps..) +cd / +umask 077 + +# mysqladmin likes to read /root/.my.cnf. This is usually not what I want +# as many admins e.g. only store a password without a username there and +# so break my scripts. +export HOME=/etc/mysql/ + +## Fetch a particular option from mysql's invocation. +# +# Usage: void mysqld_get_param option +mysqld_get_param() { + /usr/sbin/mysqld --print-defaults \ + | tr " " "\n" \ + | grep -- "--$1" \ + | tail -n 1 \ + | cut -d= -f2 +} + +## Do some sanity checks before even trying to start mysqld. +sanity_checks() { + # check for config file + if [ ! -r /etc/mysql/my.cnf ]; then + log_warning_msg "$0: WARNING: /etc/mysql/my.cnf cannot be read. See README.Debian.gz" + echo "WARNING: /etc/mysql/my.cnf cannot be read. See README.Debian.gz" | $ERR_LOGGER + fi + + # check for diskspace shortage + datadir=`mysqld_get_param datadir` + if LC_ALL=C BLOCKSIZE= df --portability $datadir/. | tail -n 1 | awk '{ exit ($4>4096) }'; then + log_failure_msg "$0: ERROR: The partition with $datadir is too full!" + echo "ERROR: The partition with $datadir is too full!" | $ERR_LOGGER + exit 1 + fi +} + +## Checks if there is a server running and if so if it is accessible. +# +# check_alive insists on a pingable server +# check_dead also fails if there is a lost mysqld in the process list +# +# Usage: boolean mysqld_status [check_alive|check_dead] [warn|nowarn] +mysqld_status () { + ping_output=`$MYADMIN ping 2>&1`; ping_alive=$(( ! $? )) + + ps_alive=0 + pidfile=`mysqld_get_param pid-file` + if [ -f "$pidfile" ] && ps `cat $pidfile` >/dev/null 2>&1; then ps_alive=1; fi + + if [ "$1" = "check_alive" -a $ping_alive = 1 ] || + [ "$1" = "check_dead" -a $ping_alive = 0 -a $ps_alive = 0 ]; then + return 0 # EXIT_SUCCESS + else + if [ "$2" = "warn" ]; then + echo -e "$ps_alive processes alive and '$MYADMIN ping' resulted in\n$ping_output\n" | $ERR_LOGGER -p daemon.debug + fi + return 1 # EXIT_FAILURE + fi +} + +# +# main() +# + +case "${1:-''}" in + + 'start') + sanity_checks; + # Start daemon + log_daemon_msg "Starting MariaDB database server" "mysqld" + if mysqld_status check_alive nowarn; then + log_progress_msg "already running" + log_end_msg 0 + else + # Could be removed during boot + test -e /var/run/mysqld || install -m 755 -o mysql -g root -d /var/run/mysqld + + # Start MariaDB! + /usr/bin/mysqld_safe "${@:2}" 2>&1 >/dev/null | $ERR_LOGGER & + + for i in $(seq 1 "${MYSQLD_STARTUP_TIMEOUT:-30}"); do + sleep 1 + if mysqld_status check_alive nowarn ; then break; fi + log_progress_msg "." + done + if mysqld_status check_alive warn; then + log_end_msg 0 + # Now start mysqlcheck or whatever the admin wants. + output=$(/etc/mysql/debian-start) + if [ -n "$output" ]; then + log_action_msg "$output" + fi + else + log_end_msg 1 + log_failure_msg "Please take a look at the syslog" + fi + fi + ;; + + 'stop') + # * As a passwordless mysqladmin (e.g. via ~/.my.cnf) must be possible + # at least for cron, we can rely on it here, too. (although we have + # to specify it explicit as e.g. sudo environments points to the normal + # users home and not /root) + log_daemon_msg "Stopping MariaDB database server" "mysqld" + if ! mysqld_status check_dead nowarn; then + set +e + shutdown_out=`$MYADMIN shutdown 2>&1`; r=$? + set -e + if [ "$r" -ne 0 ]; then + log_end_msg 1 + [ "$VERBOSE" != "no" ] && log_failure_msg "Error: $shutdown_out" + log_daemon_msg "Killing MariaDB database server by signal" "mysqld" + killall -15 mysqld + server_down= + for i in `seq 1 600`; do + sleep 1 + if mysqld_status check_dead nowarn; then server_down=1; break; fi + done + if test -z "$server_down"; then killall -9 mysqld; fi + fi + fi + + if ! mysqld_status check_dead warn; then + log_end_msg 1 + log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-10.2/README.Debian.gz!" + exit -1 + else + log_end_msg 0 + fi + ;; + + 'restart') + set +e; $SELF stop; set -e + shift + $SELF start "${@}" + ;; + + 'reload'|'force-reload') + log_daemon_msg "Reloading MariaDB database server" "mysqld" + $MYADMIN reload + log_end_msg 0 + ;; + + 'status') + if mysqld_status check_alive nowarn; then + log_action_msg "$($MYADMIN version)" + else + log_action_msg "MariaDB is stopped." + exit 3 + fi + ;; + + *) + echo "Usage: $SELF start|stop|restart|reload|force-reload|status" + exit 1 + ;; +esac diff --git a/debian/mariadb-server-10.1.postinst b/debian/mariadb-server-10.2.postinst index 2a92cbe81db..063f0d8c58b 100644 --- a/debian/mariadb-server-10.1.postinst +++ b/debian/mariadb-server-10.2.postinst @@ -53,85 +53,100 @@ EOF return $retval } -# This is necessary because mysql_install_db removes the pid file in /var/run -# and because changed configuration options should take effect immediately. -# In case the server wasn't running at all it should be ok if the stop -# script fails. I can't tell at this point because of the cleaned /var/run. -set +e; invoke stop; set -e - case "$1" in configure) - mysql_datadir=/usr/share/mysql - mysql_statedir=/var/lib/mysql + # This is needed because mysql_install_db removes the pid file in /var/run + # and because changed configuration options should take effect immediately. + # In case the server wasn't running at all it should be ok if the stop + # script fails. I can't tell at this point because of the cleaned /var/run. + set +e; invoke stop; set -e + + mysql_statedir=/usr/share/mysql + mysql_datadir=/var/lib/mysql + mysql_logdir=/var/log/mysql mysql_rundir=/var/run/mysqld - mysql_logdir=/var/log mysql_cfgdir=/etc/mysql - mysql_newlogdir=/var/log/mysql mysql_upgradedir=/var/lib/mysql-upgrade - # first things first, if the following symlink exists, it is a preserved - # copy the old data dir from a mysql upgrade that would have otherwise - # been replaced by an empty mysql dir. this should restore it. + # If the following symlink exists, it is a preserved copy the old data dir + # created by the preinst script during a upgrade that would have otherwise + # been replaced by an empty mysql dir. This should restore it. for dir in DATADIR LOGDIR; do - if [ "$dir" = "DATADIR" ]; then targetdir=$mysql_statedir; else targetdir=$mysql_newlogdir; fi - savelink="$mysql_upgradedir/$dir.link" - if [ -L "$savelink" ]; then - # If the targetdir was a symlink before we upgraded it is supposed - # to be either still be present or not existing anymore now. - if [ -L "$targetdir" ]; then - rm "$savelink" - elif [ ! -d "$targetdir" ]; then - mv "$savelink" "$targetdir" - else - # this should never even happen, but just in case... - mysql_tmp=`mktemp -d -t mysql-symlink-restore-XXXXXX` - echo "this is very strange! see $mysql_tmp/README..." >&2 - mv "$targetdir" "$mysql_tmp" - cat << EOF > "$mysql_tmp/README" - -if you're reading this, it's most likely because you had replaced /var/lib/mysql + + if [ "$dir" = "DATADIR" ]; then + targetdir=$mysql_datadir + else + targetdir=$mysql_logdir + fi + + savelink="$mysql_upgradedir/$dir.link" + if [ -L "$savelink" ]; then + # If the targetdir was a symlink before we upgraded it is supposed + # to be either still be present or not existing anymore now. + if [ -L "$targetdir" ]; then + rm "$savelink" + elif [ ! -d "$targetdir" ]; then + mv "$savelink" "$targetdir" + else + # this should never even happen, but just in case... + mysql_tmp=`mktemp -d -t mysql-symlink-restore-XXXXXX` + echo "this is very strange! see $mysql_tmp/README..." >&2 + mv "$targetdir" "$mysql_tmp" + cat << EOF > "$mysql_tmp/README" + +If you're reading this, it's most likely because you had replaced /var/lib/mysql with a symlink, then upgraded to a new version of mysql, and then dpkg -removed your symlink (see #182747 and others). the mysql packages noticed -that this happened, and as a workaround have restored it. however, because +removed your symlink (see #182747 and others). The mysql packages noticed +that this happened, and as a workaround have restored it. However, because /var/lib/mysql seems to have been re-created in the meantime, and because -we don't want to rm -rf something we don't know as much about, we're going -to leave this unexpected directory here. if your database looks normal, +we don't want to rm -rf something we don't know as much about, we are going +to leave this unexpected directory here. If your database looks normal, and this is not a symlink to your database, you should be able to blow this all away. EOF - fi fi - rmdir $mysql_upgradedir 2>/dev/null || true + fi + rmdir $mysql_upgradedir 2>/dev/null || true + done - + # Ensure the existence and right permissions for the database and # log files. - if [ ! -d "$mysql_statedir/mysql" -a ! -L "$mysql_statedir/mysql" ]; then - # Debian: beware of the bashisms... - /bin/bash /usr/bin/mysql_install_db --rpm --user=mysql --disable-log-bin 2>&1 | $ERR_LOGGER - fi - if [ ! -d "$mysql_newlogdir" -a ! -L "$mysql_newlogdir" ]; then mkdir "$mysql_newlogdir"; fi + if [ ! -d "$mysql_statedir" -a ! -L "$mysql_statedir" ]; then mkdir "$mysql_statedir"; fi + if [ ! -d "$mysql_datadir" -a ! -L "$mysql_datadir" ]; then mkdir "$mysql_datadir" ; fi + if [ ! -d "$mysql_logdir" -a ! -L "$mysql_logdir" ]; then mkdir "$mysql_logdir" ; fi # When creating an ext3 jounal on an already mounted filesystem like e.g. # /var/lib/mysql, you get a .journal file that is not modifyable by chown. - # The mysql_datadir must not be writable by the mysql user under any + # The mysql_statedir must not be writable by the mysql user under any # circumstances as it contains scripts that are executed by root. set +e - chown -R 0:0 $mysql_datadir - chown -R mysql $mysql_statedir - chown -R mysql $mysql_rundir - chown -R mysql:adm $mysql_newlogdir; chmod 2750 $mysql_newlogdir; - for i in log err; do - touch $mysql_logdir/mysql.$i - chown mysql:adm $mysql_logdir/mysql.$i - chmod 0640 $mysql_logdir/mysql.$i - done + chown -R 0:0 $mysql_statedir + find $mysql_datadir ! -uid $(id -u mysql) -print0 | xargs -0 -r chown mysql + chown -R mysql:adm $mysql_logdir + chmod 2750 $mysql_logdir set -e # This is important to avoid dataloss when there is a removed # mysql-server version from Woody lying around which used the same # data directory and then somewhen gets purged by the admin. - db_set mysql-server/postrm_remove_database false || true + db_set mariadb-server/postrm_remove_database false || true + + # Clean up old flags before setting new one + rm -f $mysql_datadir/debian-*.flag + # Flag data dir to avoid downgrades + touch $mysql_datadir/debian-10.2.flag + + # initiate databases. Output is not allowed by debconf :-( + # This will fail if we are upgrading an existing database; in this case + # mysql_upgrade, called from the /etc/init.d/mysql start script, will + # handle things. + # Debian: beware of the bashisms... + # Debian: can safely run on upgrades with existing databases + set +e + bash /usr/bin/mysql_install_db --rpm --cross-bootstrap --user=mysql --disable-log-bin 2>&1 | $ERR_LOGGER + set -e + # To avoid downgrades. touch $mysql_statedir/debian-$MAJOR_VER.flag @@ -154,7 +169,7 @@ EOF # the old query which always succeeds and then the new which may or may not. # recreate the credentials file if not present or without mysql_upgrade stanza - dc=$mysql_cfgdir/debian.cnf; + dc=$mysql_cfgdir/debian.cnf; if [ -e "$dc" -a -n "`fgrep mysql_upgrade $dc 2>/dev/null`" ]; then pass="`sed -n 's/^[ ]*password *= *// p' $dc | head -n 1`" else @@ -231,6 +246,13 @@ EOF abort-upgrade|abort-remove|abort-configure) ;; + triggered) + if [ -x "$(command -v systemctl)" ]; then + systemctl daemon-reload + fi + invoke restart + ;; + *) echo "postinst called with unknown argument '$1'" 1>&2 exit 1 diff --git a/debian/mariadb-server-10.1.postrm b/debian/mariadb-server-10.2.postrm index 7cee5150ef9..f8a95df54ea 100644 --- a/debian/mariadb-server-10.1.postrm +++ b/debian/mariadb-server-10.2.postrm @@ -1,9 +1,6 @@ #!/bin/bash -e -# It is possible that Debconf has already been removed, too. -if [ -f /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule -fi +. /usr/share/debconf/confmodule if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 } @@ -46,41 +43,36 @@ esac # # - Do NOT purge logs or data if another mysql-sever* package is installed (#307473) # - Remove the mysql user only after all his owned files are purged. -# +# if [ "$1" = "purge" -a ! \( -x /usr/sbin/mysqld -o -L /usr/sbin/mysqld \) ]; then # we remove the mysql user only after all his owned files are purged rm -f /var/log/mysql.{log,err}{,.0,.[1234567].gz} rm -rf /var/log/mysql - db_input high mysql-server-5.1/postrm_remove_databases || true + db_input high mariadb-server-10.2/postrm_remove_databases || true db_go || true - db_get mysql-server-5.1/postrm_remove_databases || true + db_get mariadb-server-10.2/postrm_remove_databases || true if [ "$RET" = "true" ]; then # never remove the debian.cnf when the databases are still existing # else we ran into big trouble on the next install! rm -f /etc/mysql/debian.cnf - rm -rf /var/lib/mysql - rm -rf /var/run/mysqld + # Remove all contents from /var/lib/mysql except if it's a + # directory with file system data. See #829491 for details and + # #608938 for potential mysql-server leftovers which erroneously + # had been renamed. + find /var/lib/mysql -mindepth 1 \ + -not -path '*/lost+found/*' -not -name 'lost+found' \ + -not -path '*/lost@002bfound/*' -not -name 'lost@002bfound' \ + -delete + # "|| true" still needed as rmdir still exits with non-zero if + # /var/lib/mysql is a mount point + rmdir --ignore-fail-on-non-empty /var/lib/mysql || true + rm -rf /var/run/mysqld # this directory is created by the init script, don't leave behind userdel mysql || true fi - # (normally) Automatically added by dh_installinit - if [ "$1" = "purge" ] ; then - update-rc.d mysql remove >/dev/null || exit 0 - fi - # (normally) End automatically added section -fi - -# (normally) Automatically added by dh_installdebconf -if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule - db_purge fi -# (normally) End automatically added section -if [ "$1" = "purge" ] ; then - rm -f /etc/apparmor.d/force-complain/usr.sbin.mysqld >/dev/null 2>&1 || true -fi -# no DEBHELPER here, "update-rc.d remove" fails if mysql-server-5.1 is installed +#DEBHELPER# exit 0 diff --git a/debian/mariadb-server-10.2.preinst b/debian/mariadb-server-10.2.preinst new file mode 100644 index 00000000000..161d9caee6e --- /dev/null +++ b/debian/mariadb-server-10.2.preinst @@ -0,0 +1,212 @@ +#!/bin/bash -e +# +# summary of how this script can be called: +# * <new-preinst> install +# * <new-preinst> install <old-version> +# * <new-preinst> upgrade <old-version> +# * <old-preinst> abort-upgrade <new-version> +# + +. /usr/share/debconf/confmodule + +if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi +${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 } + +export PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin +MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf" +mysql_datadir=/var/lib/mysql +mysql_upgradedir=/var/lib/mysql-upgrade + +# Try to stop the server in a sane way. If it does not success let the admin +# do it himself. No database directories should be removed while the server +# is running! Another mysqld in e.g. a different chroot is fine for us. +stop_server() { + if [ ! -x /etc/init.d/mysql ]; then return; fi + + # Return immediately if there are no mysql processes running + # as there is no point in trying to shutdown in that case. + if ! pgrep --ns $$ mysqld > /dev/null; then return; fi + + set +e + if [ -x /usr/sbin/invoke-rc.d ]; then + cmd="invoke-rc.d mysql stop" + else + cmd="/etc/init.d/mysql stop" + fi + $cmd + errno=$? + set -e + + # 0=ok, 100=no init script (fresh install) + if [ "$errno" != 0 -a "$errno" != 100 ]; then + echo "${cmd/ */} returned $errno" 1>&2 + echo "There is a MySQL server running, but we failed in our attempts to stop it." 1>&2 + echo "Stop it yourself and try again!" 1>&2 + db_stop + exit 1 + fi +} + +################################ main() ########################## + +this_version=10.2 +max_upgradeable_version=5.7 + +# Check if a flag file is found that indicates a previous MariaDB or MySQL +# version was installed. If multiple flags are found, check which one was +# the biggest version number. +for flag in $mysql_datadir/debian-*.flag +do + + # The for loop leaves $flag as the query string if there are no results, + # so the check below is needed to stop further processing when there are + # no real results. + if [ $flag = "$mysql_datadir/debian-*.flag" ] + then + break + fi + + flag_version=`echo $flag | sed 's/.*debian-\([0-9\.]\+\).flag/\1/'` + + # Initialize value if empty + if [ -z "$found_version" ] + then + found_version=$flag_version + fi + + # Update value if now bigger then before + if dpkg --compare-versions "$flag_version" '>>' "$found_version" + then + found_version=$flag_version + fi + +done + + +# If an upgrade is detected, proceed with it automatically without +# requiring any user interaction. +# +# However, if the user attempts to downgrade, warn about the incompatibility. +# Downgrade is detected if the flag version is bigger than $this_version +# (e.g. 10.1 > 10.0) or the flag version is smaller than 10.0 but bigger +# than $max_upgradeable_version. +if [ ! -z "$found_version" ] +then + + echo "$mysql_datadir: found previous version $found_version" + + if dpkg --compare-versions "$found_version" '>>' "$this_version" + then + downgrade_detected=true + fi + + if dpkg --compare-versions "$found_version" '>>' "$max_upgradeable_version" \ + && dpkg --compare-versions "$found_version" '<<' "10.0" + then + downgrade_detected=true + fi + +fi + + +# Don't abort dpkg if downgrade is detected (as was done previously). +# Instead simply move the old datadir and create a new for this_version. +if [ ! -z "$downgrade_detected" ] +then + db_input critical mariadb-server-10.2/old_data_directory_saved || true + db_go + echo "The file $mysql_datadir/debian-$found_version.flag indicates a" 1>&2 + echo "version that cannot automatically be upgraded. Therefore the" 1>&2 + echo "previous data directory will be renamed to $mysql_datadir-$found_version and" 1>&2 + echo "a new data directory will be initialized at $mysql_datadir." 1>&2 + echo "Please manually export/import your data (e.g. with mysqldump) if needed." 1>&2 + mv -f $mysql_datadir $mysql_datadir-$found_version + # Also move away the old debian.cnf file that included credentials that are + # no longer valid + mv -f /etc/mysql/debian.cnf /etc/mysql/debian.cnf-$found_version +fi + +# to be sure +stop_server + +# If we use NIS then errors should be tolerated. It's up to the +# user to ensure that the mysql user is correctly setup. +# Beware that there are two ypwhich one of them needs the 2>/dev/null! +if test -n "`which ypwhich 2>/dev/null`" && ypwhich >/dev/null 2>&1; then + set +e +fi + +# +# Now we have to ensure the following state: +# /etc/passwd: mysql:x:100:101:MySQL Server:/nonexistent:/bin/false +# /etc/group: mysql:x:101: +# +# Sadly there could any state be present on the system so we have to +# modify everything carefully i.e. not doing a chown before creating +# the user etc... +# + +# creating mysql group if he isn't already there +if ! getent group mysql >/dev/null; then + # Adding system group: mysql. + addgroup --system mysql >/dev/null +fi + +# creating mysql user if he isn't already there +if ! getent passwd mysql >/dev/null; then + # Adding system user: mysql. + adduser \ + --system \ + --disabled-login \ + --ingroup mysql \ + --no-create-home \ + --home /nonexistent \ + --gecos "MySQL Server" \ + --shell /bin/false \ + mysql >/dev/null +fi + +# end of NIS tolerance zone +set -e + +# if there's a symlink, let's store where it's pointing, because otherwise +# it's going to be lost in some situations +for dir in DATADIR LOGDIR; do + checkdir=`eval echo "$"$dir` + if [ -L "$checkdir" ]; then + mkdir -p "$mysql_upgradedir" + cp -dT "$checkdir" "$mysql_upgradedir/$dir.link" + fi +done + +# creating mysql home directory +if [ ! -d $mysql_datadir -a ! -L $mysql_datadir ]; then + mkdir $mysql_datadir +fi + +# checking disc space +if LC_ALL=C BLOCKSIZE= df --portability $mysql_datadir/. | tail -n 1 | awk '{ exit ($4>1000) }'; then + echo "ERROR: There's not enough space in $mysql_datadir/" 1>&2 + db_stop + exit 1 +fi + +# Since the home directory was created before putting the user into +# the mysql group and moreover we cannot guarantee that the +# permissions were correctly *before* calling this script, we fix them now. +# In case we use NIS and no mysql user is present then this script should +# better fail now than later.. +# The "set +e" is necessary as e.g. a ".journal" of a ext3 partition is +# not chgrp'able (#318435). +set +e +find $mysql_datadir ! -uid $(id -u mysql) -print0 | xargs -0 -r chown mysql +find $mysql_datadir -follow -not -group mysql -print0 2>/dev/null \ + | xargs -0 --no-run-if-empty chgrp mysql +set -e + + +db_stop + +#DEBHELPER# + +exit 0 diff --git a/debian/mariadb-server-10.1.prerm b/debian/mariadb-server-10.2.prerm index 03e9ea37420..0371bbfc844 100644 --- a/debian/mariadb-server-10.1.prerm +++ b/debian/mariadb-server-10.2.prerm @@ -1,4 +1,6 @@ -#!/bin/bash -e +#!/bin/bash + +set -e . /usr/share/debconf/confmodule diff --git a/debian/mariadb-server-10.1.py b/debian/mariadb-server-10.2.py index fe5029d056c..7881029a24c 100644 --- a/debian/mariadb-server-10.1.py +++ b/debian/mariadb-server-10.2.py @@ -1,4 +1,4 @@ -'''apport package hook for mariadb-10.1 +'''apport package hook for mariadb-10.2 (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.1', conffiles=None) + attach_conffiles(report, 'mariadb-server-10.2', 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.1.templates b/debian/mariadb-server-10.2.templates index f64dd02d7bd..dd30daed90d 100644 --- a/debian/mariadb-server-10.1.templates +++ b/debian/mariadb-server-10.2.templates @@ -7,19 +7,19 @@ # Even minor modifications require translation updates and such # changes should be coordinated with translators and reviewers. -Template: mariadb-server-10.1/really_downgrade -Type: boolean -Default: false -_Description: Really proceed with downgrade? +Template: mariadb-server-10.2/old_data_directory_saved +Type: note +_Description: The old data directory will be saved at new location A file named /var/lib/mysql/debian-*.flag exists on this system. + The number indicates a database binary format version that cannot automatically + be upgraded (or downgraded). . - Such a file is an indication that a mariadb-server package with a higher - version has been installed previously. + Therefore the previous data directory will be renamed to /var/lib/mysql-* and + a new data directory will be initialized at /var/lib/mysql. . - There is no guarantee that the version you're currently installing - will be able to use the current databases. + Please manually export/import your data (e.g. with mysqldump) if needed. -Template: mysql-server-5.1/nis_warning +Template: mariadb-server-10.2/nis_warning Type: note #flag:translate!:3,5 _Description: Important note for NIS/YP users @@ -33,7 +33,7 @@ _Description: Important note for NIS/YP users . /var/lib/mysql: drwxr-xr-x mysql mysql -Template: mysql-server-5.1/postrm_remove_databases +Template: mariadb-server-10.2/postrm_remove_databases Type: boolean Default: false _Description: Remove all MariaDB databases? @@ -44,13 +44,6 @@ _Description: Remove all MariaDB databases? recent version or if a different mariadb-server package is already using it, the data should be kept. -Template: mysql-server-5.1/start_on_boot -Type: boolean -Default: true -_Description: Start the MariaDB server on boot? - The MariaDB server can be launched automatically at boot time or manually - with the '/etc/init.d/mysql start' command. - Template: mysql-server/root_password Type: password _Description: New password for the MariaDB "root" user: @@ -73,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.1/README.Debian file + Please read the /usr/share/doc/mariadb-server-10.2/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.2.triggers new file mode 100644 index 00000000000..d1f5f5e14f1 --- /dev/null +++ b/debian/mariadb-server-10.2.triggers @@ -0,0 +1,2 @@ +interest-noawait /etc/mysql +interest-noawait /etc/systemd/system/mariadb.service.d diff --git a/debian/mariadb-server-core-10.1.files b/debian/mariadb-server-core-10.2.install index 5c60ca5ec67..d882bd53f52 100644 --- a/debian/mariadb-server-core-10.1.files +++ b/debian/mariadb-server-core-10.2.install @@ -1,5 +1,6 @@ +usr/bin/innochecksum +usr/bin/mysql_upgrade usr/sbin/mysqld -usr/share/man/man8/mysqld.8 usr/share/mysql/charsets usr/share/mysql/czech usr/share/mysql/danish @@ -9,6 +10,7 @@ usr/share/mysql/estonian usr/share/mysql/french usr/share/mysql/german usr/share/mysql/greek +usr/share/mysql/hindi usr/share/mysql/hungarian usr/share/mysql/italian usr/share/mysql/japanese diff --git a/debian/mariadb-server-core-10.2.manpages b/debian/mariadb-server-core-10.2.manpages new file mode 100644 index 00000000000..234108cde50 --- /dev/null +++ b/debian/mariadb-server-core-10.2.manpages @@ -0,0 +1,3 @@ +debian/tmp/usr/share/man/man8/mysqld.8 +debian/tmp/usr/share/man/man1/innochecksum.1 +debian/tmp/usr/share/man/man1/mysql_upgrade.1 diff --git a/debian/mariadb-test-10.1.dirs b/debian/mariadb-test-10.1.dirs deleted file mode 100644 index b21c5b780f7..00000000000 --- a/debian/mariadb-test-10.1.dirs +++ /dev/null @@ -1,80 +0,0 @@ -usr/bin -usr/share/man/man1 -usr/share/mysql/mysql-test -usr/share/mysql/mysql-test/extra -usr/share/mysql/mysql-test/extra/binlog_tests -usr/share/mysql/mysql-test/extra/rpl_tests -usr/share/mysql/mysql-test/lib -usr/share/mysql/mysql-test/lib/My -usr/share/mysql/mysql-test/lib/My/SafeProcess -usr/share/mysql/mysql-test/lib/My/File -usr/share/mysql/mysql-test/lib/v1 -usr/share/mysql/mysql-test/lib/v1/My -usr/share/mysql/mysql-test/collections -usr/share/mysql/mysql-test/t -usr/share/mysql/mysql-test/r -usr/share/mysql/mysql-test/include -usr/share/mysql/mysql-test/suite -usr/share/mysql/mysql-test/suite/parts -usr/share/mysql/mysql-test/suite/parts/inc -usr/share/mysql/mysql-test/suite/parts/t -usr/share/mysql/mysql-test/suite/parts/r -usr/share/mysql/mysql-test/suite/bugs -usr/share/mysql/mysql-test/suite/bugs/t -usr/share/mysql/mysql-test/suite/bugs/r -usr/share/mysql/mysql-test/suite/bugs/data -usr/share/mysql/mysql-test/suite/rpl -usr/share/mysql/mysql-test/suite/rpl/t -usr/share/mysql/mysql-test/suite/rpl/r -usr/share/mysql/mysql-test/suite/rpl/include -usr/share/mysql/mysql-test/suite/innodb -usr/share/mysql/mysql-test/suite/innodb/t -usr/share/mysql/mysql-test/suite/innodb/r -usr/share/mysql/mysql-test/suite/innodb/include -usr/share/mysql/mysql-test/suite/manual -usr/share/mysql/mysql-test/suite/manual/t -usr/share/mysql/mysql-test/suite/manual/r -usr/share/mysql/mysql-test/suite/stress -usr/share/mysql/mysql-test/suite/stress/t -usr/share/mysql/mysql-test/suite/stress/r -usr/share/mysql/mysql-test/suite/stress/include -usr/share/mysql/mysql-test/suite/jp -usr/share/mysql/mysql-test/suite/jp/t -usr/share/mysql/mysql-test/suite/jp/r -usr/share/mysql/mysql-test/suite/jp/include -usr/share/mysql/mysql-test/suite/jp/std_data -usr/share/mysql/mysql-test/suite/maria -usr/share/mysql/mysql-test/suite/funcs_2 -usr/share/mysql/mysql-test/suite/funcs_2/lib -usr/share/mysql/mysql-test/suite/funcs_2/t -usr/share/mysql/mysql-test/suite/funcs_2/charset -usr/share/mysql/mysql-test/suite/funcs_2/r -usr/share/mysql/mysql-test/suite/funcs_2/include -usr/share/mysql/mysql-test/suite/funcs_2/data -usr/share/mysql/mysql-test/suite/binlog -usr/share/mysql/mysql-test/suite/binlog/t -usr/share/mysql/mysql-test/suite/binlog/r -usr/share/mysql/mysql-test/suite/binlog/std_data -usr/share/mysql/mysql-test/suite/federated -usr/share/mysql/mysql-test/suite/funcs_1 -usr/share/mysql/mysql-test/suite/funcs_1/cursors -usr/share/mysql/mysql-test/suite/funcs_1/bitdata -usr/share/mysql/mysql-test/suite/funcs_1/views -usr/share/mysql/mysql-test/suite/funcs_1/storedproc -usr/share/mysql/mysql-test/suite/funcs_1/triggers -usr/share/mysql/mysql-test/suite/funcs_1/lib -usr/share/mysql/mysql-test/suite/funcs_1/t -usr/share/mysql/mysql-test/suite/funcs_1/r -usr/share/mysql/mysql-test/suite/funcs_1/include -usr/share/mysql/mysql-test/suite/funcs_1/datadict -usr/share/mysql/mysql-test/suite/vcol -usr/share/mysql/mysql-test/suite/vcol/inc -usr/share/mysql/mysql-test/suite/vcol/t -usr/share/mysql/mysql-test/suite/vcol/r -usr/share/mysql/mysql-test/suite/oqgraph -usr/share/mysql/mysql-test/suite/oqgraph/t -usr/share/mysql/mysql-test/suite/oqgraph/r -usr/share/mysql/mysql-test/suite/oqgraph/include -usr/share/mysql/mysql-test/std_data -usr/share/mysql/mysql-test/std_data/parts -usr/share/mysql/mysql-test/std_data/funcs_1 diff --git a/debian/mariadb-test-data.install b/debian/mariadb-test-data.install new file mode 100644 index 00000000000..3cd11e1aea9 --- /dev/null +++ b/debian/mariadb-test-data.install @@ -0,0 +1,9 @@ +usr/share/mysql/mysql-test/collections +usr/share/mysql/mysql-test/extra +usr/share/mysql/mysql-test/include +usr/share/mysql/mysql-test/plugin +usr/share/mysql/mysql-test/r +usr/share/mysql/mysql-test/std_data +usr/share/mysql/mysql-test/suite +usr/share/mysql/mysql-test/t +usr/share/mysql/mysql-test/unstable-tests diff --git a/debian/mariadb-test-10.1.files b/debian/mariadb-test.install index dbb551a9407..605620dc28c 100644 --- a/debian/mariadb-test-10.1.files +++ b/debian/mariadb-test.install @@ -1,23 +1,28 @@ +usr/bin/mysql_client_test +usr/bin/mysql_client_test_embedded +usr/bin/mysqltest +usr/bin/mysqltest_embedded +usr/lib/mysql/plugin/adt_null.so +usr/lib/mysql/plugin/auth_0x0100.so +usr/lib/mysql/plugin/auth_test_plugin.so +usr/lib/mysql/plugin/daemon_example.ini usr/lib/mysql/plugin/debug_key_management.so -usr/lib/mysql/plugin/example_key_management.so usr/lib/mysql/plugin/dialog_examples.so -usr/lib/mysql/plugin/auth_test_plugin.so -usr/lib/mysql/plugin/qa_auth_interface.so -usr/lib/mysql/plugin/qa_auth_server.so -usr/lib/mysql/plugin/qa_auth_client.so -usr/lib/mysql/plugin/auth_0x0100.so -usr/lib/mysql/plugin/mypluglib.so -usr/lib/mysql/plugin/ha_test_sql_discovery.so +usr/lib/mysql/plugin/example_key_management.so usr/lib/mysql/plugin/ha_example.so -usr/lib/mysql/plugin/daemon_example.ini +usr/lib/mysql/plugin/ha_test_sql_discovery.so usr/lib/mysql/plugin/libdaemon_example.so -usr/lib/mysql/plugin/adt_null.so -usr/bin/mysql_client_test -usr/bin/mysql_client_test_embedded -usr/bin/mysqltest_embedded -usr/share/man/man1/mysql_client_test.1 -usr/share/man/man1/mysql_client_test_embedded.1 -usr/bin/mysqltest -usr/share/man/man1/mysqltest.1 -usr/share/man/man1/mysqltest_embedded.1 -usr/share/mysql/mysql-test +usr/lib/mysql/plugin/mypluglib.so +usr/lib/mysql/plugin/qa_auth_client.so +usr/lib/mysql/plugin/qa_auth_interface.so +usr/lib/mysql/plugin/qa_auth_server.so +usr/share/mysql/mysql-test/README +usr/share/mysql/mysql-test/README-gcov +usr/share/mysql/mysql-test/README.stress +usr/share/mysql/mysql-test/disabled.def +usr/share/mysql/mysql-test/lib +usr/share/mysql/mysql-test/mysql-stress-test.pl +usr/share/mysql/mysql-test/mysql-test-run.pl +usr/share/mysql/mysql-test/purify.supp +usr/share/mysql/mysql-test/suite.pm +usr/share/mysql/mysql-test/valgrind.supp diff --git a/debian/mariadb-test-10.1.links b/debian/mariadb-test.links index 082680fe5ed..082680fe5ed 100644 --- a/debian/mariadb-test-10.1.links +++ b/debian/mariadb-test.links diff --git a/debian/mariadb-test.manpages b/debian/mariadb-test.manpages new file mode 100644 index 00000000000..33ce8710ea7 --- /dev/null +++ b/debian/mariadb-test.manpages @@ -0,0 +1,4 @@ +debian/tmp/usr/share/man/man1/mysql_client_test.1 +debian/tmp/usr/share/man/man1/mysql_client_test_embedded.1 +debian/tmp/usr/share/man/man1/mysqltest.1 +debian/tmp/usr/share/man/man1/mysqltest_embedded.1 diff --git a/debian/mysql-common.files b/debian/mysql-common.files deleted file mode 100644 index c052beb0027..00000000000 --- a/debian/mysql-common.files +++ /dev/null @@ -1,2 +0,0 @@ -etc/mysql/my.cnf -usr/share/mysql-common/internal-use-only diff --git a/debian/mysql-common.install b/debian/mysql-common.install new file mode 100644 index 00000000000..5ff685f42ff --- /dev/null +++ b/debian/mysql-common.install @@ -0,0 +1,2 @@ +debian/additions/my.cnf etc/mysql +usr/share/mysql-common/internal-use-only
\ No newline at end of file diff --git a/debian/patches/00list b/debian/patches/00list index 1346748eba1..5d090c644f1 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,10 +1,5 @@ -# 01_MAKEFILES__Docs_Images_Makefile.in.dpatch -# 01_MAKEFILES__Docs_Makefile.in.dpatch -# 21_init__openquery_configtest.dpatch 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 -# 44_scripts__mysql_config__libs.dpatch 50_mysql-test__db_test.dpatch -# 60_zlib_innodb_workaround.dpatch 61_replace_dash_with_bash_mbug675185.dpatch diff --git a/debian/patches/01_MAKEFILES__Docs_Images_Makefile.in.dpatch b/debian/patches/01_MAKEFILES__Docs_Images_Makefile.in.dpatch deleted file mode 100755 index 6305b528576..00000000000 --- a/debian/patches/01_MAKEFILES__Docs_Images_Makefile.in.dpatch +++ /dev/null @@ -1,776 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_MAKEFILES__Docs_Makefile.in.dpatch by <ch@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Creates Docs/Makefile.in - -@DPATCH@ - ---- old/Docs/Images/Makefile.in 2005-03-01 02:08:01.877429040 +0100 -+++ new/Docs/Images/Makefile.in 2005-02-28 21:21:24.000000000 +0100 -@@ -0,0 +1,765 @@ -+# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# @configure_input@ -+ -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# Free Software Foundation, Inc. -+# This Makefile.in is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -+# PARTICULAR PURPOSE. -+ -+@SET_MAKE@ -+ -+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA -+ -+# Process this file with automake to create Makefile.in -+ -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+VPATH = @srcdir@ -+pkgdatadir = $(datadir)/@PACKAGE@ -+pkglibdir = $(libdir)/@PACKAGE@ -+pkgincludedir = $(includedir)/@PACKAGE@ -+top_builddir = . -+ -+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -+INSTALL = @INSTALL@ -+install_sh_DATA = $(install_sh) -c -m 644 -+install_sh_PROGRAM = $(install_sh) -c -+install_sh_SCRIPT = $(install_sh) -c -+INSTALL_HEADER = $(INSTALL_DATA) -+transform = $(program_transform_name) -+NORMAL_INSTALL = : -+PRE_INSTALL = : -+POST_INSTALL = : -+NORMAL_UNINSTALL = : -+PRE_UNINSTALL = : -+POST_UNINSTALL = : -+build_triplet = @build@ -+host_triplet = @host@ -+target_triplet = @target@ -+ACLOCAL = @ACLOCAL@ -+ALLOCA = @ALLOCA@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ -+AMTAR = @AMTAR@ -+AR = @AR@ -+AS = @AS@ -+ASSEMBLER_FALSE = @ASSEMBLER_FALSE@ -+ASSEMBLER_TRUE = @ASSEMBLER_TRUE@ -+ASSEMBLER_sparc32_FALSE = @ASSEMBLER_sparc32_FALSE@ -+ASSEMBLER_sparc32_TRUE = @ASSEMBLER_sparc32_TRUE@ -+ASSEMBLER_sparc64_FALSE = @ASSEMBLER_sparc64_FALSE@ -+ASSEMBLER_sparc64_TRUE = @ASSEMBLER_sparc64_TRUE@ -+ASSEMBLER_x86_FALSE = @ASSEMBLER_x86_FALSE@ -+ASSEMBLER_x86_TRUE = @ASSEMBLER_x86_TRUE@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ -+AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ -+AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ -+AWK = @AWK@ -+CC = @CC@ -+CCAS = @CCAS@ -+CCASFLAGS = @CCASFLAGS@ -+CCDEPMODE = @CCDEPMODE@ -+CC_VERSION = @CC_VERSION@ -+CFLAGS = @CFLAGS@ -+CHARSETS_NEED_SOURCE = @CHARSETS_NEED_SOURCE@ -+CHARSET_OBJS = @CHARSET_OBJS@ -+CHARSET_SRCS = @CHARSET_SRCS@ -+CHECK_PID = @CHECK_PID@ -+CHMOD = @CHMOD@ -+CLIENT_EXTRA_LDFLAGS = @CLIENT_EXTRA_LDFLAGS@ -+CLIENT_LIBS = @CLIENT_LIBS@ -+CMP = @CMP@ -+COMPILATION_COMMENT = @COMPILATION_COMMENT@ -+COMPILE_PSTACK_FALSE = @COMPILE_PSTACK_FALSE@ -+COMPILE_PSTACK_TRUE = @COMPILE_PSTACK_TRUE@ -+CONF_COMMAND = @CONF_COMMAND@ -+CP = @CP@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ -+CXX = @CXX@ -+CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CXXLDFLAGS = @CXXLDFLAGS@ -+CXX_VERSION = @CXX_VERSION@ -+CYGPATH_W = @CYGPATH_W@ -+DEFS = @DEFS@ -+DEPDIR = @DEPDIR@ -+DOT_FRM_VERSION = @DOT_FRM_VERSION@ -+DVIS = @DVIS@ -+ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ -+EXEEXT = @EXEEXT@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ -+FIND_PROC = @FIND_PROC@ -+GETCONF = @GETCONF@ -+GXX = @GXX@ -+HAVE_NETWARE_FALSE = @HAVE_NETWARE_FALSE@ -+HAVE_NETWARE_TRUE = @HAVE_NETWARE_TRUE@ -+HOSTNAME = @HOSTNAME@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+IS_LINUX = @IS_LINUX@ -+KILL = @KILL@ -+LD = @LD@ -+LDFLAGS = @LDFLAGS@ -+LIBDL = @LIBDL@ -+LIBOBJS = @LIBOBJS@ -+LIBS = @LIBS@ -+LIBTOOL = @LIBTOOL@ -+LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ -+LM_CFLAGS = @LM_CFLAGS@ -+LN = @LN@ -+LN_CP_F = @LN_CP_F@ -+LN_S = @LN_S@ -+LOCAL_FALSE = @LOCAL_FALSE@ -+LOCAL_TRUE = @LOCAL_TRUE@ -+LTLIBOBJS = @LTLIBOBJS@ -+MACHINE_TYPE = @MACHINE_TYPE@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -+MAKEINFO = @MAKEINFO@ -+MAKE_BINARY_DISTRIBUTION_OPTIONS = @MAKE_BINARY_DISTRIBUTION_OPTIONS@ -+MAKE_SHELL = @MAKE_SHELL@ -+MT_INCLUDES = @MT_INCLUDES@ -+MT_LD_ADD = @MT_LD_ADD@ -+MV = @MV@ -+MYSQLD_DEFAULT_SWITCHES = @MYSQLD_DEFAULT_SWITCHES@ -+MYSQLD_EXTRA_LDFLAGS = @MYSQLD_EXTRA_LDFLAGS@ -+MYSQLD_USER = @MYSQLD_USER@ -+MYSQL_BASE_VERSION = @MYSQL_BASE_VERSION@ -+MYSQL_NO_DASH_VERSION = @MYSQL_NO_DASH_VERSION@ -+MYSQL_SERVER_SUFFIX = @MYSQL_SERVER_SUFFIX@ -+MYSQL_TCP_PORT = @MYSQL_TCP_PORT@ -+MYSQL_TCP_PORT_DEFAULT = @MYSQL_TCP_PORT_DEFAULT@ -+MYSQL_UNIX_ADDR = @MYSQL_UNIX_ADDR@ -+MYSQL_VERSION_ID = @MYSQL_VERSION_ID@ -+NOINST_LDFLAGS = @NOINST_LDFLAGS@ -+OBJEXT = @OBJEXT@ -+PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ -+PDFMANUAL = @PDFMANUAL@ -+PERL = @PERL@ -+PERL5 = @PERL5@ -+PROTOCOL_VERSION = @PROTOCOL_VERSION@ -+PS = @PS@ -+RANLIB = @RANLIB@ -+RM = @RM@ -+SAVE_ASFLAGS = @SAVE_ASFLAGS@ -+SAVE_CFLAGS = @SAVE_CFLAGS@ -+SAVE_CXXFLAGS = @SAVE_CXXFLAGS@ -+SAVE_CXXLDFLAGS = @SAVE_CXXLDFLAGS@ -+SAVE_LDFLAGS = @SAVE_LDFLAGS@ -+SED = @SED@ -+SET_MAKE = @SET_MAKE@ -+SHARED_LIB_VERSION = @SHARED_LIB_VERSION@ -+SHELL = @SHELL@ -+STRIP = @STRIP@ -+SYSTEM_TYPE = @SYSTEM_TYPE@ -+TAR = @TAR@ -+TERMCAP_LIB = @TERMCAP_LIB@ -+THREAD_LOBJECTS = @THREAD_LOBJECTS@ -+THREAD_LPROGRAMS = @THREAD_LPROGRAMS@ -+VERSION = @VERSION@ -+WRAPLIBS = @WRAPLIBS@ -+YACC = @YACC@ -+ac_ct_AR = @ac_ct_AR@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ -+ac_ct_GETCONF = @ac_ct_GETCONF@ -+ac_ct_RANLIB = @ac_ct_RANLIB@ -+ac_ct_STRIP = @ac_ct_STRIP@ -+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ -+am__quote = @am__quote@ -+bdb_includes = @bdb_includes@ -+bdb_libs = @bdb_libs@ -+bdb_libs_with_path = @bdb_libs_with_path@ -+bench_dirs = @bench_dirs@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ -+datadir = @datadir@ -+default_charset = @default_charset@ -+docs_dirs = @docs_dirs@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+includedir = @includedir@ -+infodir = @infodir@ -+innodb_includes = @innodb_includes@ -+innodb_libs = @innodb_libs@ -+innodb_system_libs = @innodb_system_libs@ -+install_sh = @install_sh@ -+isam_libs = @isam_libs@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+libmysqld_dirs = @libmysqld_dirs@ -+linked_client_targets = @linked_client_targets@ -+linked_netware_sources = @linked_netware_sources@ -+localstatedir = @localstatedir@ -+man_dirs = @man_dirs@ -+mandir = @mandir@ -+netware_dir = @netware_dir@ -+oldincludedir = @oldincludedir@ -+openssl_includes = @openssl_includes@ -+openssl_libs = @openssl_libs@ -+orbit_idl = @orbit_idl@ -+orbit_includes = @orbit_includes@ -+orbit_libs = @orbit_libs@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+pstack_dirs = @pstack_dirs@ -+pstack_libs = @pstack_libs@ -+readline_dir = @readline_dir@ -+readline_link = @readline_link@ -+sbindir = @sbindir@ -+server_scripts = @server_scripts@ -+sharedstatedir = @sharedstatedir@ -+sql_client_dirs = @sql_client_dirs@ -+sql_server_dirs = @sql_server_dirs@ -+sysconfdir = @sysconfdir@ -+target = @target@ -+target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ -+thread_dirs = @thread_dirs@ -+tools_dirs = @tools_dirs@ -+uname_prog = @uname_prog@ -+vio_dir = @vio_dir@ -+vio_libs = @vio_libs@ -+ -+AUTOMAKE_OPTIONS = foreign -+ -+# These are built from source in the Docs directory -+EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT -+SUBDIRS = . include @docs_dirs@ @readline_dir@ \ -+ @thread_dirs@ pstack @sql_client_dirs@ \ -+ @sql_server_dirs@ scripts @man_dirs@ tests \ -+ BUILD netware os2 @libmysqld_dirs@ \ -+ @bench_dirs@ support-files @tools_dirs@ -+ -+ -+# Relink after clean -+linked_sources = linked_client_sources linked_server_sources \ -+ linked_libmysql_sources linked_libmysql_r_sources \ -+ linked_libmysqld_sources linked_libmysqldex_sources \ -+ linked_include_sources @linked_netware_sources@ -+ -+ -+CLEANFILES = $(linked_sources) -+subdir = . -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = config.h -+CONFIG_CLEAN_FILES = bdb/Makefile -+DIST_SOURCES = -+ -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure COPYING \ -+ ChangeLog Makefile.am acconfig.h acinclude.m4 aclocal.m4 \ -+ config.guess config.h.in config.sub configure configure.in \ -+ depcomp install-sh ltconfig ltmain.sh missing mkinstalldirs -+DIST_SUBDIRS = $(SUBDIRS) -+all: config.h -+ $(MAKE) $(AM_MAKEFLAGS) all-recursive -+ -+.SUFFIXES: -+ -+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ -+ configure.lineno -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+ cd $(top_srcdir) && \ -+ $(AUTOMAKE) --foreign Makefile -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) -+ -+$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ $(SHELL) ./config.status --recheck -+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) -+ cd $(srcdir) && $(AUTOCONF) -+ -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 -+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -+ -+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status -+ @rm -f stamp-h1 -+ cd $(top_builddir) && $(SHELL) ./config.status config.h -+ -+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h -+ cd $(top_srcdir) && $(AUTOHEADER) -+ touch $(srcdir)/config.h.in -+ -+distclean-hdr: -+ -rm -f config.h stamp-h1 -+bdb/Makefile: $(top_builddir)/config.status $(top_srcdir)/bdb/Makefile.in -+ cd $(top_builddir) && $(SHELL) ./config.status $@ -+ -+mostlyclean-libtool: -+ -rm -f *.lo -+ -+clean-libtool: -+ -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+ -+# This directory's subdirectories are mostly independent; you can cd -+# into them and run `make' without going through this Makefile. -+# To change the values of `make' variables: instead of editing Makefiles, -+# (1) if the variable is set in `config.status', edit `config.status' -+# (which will cause the Makefiles to be regenerated when you run `make'); -+# (2) otherwise, pass the desired values on the `make' command line. -+$(RECURSIVE_TARGETS): -+ @set fnord $$MAKEFLAGS; amf=$$2; \ -+ dot_seen=no; \ -+ target=`echo $@ | sed s/-recursive//`; \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ echo "Making $$target in $$subdir"; \ -+ if test "$$subdir" = "."; then \ -+ dot_seen=yes; \ -+ local_target="$$target-am"; \ -+ else \ -+ local_target="$$target"; \ -+ fi; \ -+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ done; \ -+ if test "$$dot_seen" = "no"; then \ -+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ -+ fi; test -z "$$fail" -+ -+mostlyclean-recursive clean-recursive distclean-recursive \ -+maintainer-clean-recursive: -+ @set fnord $$MAKEFLAGS; amf=$$2; \ -+ dot_seen=no; \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ rev=''; for subdir in $$list; do \ -+ if test "$$subdir" = "."; then :; else \ -+ rev="$$subdir $$rev"; \ -+ fi; \ -+ done; \ -+ rev="$$rev ."; \ -+ target=`echo $@ | sed s/-recursive//`; \ -+ for subdir in $$rev; do \ -+ echo "Making $$target in $$subdir"; \ -+ if test "$$subdir" = "."; then \ -+ local_target="$$target-am"; \ -+ else \ -+ local_target="$$target"; \ -+ fi; \ -+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ done && test -z "$$fail" -+tags-recursive: -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -+ done -+ctags-recursive: -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -+ done -+ -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ mkid -fID $$unique -+ -+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ -+ include_option=--etags-include; \ -+ else \ -+ include_option=--include; \ -+ fi; \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ if test "$$subdir" = .; then :; else \ -+ test -f $$subdir/TAGS && \ -+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ -+ fi; \ -+ done; \ -+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ -+ctags: CTAGS -+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$tags $$unique -+ -+GTAGS: -+ here=`$(am__cd) $(top_builddir) && pwd` \ -+ && cd $(top_srcdir) \ -+ && gtags -i $(GTAGS_ARGS) $$here -+ -+distclean-tags: -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = . -+distdir = $(PACKAGE)-$(VERSION) -+ -+am__remove_distdir = \ -+ { test ! -d $(distdir) \ -+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ -+ && rm -fr $(distdir); }; } -+ -+GZIP_ENV = --best -+distuninstallcheck_listfiles = find . -type f -print -+distcleancheck_listfiles = find . -type f -print -+ -+distdir: $(DISTFILES) -+ $(am__remove_distdir) -+ mkdir $(distdir) -+ $(mkinstalldirs) $(distdir)/bdb $(distdir)/include -+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -+ list='$(DISTFILES)'; for file in $$list; do \ -+ case $$file in \ -+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -+ esac; \ -+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -+ dir="/$$dir"; \ -+ $(mkinstalldirs) "$(distdir)$$dir"; \ -+ else \ -+ dir=''; \ -+ fi; \ -+ if test -d $$d/$$file; then \ -+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -+ fi; \ -+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ -+ else \ -+ test -f $(distdir)/$$file \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ -+ fi; \ -+ done -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ if test "$$subdir" = .; then :; else \ -+ test -d $(distdir)/$$subdir \ -+ || mkdir $(distdir)/$$subdir \ -+ || exit 1; \ -+ (cd $$subdir && \ -+ $(MAKE) $(AM_MAKEFLAGS) \ -+ top_distdir="$(top_distdir)" \ -+ distdir=../$(distdir)/$$subdir \ -+ distdir) \ -+ || exit 1; \ -+ fi; \ -+ done -+ $(MAKE) $(AM_MAKEFLAGS) \ -+ top_distdir="$(top_distdir)" distdir="$(distdir)" \ -+ dist-hook -+ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ -+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ -+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ -+ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ -+ || chmod -R a+r $(distdir) -+dist-gzip: distdir -+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -+ $(am__remove_distdir) -+ -+dist dist-all: distdir -+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -+ $(am__remove_distdir) -+ -+# This target untars the dist file and tries a VPATH configuration. Then -+# it guarantees that the distribution is self-contained by making another -+# tarfile. -+distcheck: dist -+ $(am__remove_distdir) -+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - -+ chmod -R a-w $(distdir); chmod a+w $(distdir) -+ mkdir $(distdir)/_build -+ mkdir $(distdir)/_inst -+ chmod a-w $(distdir) -+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ -+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ -+ && cd $(distdir)/_build \ -+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ -+ $(DISTCHECK_CONFIGURE_FLAGS) \ -+ && $(MAKE) $(AM_MAKEFLAGS) \ -+ && $(MAKE) $(AM_MAKEFLAGS) dvi \ -+ && $(MAKE) $(AM_MAKEFLAGS) check \ -+ && $(MAKE) $(AM_MAKEFLAGS) install \ -+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ -+ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ -+ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ -+ distuninstallcheck \ -+ && chmod -R a-w "$$dc_install_base" \ -+ && ({ \ -+ (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ -+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ -+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ -+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ -+ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ -+ } || { rm -rf "$$dc_destdir"; exit 1; }) \ -+ && rm -rf "$$dc_destdir" \ -+ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ -+ && rm -f $(distdir).tar.gz \ -+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck -+ $(am__remove_distdir) -+ @echo "$(distdir).tar.gz is ready for distribution" | \ -+ sed 'h;s/./=/g;p;x;p;x' -+distuninstallcheck: -+ @cd $(distuninstallcheck_dir) \ -+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ -+ || { echo "ERROR: files left after uninstall:" ; \ -+ if test -n "$(DESTDIR)"; then \ -+ echo " (check DESTDIR support)"; \ -+ fi ; \ -+ $(distuninstallcheck_listfiles) ; \ -+ exit 1; } >&2 -+distcleancheck: distclean -+ @if test '$(srcdir)' = . ; then \ -+ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ -+ exit 1 ; \ -+ fi -+ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ -+ || { echo "ERROR: files left in build directory after distclean:" ; \ -+ $(distcleancheck_listfiles) ; \ -+ exit 1; } >&2 -+check-am: all-am -+check: check-recursive -+all-am: Makefile config.h -+installdirs: installdirs-recursive -+installdirs-am: -+ -+install: install-recursive -+install-exec: install-exec-recursive -+install-data: install-data-recursive -+uninstall: uninstall-recursive -+ -+install-am: all-am -+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -+ -+installcheck: installcheck-recursive -+install-strip: -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+mostlyclean-generic: -+ -+clean-generic: -+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) -+ -+distclean-generic: -+ -rm -f $(CONFIG_CLEAN_FILES) -+ -+maintainer-clean-generic: -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+clean: clean-recursive -+ -+clean-am: clean-generic clean-libtool mostlyclean-am -+ -+distclean: distclean-recursive -+ -rm -f $(am__CONFIG_DISTCLEAN_FILES) -+ -rm -f Makefile -+distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \ -+ distclean-tags -+ -+dvi: dvi-recursive -+ -+dvi-am: -+ -+info: info-recursive -+ -+info-am: -+ -+install-data-am: -+ -+install-exec-am: -+ -+install-info: install-info-recursive -+ -+install-man: -+ -+installcheck-am: -+ -+maintainer-clean: maintainer-clean-recursive -+ -rm -f $(am__CONFIG_DISTCLEAN_FILES) -+ -rm -rf $(top_srcdir)/autom4te.cache -+ -rm -f Makefile -+maintainer-clean-am: distclean-am maintainer-clean-generic -+ -+mostlyclean: mostlyclean-recursive -+ -+mostlyclean-am: mostlyclean-generic mostlyclean-libtool -+ -+pdf: pdf-recursive -+ -+pdf-am: -+ -+ps: ps-recursive -+ -+ps-am: -+ -+uninstall-am: uninstall-info-am -+ -+uninstall-info: uninstall-info-recursive -+ -+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ -+ clean-generic clean-libtool clean-recursive ctags \ -+ ctags-recursive dist dist-all dist-gzip distcheck distclean \ -+ distclean-generic distclean-hdr distclean-libtool \ -+ distclean-recursive distclean-tags distcleancheck distdir \ -+ distuninstallcheck dvi dvi-am dvi-recursive info info-am \ -+ info-recursive install install-am install-data install-data-am \ -+ install-data-recursive install-exec install-exec-am \ -+ install-exec-recursive install-info install-info-am \ -+ install-info-recursive install-man install-recursive \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am installdirs-recursive maintainer-clean \ -+ maintainer-clean-generic maintainer-clean-recursive mostlyclean \ -+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ -+ pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ -+ tags-recursive uninstall uninstall-am uninstall-info-am \ -+ uninstall-info-recursive uninstall-recursive -+ -+ -+# This is just so that the linking is done early. -+config.h: $(linked_sources) -+ -+linked_include_sources: -+ cd include; $(MAKE) link_sources -+ echo timestamp > linked_include_sources -+ -+linked_client_sources: @linked_client_targets@ -+ cd client; $(MAKE) link_sources -+ echo timestamp > linked_client_sources -+ -+linked_libmysql_sources: -+ cd libmysql; $(MAKE) link_sources -+ echo timestamp > linked_libmysql_sources -+ -+linked_libmysql_r_sources: linked_libmysql_sources -+ cd libmysql_r; $(MAKE) link_sources -+ echo timestamp > linked_libmysql_r_sources -+ -+linked_libmysqld_sources: -+ cd libmysqld; $(MAKE) link_sources -+ echo timestamp > linked_libmysqld_sources -+ -+linked_libmysqldex_sources: -+ cd libmysqld/examples; $(MAKE) link_sources -+ echo timestamp > linked_libmysqldex_sources -+ -+linked_netware_sources: -+ cd @netware_dir@; $(MAKE) link_sources -+ echo timestamp > linked_netware_sources -+ -+#avoid recursive make calls in sql directory -+linked_server_sources: -+ cd sql; rm -f mini_client_errors.c;@LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c -+ echo timestamp > linked_server_sources -+ -+# Create permission databases -+init-db: all -+ $(top_builddir)/scripts/mysql_install_db -+ -+bin-dist: all -+ $(top_builddir)/scripts/make_binary_distribution @MAKE_BINARY_DISTRIBUTION_OPTIONS@ -+ -+# Remove BK's "SCCS" subdirectories from source distribution -+dist-hook: -+ rm -rf `find $(distdir) -type d -name SCCS` -+ -+tags: -+ support-files/build-tags -+.PHONY: init-db bin-dist -+ -+# Test installation -+ -+test: -+ cd mysql-test ; ./mysql-test-run -+# Tell versions [3.59,3.63) of GNU make to not export all variables. -+# Otherwise a system limit (for SysV at least) may be exceeded. -+.NOEXPORT: diff --git a/debian/patches/01_MAKEFILES__Docs_Makefile.in.dpatch b/debian/patches/01_MAKEFILES__Docs_Makefile.in.dpatch deleted file mode 100755 index 6de69d0e1a7..00000000000 --- a/debian/patches/01_MAKEFILES__Docs_Makefile.in.dpatch +++ /dev/null @@ -1,776 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_MAKEFILES__Docs_Makefile.in.dpatch by <ch@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Creates Docs/Makefile.in - -@DPATCH@ - ---- old/Docs/Makefile.in 2005-03-01 02:08:01.877429040 +0100 -+++ new/Docs/Makefile.in 2005-02-28 21:21:24.000000000 +0100 -@@ -0,0 +1,765 @@ -+# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# @configure_input@ -+ -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# Free Software Foundation, Inc. -+# This Makefile.in is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -+# PARTICULAR PURPOSE. -+ -+@SET_MAKE@ -+ -+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA -+ -+# Process this file with automake to create Makefile.in -+ -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+VPATH = @srcdir@ -+pkgdatadir = $(datadir)/@PACKAGE@ -+pkglibdir = $(libdir)/@PACKAGE@ -+pkgincludedir = $(includedir)/@PACKAGE@ -+top_builddir = . -+ -+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -+INSTALL = @INSTALL@ -+install_sh_DATA = $(install_sh) -c -m 644 -+install_sh_PROGRAM = $(install_sh) -c -+install_sh_SCRIPT = $(install_sh) -c -+INSTALL_HEADER = $(INSTALL_DATA) -+transform = $(program_transform_name) -+NORMAL_INSTALL = : -+PRE_INSTALL = : -+POST_INSTALL = : -+NORMAL_UNINSTALL = : -+PRE_UNINSTALL = : -+POST_UNINSTALL = : -+build_triplet = @build@ -+host_triplet = @host@ -+target_triplet = @target@ -+ACLOCAL = @ACLOCAL@ -+ALLOCA = @ALLOCA@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ -+AMTAR = @AMTAR@ -+AR = @AR@ -+AS = @AS@ -+ASSEMBLER_FALSE = @ASSEMBLER_FALSE@ -+ASSEMBLER_TRUE = @ASSEMBLER_TRUE@ -+ASSEMBLER_sparc32_FALSE = @ASSEMBLER_sparc32_FALSE@ -+ASSEMBLER_sparc32_TRUE = @ASSEMBLER_sparc32_TRUE@ -+ASSEMBLER_sparc64_FALSE = @ASSEMBLER_sparc64_FALSE@ -+ASSEMBLER_sparc64_TRUE = @ASSEMBLER_sparc64_TRUE@ -+ASSEMBLER_x86_FALSE = @ASSEMBLER_x86_FALSE@ -+ASSEMBLER_x86_TRUE = @ASSEMBLER_x86_TRUE@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ -+AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ -+AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ -+AWK = @AWK@ -+CC = @CC@ -+CCAS = @CCAS@ -+CCASFLAGS = @CCASFLAGS@ -+CCDEPMODE = @CCDEPMODE@ -+CC_VERSION = @CC_VERSION@ -+CFLAGS = @CFLAGS@ -+CHARSETS_NEED_SOURCE = @CHARSETS_NEED_SOURCE@ -+CHARSET_OBJS = @CHARSET_OBJS@ -+CHARSET_SRCS = @CHARSET_SRCS@ -+CHECK_PID = @CHECK_PID@ -+CHMOD = @CHMOD@ -+CLIENT_EXTRA_LDFLAGS = @CLIENT_EXTRA_LDFLAGS@ -+CLIENT_LIBS = @CLIENT_LIBS@ -+CMP = @CMP@ -+COMPILATION_COMMENT = @COMPILATION_COMMENT@ -+COMPILE_PSTACK_FALSE = @COMPILE_PSTACK_FALSE@ -+COMPILE_PSTACK_TRUE = @COMPILE_PSTACK_TRUE@ -+CONF_COMMAND = @CONF_COMMAND@ -+CP = @CP@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ -+CXX = @CXX@ -+CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CXXLDFLAGS = @CXXLDFLAGS@ -+CXX_VERSION = @CXX_VERSION@ -+CYGPATH_W = @CYGPATH_W@ -+DEFS = @DEFS@ -+DEPDIR = @DEPDIR@ -+DOT_FRM_VERSION = @DOT_FRM_VERSION@ -+DVIS = @DVIS@ -+ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ -+EXEEXT = @EXEEXT@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ -+FIND_PROC = @FIND_PROC@ -+GETCONF = @GETCONF@ -+GXX = @GXX@ -+HAVE_NETWARE_FALSE = @HAVE_NETWARE_FALSE@ -+HAVE_NETWARE_TRUE = @HAVE_NETWARE_TRUE@ -+HOSTNAME = @HOSTNAME@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+IS_LINUX = @IS_LINUX@ -+KILL = @KILL@ -+LD = @LD@ -+LDFLAGS = @LDFLAGS@ -+LIBDL = @LIBDL@ -+LIBOBJS = @LIBOBJS@ -+LIBS = @LIBS@ -+LIBTOOL = @LIBTOOL@ -+LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ -+LM_CFLAGS = @LM_CFLAGS@ -+LN = @LN@ -+LN_CP_F = @LN_CP_F@ -+LN_S = @LN_S@ -+LOCAL_FALSE = @LOCAL_FALSE@ -+LOCAL_TRUE = @LOCAL_TRUE@ -+LTLIBOBJS = @LTLIBOBJS@ -+MACHINE_TYPE = @MACHINE_TYPE@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -+MAKEINFO = @MAKEINFO@ -+MAKE_BINARY_DISTRIBUTION_OPTIONS = @MAKE_BINARY_DISTRIBUTION_OPTIONS@ -+MAKE_SHELL = @MAKE_SHELL@ -+MT_INCLUDES = @MT_INCLUDES@ -+MT_LD_ADD = @MT_LD_ADD@ -+MV = @MV@ -+MYSQLD_DEFAULT_SWITCHES = @MYSQLD_DEFAULT_SWITCHES@ -+MYSQLD_EXTRA_LDFLAGS = @MYSQLD_EXTRA_LDFLAGS@ -+MYSQLD_USER = @MYSQLD_USER@ -+MYSQL_BASE_VERSION = @MYSQL_BASE_VERSION@ -+MYSQL_NO_DASH_VERSION = @MYSQL_NO_DASH_VERSION@ -+MYSQL_SERVER_SUFFIX = @MYSQL_SERVER_SUFFIX@ -+MYSQL_TCP_PORT = @MYSQL_TCP_PORT@ -+MYSQL_TCP_PORT_DEFAULT = @MYSQL_TCP_PORT_DEFAULT@ -+MYSQL_UNIX_ADDR = @MYSQL_UNIX_ADDR@ -+MYSQL_VERSION_ID = @MYSQL_VERSION_ID@ -+NOINST_LDFLAGS = @NOINST_LDFLAGS@ -+OBJEXT = @OBJEXT@ -+PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ -+PDFMANUAL = @PDFMANUAL@ -+PERL = @PERL@ -+PERL5 = @PERL5@ -+PROTOCOL_VERSION = @PROTOCOL_VERSION@ -+PS = @PS@ -+RANLIB = @RANLIB@ -+RM = @RM@ -+SAVE_ASFLAGS = @SAVE_ASFLAGS@ -+SAVE_CFLAGS = @SAVE_CFLAGS@ -+SAVE_CXXFLAGS = @SAVE_CXXFLAGS@ -+SAVE_CXXLDFLAGS = @SAVE_CXXLDFLAGS@ -+SAVE_LDFLAGS = @SAVE_LDFLAGS@ -+SED = @SED@ -+SET_MAKE = @SET_MAKE@ -+SHARED_LIB_VERSION = @SHARED_LIB_VERSION@ -+SHELL = @SHELL@ -+STRIP = @STRIP@ -+SYSTEM_TYPE = @SYSTEM_TYPE@ -+TAR = @TAR@ -+TERMCAP_LIB = @TERMCAP_LIB@ -+THREAD_LOBJECTS = @THREAD_LOBJECTS@ -+THREAD_LPROGRAMS = @THREAD_LPROGRAMS@ -+VERSION = @VERSION@ -+WRAPLIBS = @WRAPLIBS@ -+YACC = @YACC@ -+ac_ct_AR = @ac_ct_AR@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ -+ac_ct_GETCONF = @ac_ct_GETCONF@ -+ac_ct_RANLIB = @ac_ct_RANLIB@ -+ac_ct_STRIP = @ac_ct_STRIP@ -+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ -+am__quote = @am__quote@ -+bdb_includes = @bdb_includes@ -+bdb_libs = @bdb_libs@ -+bdb_libs_with_path = @bdb_libs_with_path@ -+bench_dirs = @bench_dirs@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ -+datadir = @datadir@ -+default_charset = @default_charset@ -+docs_dirs = @docs_dirs@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+includedir = @includedir@ -+infodir = @infodir@ -+innodb_includes = @innodb_includes@ -+innodb_libs = @innodb_libs@ -+innodb_system_libs = @innodb_system_libs@ -+install_sh = @install_sh@ -+isam_libs = @isam_libs@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+libmysqld_dirs = @libmysqld_dirs@ -+linked_client_targets = @linked_client_targets@ -+linked_netware_sources = @linked_netware_sources@ -+localstatedir = @localstatedir@ -+man_dirs = @man_dirs@ -+mandir = @mandir@ -+netware_dir = @netware_dir@ -+oldincludedir = @oldincludedir@ -+openssl_includes = @openssl_includes@ -+openssl_libs = @openssl_libs@ -+orbit_idl = @orbit_idl@ -+orbit_includes = @orbit_includes@ -+orbit_libs = @orbit_libs@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+pstack_dirs = @pstack_dirs@ -+pstack_libs = @pstack_libs@ -+readline_dir = @readline_dir@ -+readline_link = @readline_link@ -+sbindir = @sbindir@ -+server_scripts = @server_scripts@ -+sharedstatedir = @sharedstatedir@ -+sql_client_dirs = @sql_client_dirs@ -+sql_server_dirs = @sql_server_dirs@ -+sysconfdir = @sysconfdir@ -+target = @target@ -+target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ -+thread_dirs = @thread_dirs@ -+tools_dirs = @tools_dirs@ -+uname_prog = @uname_prog@ -+vio_dir = @vio_dir@ -+vio_libs = @vio_libs@ -+ -+AUTOMAKE_OPTIONS = foreign -+ -+# These are built from source in the Docs directory -+EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT -+SUBDIRS = . include @docs_dirs@ @readline_dir@ \ -+ @thread_dirs@ pstack @sql_client_dirs@ \ -+ @sql_server_dirs@ scripts @man_dirs@ tests \ -+ BUILD netware os2 @libmysqld_dirs@ \ -+ @bench_dirs@ support-files @tools_dirs@ -+ -+ -+# Relink after clean -+linked_sources = linked_client_sources linked_server_sources \ -+ linked_libmysql_sources linked_libmysql_r_sources \ -+ linked_libmysqld_sources linked_libmysqldex_sources \ -+ linked_include_sources @linked_netware_sources@ -+ -+ -+CLEANFILES = $(linked_sources) -+subdir = . -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = config.h -+CONFIG_CLEAN_FILES = bdb/Makefile -+DIST_SOURCES = -+ -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure COPYING \ -+ ChangeLog Makefile.am acconfig.h acinclude.m4 aclocal.m4 \ -+ config.guess config.h.in config.sub configure configure.in \ -+ depcomp install-sh ltconfig ltmain.sh missing mkinstalldirs -+DIST_SUBDIRS = $(SUBDIRS) -+all: config.h -+ $(MAKE) $(AM_MAKEFLAGS) all-recursive -+ -+.SUFFIXES: -+ -+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ -+ configure.lineno -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+ cd $(top_srcdir) && \ -+ $(AUTOMAKE) --foreign Makefile -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) -+ -+$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ $(SHELL) ./config.status --recheck -+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) -+ cd $(srcdir) && $(AUTOCONF) -+ -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 -+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -+ -+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status -+ @rm -f stamp-h1 -+ cd $(top_builddir) && $(SHELL) ./config.status config.h -+ -+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h -+ cd $(top_srcdir) && $(AUTOHEADER) -+ touch $(srcdir)/config.h.in -+ -+distclean-hdr: -+ -rm -f config.h stamp-h1 -+bdb/Makefile: $(top_builddir)/config.status $(top_srcdir)/bdb/Makefile.in -+ cd $(top_builddir) && $(SHELL) ./config.status $@ -+ -+mostlyclean-libtool: -+ -rm -f *.lo -+ -+clean-libtool: -+ -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+ -+# This directory's subdirectories are mostly independent; you can cd -+# into them and run `make' without going through this Makefile. -+# To change the values of `make' variables: instead of editing Makefiles, -+# (1) if the variable is set in `config.status', edit `config.status' -+# (which will cause the Makefiles to be regenerated when you run `make'); -+# (2) otherwise, pass the desired values on the `make' command line. -+$(RECURSIVE_TARGETS): -+ @set fnord $$MAKEFLAGS; amf=$$2; \ -+ dot_seen=no; \ -+ target=`echo $@ | sed s/-recursive//`; \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ echo "Making $$target in $$subdir"; \ -+ if test "$$subdir" = "."; then \ -+ dot_seen=yes; \ -+ local_target="$$target-am"; \ -+ else \ -+ local_target="$$target"; \ -+ fi; \ -+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ done; \ -+ if test "$$dot_seen" = "no"; then \ -+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ -+ fi; test -z "$$fail" -+ -+mostlyclean-recursive clean-recursive distclean-recursive \ -+maintainer-clean-recursive: -+ @set fnord $$MAKEFLAGS; amf=$$2; \ -+ dot_seen=no; \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ rev=''; for subdir in $$list; do \ -+ if test "$$subdir" = "."; then :; else \ -+ rev="$$subdir $$rev"; \ -+ fi; \ -+ done; \ -+ rev="$$rev ."; \ -+ target=`echo $@ | sed s/-recursive//`; \ -+ for subdir in $$rev; do \ -+ echo "Making $$target in $$subdir"; \ -+ if test "$$subdir" = "."; then \ -+ local_target="$$target-am"; \ -+ else \ -+ local_target="$$target"; \ -+ fi; \ -+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ done && test -z "$$fail" -+tags-recursive: -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -+ done -+ctags-recursive: -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -+ done -+ -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ mkid -fID $$unique -+ -+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ -+ include_option=--etags-include; \ -+ else \ -+ include_option=--include; \ -+ fi; \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ if test "$$subdir" = .; then :; else \ -+ test -f $$subdir/TAGS && \ -+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ -+ fi; \ -+ done; \ -+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ -+ctags: CTAGS -+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$tags $$unique -+ -+GTAGS: -+ here=`$(am__cd) $(top_builddir) && pwd` \ -+ && cd $(top_srcdir) \ -+ && gtags -i $(GTAGS_ARGS) $$here -+ -+distclean-tags: -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = . -+distdir = $(PACKAGE)-$(VERSION) -+ -+am__remove_distdir = \ -+ { test ! -d $(distdir) \ -+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ -+ && rm -fr $(distdir); }; } -+ -+GZIP_ENV = --best -+distuninstallcheck_listfiles = find . -type f -print -+distcleancheck_listfiles = find . -type f -print -+ -+distdir: $(DISTFILES) -+ $(am__remove_distdir) -+ mkdir $(distdir) -+ $(mkinstalldirs) $(distdir)/bdb $(distdir)/include -+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -+ list='$(DISTFILES)'; for file in $$list; do \ -+ case $$file in \ -+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -+ esac; \ -+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -+ dir="/$$dir"; \ -+ $(mkinstalldirs) "$(distdir)$$dir"; \ -+ else \ -+ dir=''; \ -+ fi; \ -+ if test -d $$d/$$file; then \ -+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -+ fi; \ -+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ -+ else \ -+ test -f $(distdir)/$$file \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ -+ fi; \ -+ done -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ if test "$$subdir" = .; then :; else \ -+ test -d $(distdir)/$$subdir \ -+ || mkdir $(distdir)/$$subdir \ -+ || exit 1; \ -+ (cd $$subdir && \ -+ $(MAKE) $(AM_MAKEFLAGS) \ -+ top_distdir="$(top_distdir)" \ -+ distdir=../$(distdir)/$$subdir \ -+ distdir) \ -+ || exit 1; \ -+ fi; \ -+ done -+ $(MAKE) $(AM_MAKEFLAGS) \ -+ top_distdir="$(top_distdir)" distdir="$(distdir)" \ -+ dist-hook -+ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ -+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ -+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ -+ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ -+ || chmod -R a+r $(distdir) -+dist-gzip: distdir -+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -+ $(am__remove_distdir) -+ -+dist dist-all: distdir -+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -+ $(am__remove_distdir) -+ -+# This target untars the dist file and tries a VPATH configuration. Then -+# it guarantees that the distribution is self-contained by making another -+# tarfile. -+distcheck: dist -+ $(am__remove_distdir) -+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - -+ chmod -R a-w $(distdir); chmod a+w $(distdir) -+ mkdir $(distdir)/_build -+ mkdir $(distdir)/_inst -+ chmod a-w $(distdir) -+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ -+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ -+ && cd $(distdir)/_build \ -+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ -+ $(DISTCHECK_CONFIGURE_FLAGS) \ -+ && $(MAKE) $(AM_MAKEFLAGS) \ -+ && $(MAKE) $(AM_MAKEFLAGS) dvi \ -+ && $(MAKE) $(AM_MAKEFLAGS) check \ -+ && $(MAKE) $(AM_MAKEFLAGS) install \ -+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ -+ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ -+ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ -+ distuninstallcheck \ -+ && chmod -R a-w "$$dc_install_base" \ -+ && ({ \ -+ (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ -+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ -+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ -+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ -+ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ -+ } || { rm -rf "$$dc_destdir"; exit 1; }) \ -+ && rm -rf "$$dc_destdir" \ -+ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ -+ && rm -f $(distdir).tar.gz \ -+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck -+ $(am__remove_distdir) -+ @echo "$(distdir).tar.gz is ready for distribution" | \ -+ sed 'h;s/./=/g;p;x;p;x' -+distuninstallcheck: -+ @cd $(distuninstallcheck_dir) \ -+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ -+ || { echo "ERROR: files left after uninstall:" ; \ -+ if test -n "$(DESTDIR)"; then \ -+ echo " (check DESTDIR support)"; \ -+ fi ; \ -+ $(distuninstallcheck_listfiles) ; \ -+ exit 1; } >&2 -+distcleancheck: distclean -+ @if test '$(srcdir)' = . ; then \ -+ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ -+ exit 1 ; \ -+ fi -+ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ -+ || { echo "ERROR: files left in build directory after distclean:" ; \ -+ $(distcleancheck_listfiles) ; \ -+ exit 1; } >&2 -+check-am: all-am -+check: check-recursive -+all-am: Makefile config.h -+installdirs: installdirs-recursive -+installdirs-am: -+ -+install: install-recursive -+install-exec: install-exec-recursive -+install-data: install-data-recursive -+uninstall: uninstall-recursive -+ -+install-am: all-am -+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -+ -+installcheck: installcheck-recursive -+install-strip: -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+mostlyclean-generic: -+ -+clean-generic: -+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) -+ -+distclean-generic: -+ -rm -f $(CONFIG_CLEAN_FILES) -+ -+maintainer-clean-generic: -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+clean: clean-recursive -+ -+clean-am: clean-generic clean-libtool mostlyclean-am -+ -+distclean: distclean-recursive -+ -rm -f $(am__CONFIG_DISTCLEAN_FILES) -+ -rm -f Makefile -+distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \ -+ distclean-tags -+ -+dvi: dvi-recursive -+ -+dvi-am: -+ -+info: info-recursive -+ -+info-am: -+ -+install-data-am: -+ -+install-exec-am: -+ -+install-info: install-info-recursive -+ -+install-man: -+ -+installcheck-am: -+ -+maintainer-clean: maintainer-clean-recursive -+ -rm -f $(am__CONFIG_DISTCLEAN_FILES) -+ -rm -rf $(top_srcdir)/autom4te.cache -+ -rm -f Makefile -+maintainer-clean-am: distclean-am maintainer-clean-generic -+ -+mostlyclean: mostlyclean-recursive -+ -+mostlyclean-am: mostlyclean-generic mostlyclean-libtool -+ -+pdf: pdf-recursive -+ -+pdf-am: -+ -+ps: ps-recursive -+ -+ps-am: -+ -+uninstall-am: uninstall-info-am -+ -+uninstall-info: uninstall-info-recursive -+ -+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ -+ clean-generic clean-libtool clean-recursive ctags \ -+ ctags-recursive dist dist-all dist-gzip distcheck distclean \ -+ distclean-generic distclean-hdr distclean-libtool \ -+ distclean-recursive distclean-tags distcleancheck distdir \ -+ distuninstallcheck dvi dvi-am dvi-recursive info info-am \ -+ info-recursive install install-am install-data install-data-am \ -+ install-data-recursive install-exec install-exec-am \ -+ install-exec-recursive install-info install-info-am \ -+ install-info-recursive install-man install-recursive \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am installdirs-recursive maintainer-clean \ -+ maintainer-clean-generic maintainer-clean-recursive mostlyclean \ -+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ -+ pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ -+ tags-recursive uninstall uninstall-am uninstall-info-am \ -+ uninstall-info-recursive uninstall-recursive -+ -+ -+# This is just so that the linking is done early. -+config.h: $(linked_sources) -+ -+linked_include_sources: -+ cd include; $(MAKE) link_sources -+ echo timestamp > linked_include_sources -+ -+linked_client_sources: @linked_client_targets@ -+ cd client; $(MAKE) link_sources -+ echo timestamp > linked_client_sources -+ -+linked_libmysql_sources: -+ cd libmysql; $(MAKE) link_sources -+ echo timestamp > linked_libmysql_sources -+ -+linked_libmysql_r_sources: linked_libmysql_sources -+ cd libmysql_r; $(MAKE) link_sources -+ echo timestamp > linked_libmysql_r_sources -+ -+linked_libmysqld_sources: -+ cd libmysqld; $(MAKE) link_sources -+ echo timestamp > linked_libmysqld_sources -+ -+linked_libmysqldex_sources: -+ cd libmysqld/examples; $(MAKE) link_sources -+ echo timestamp > linked_libmysqldex_sources -+ -+linked_netware_sources: -+ cd @netware_dir@; $(MAKE) link_sources -+ echo timestamp > linked_netware_sources -+ -+#avoid recursive make calls in sql directory -+linked_server_sources: -+ cd sql; rm -f mini_client_errors.c;@LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c -+ echo timestamp > linked_server_sources -+ -+# Create permission databases -+init-db: all -+ $(top_builddir)/scripts/mysql_install_db -+ -+bin-dist: all -+ $(top_builddir)/scripts/make_binary_distribution @MAKE_BINARY_DISTRIBUTION_OPTIONS@ -+ -+# Remove BK's "SCCS" subdirectories from source distribution -+dist-hook: -+ rm -rf `find $(distdir) -type d -name SCCS` -+ -+tags: -+ support-files/build-tags -+.PHONY: init-db bin-dist -+ -+# Test installation -+ -+test: -+ cd mysql-test ; ./mysql-test-run -+# Tell versions [3.59,3.63) of GNU make to not export all variables. -+# Otherwise a system limit (for SysV at least) may be exceeded. -+.NOEXPORT: diff --git a/debian/patches/21_init__openquery_configtest.dpatch b/debian/patches/21_init__openquery_configtest.dpatch deleted file mode 100644 index c76e98d6ee6..00000000000 --- a/debian/patches/21_init__openquery_configtest.dpatch +++ /dev/null @@ -1,33 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 35_init__openquery_configtest.dpatch by <me@cafuego.net> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: init__openquery_configtest.dpatch - -@DPATCH@ - ---- old/debian/mysql-server-5.0.mysql.init.orig 2008-12-19 12:03:30.379898336 +1100 -+++ new/debian/mysql-server-5.0.mysql.init 2008-12-19 12:04:46.660451093 +1100 -@@ -182,8 +182,21 @@ - fi - ;; - -+ 'configtest') -+ log_daemon_msg "Testing MySQL configuration" "syntax" -+ set +e -+ help_out=`/usr/sbin/mysqld --help 2>&1`; r=$? -+ set -e -+ if [ "$r" -ne 0 ]; then -+ log_failure_msg "$help_out" -+ log_failure_msg "There are syntax errors in the server configuration. Please fix them!" -+ fi -+ log_end_msg $r -+ exit $r -+ ;; -+ - *) -- echo "Usage: $SELF start|stop|restart|reload|force-reload|status" -+ echo "Usage: $SELF start|stop|restart|reload|force-reload|status|configtest" - exit 1 - ;; - esac 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 index 183212ef678..a961cfce8a0 100755 --- a/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch +++ b/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch @@ -27,10 +27,10 @@ -- 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; -@@ -48,9 +38,6 @@ REPLACE INTO tmp_user_nopasswd VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y' - REPLACE INTO tmp_user_nopasswd VALUES ('::1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N', '', 0); - -- More secure root account using unix sucket auth. - INSERT INTO tmp_user_socket VALUES ('localhost',IFNULL(@auth_root_socket, 'root'),'','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'unix_socket','','N', 'N','', 0); +@@ -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'; diff --git a/debian/patches/44_scripts__mysql_config__libs.dpatch b/debian/patches/44_scripts__mysql_config__libs.dpatch deleted file mode 100755 index c06275fdef3..00000000000 --- a/debian/patches/44_scripts__mysql_config__libs.dpatch +++ /dev/null @@ -1,24 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 99-unnamed.dpatch by <ch@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Removes unnecessary library dependencies. See #390692 - -@DPATCH@ -diff -Nur mysql-dfsg-5.1-5.1.31.orig/scripts/mysql_config.sh mysql-dfsg-5.1-5.1.31/scripts/mysql_config.sh ---- mysql-dfsg-5.1-5.1.31.orig/scripts/mysql_config.sh 2009-01-19 17:30:55.000000000 +0100 -+++ mysql-dfsg-5.1-5.1.31/scripts/mysql_config.sh 2009-02-08 17:17:48.000000000 +0100 -@@ -106,10 +106,10 @@ - - # Create options - # We intentionally add a space to the beginning and end of lib strings, simplifies replace later --libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" -+libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient" - libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " --libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " --embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " -+libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @CLIENT_LIBS@ @openssl_libs@ " -+embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @WRAPLIBS@ @openssl_libs@ " - - if [ -r "$pkglibdir/libmygcc.a" ]; then - # When linking against the static library with a different version of GCC diff --git a/debian/patches/60_zlib_innodb_workaround.dpatch b/debian/patches/60_zlib_innodb_workaround.dpatch deleted file mode 100644 index e8a496a5866..00000000000 --- a/debian/patches/60_zlib_innodb_workaround.dpatch +++ /dev/null @@ -1,31 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 60_zlib_innodb_workaround.dpatch by Norbert Tretkowski <nobse@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: http://bugs.mysql.com/bug.php?id=47495 - -@DPATCH@ -diff -Nur mysql-dfsg-5.1-5.1.39.orig/mysql-test/suite/innodb/r/innodb-zip.result mysql-dfsg-5.1-5.1.39/mysql-test/suite/innodb/r/innodb-zip.result ---- mysql-dfsg-5.1-5.1.39.orig/mysql-test/suite/innodb/r/innodb-zip.result 2009-09-04 19:04:38.000000000 +0200 -+++ mysql-dfsg-5.1-5.1.39/mysql-test/suite/innodb/r/innodb-zip.result 2009-09-28 16:01:33.000000000 +0200 -@@ -141,7 +141,7 @@ - CREATE TABLE t1(c TEXT, PRIMARY KEY (c(440))) - ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII; - ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 8126. You have to change some columns to TEXT or BLOBs --CREATE TABLE t1(c TEXT, PRIMARY KEY (c(439))) -+CREATE TABLE t1(c TEXT, PRIMARY KEY (c(438))) - ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII; - INSERT INTO t1 VALUES(REPEAT('A',512)),(REPEAT('B',512)); - DROP TABLE t1; -diff -Nur mysql-dfsg-5.1-5.1.39.orig/mysql-test/suite/innodb/t/innodb-zip.test mysql-dfsg-5.1-5.1.39/mysql-test/suite/innodb/t/innodb-zip.test ---- mysql-dfsg-5.1-5.1.39.orig/mysql-test/suite/innodb/t/innodb-zip.test 2009-09-04 19:04:37.000000000 +0200 -+++ mysql-dfsg-5.1-5.1.39/mysql-test/suite/innodb/t/innodb-zip.test 2009-09-28 16:01:22.000000000 +0200 -@@ -106,7 +106,7 @@ - --error ER_TOO_BIG_ROWSIZE - CREATE TABLE t1(c TEXT, PRIMARY KEY (c(440))) - ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII; --CREATE TABLE t1(c TEXT, PRIMARY KEY (c(439))) -+CREATE TABLE t1(c TEXT, PRIMARY KEY (c(438))) - ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII; - INSERT INTO t1 VALUES(REPEAT('A',512)),(REPEAT('B',512)); - DROP TABLE t1; diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in index 029c650fe7a..be16669a512 100644 --- a/debian/po/POTFILES.in +++ b/debian/po/POTFILES.in @@ -1 +1 @@ -[type: gettext/rfc822deb] mariadb-server-10.1.templates +[type: gettext/rfc822deb] mariadb-server-10.2.templates diff --git a/debian/po/ar.po b/debian/po/ar.po index c9009069ee5..3b11740a365 100644 --- a/debian/po/ar.po +++ b/debian/po/ar.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: templates\n" -"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"Report-Msgid-Bugs-To: mariadb-10.2@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" "Language-Team: Arabic <support@arabeyes.org>\n" @@ -25,50 +25,45 @@ msgstr "" ": n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n" ": n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "Really proceed with downgrade?" -msgstr "هل فعلاً تريد التثبيط؟" +#: ../mariadb-server-10.2.templates:2001 +msgid "The old data directory will be saved at new location" +msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." -msgstr "هناك ملف مسمى /var/lib/mysql/debian-*.flag موجود على هذا النظام." +#: ../mariadb-server-10.2.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 " +"upgraded (or downgraded)." +msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -#, fuzzy -#| msgid "" -#| "Such file is an indication that a mariadb-server package with a higher " -#| "version has been installed earlier." +#: ../mariadb-server-10.2.templates:2001 msgid "" -"Such a file is an indication that a mariadb-server package with a higher " -"version has been installed previously." +"Therefore the previous data directory will be renamed to /var/lib/mysql-* " +"and a new data directory will be initialized at /var/lib/mysql." msgstr "" -"هذا الملف دلالة على أن نسخة أحدث من حزمة mariadb-server تم تثبيتها مسبقاً." -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"There is no guarantee that the version you're currently installing will be " -"able to use the current databases." +"Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" -"ليست هناك أية ضمانة أن النسخة التي تقوم بتثبيتها ستكون قادرة على استخدام " -"قواعد البيانات الحالية." #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "Important note for NIS/YP users" msgstr "ملاحظة هامة لمستخدمي NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -76,7 +71,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 #, fuzzy #| msgid "" #| "You should also check the permissions and the owner of the /var/lib/mysql " @@ -88,13 +83,13 @@ msgstr "عليك أيضاً أن تقوم بالتأكد من صلاحيات م #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "Remove all MariaDB databases?" msgstr "إزالة جميع قواعد بيانات MariaDB؟" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -102,7 +97,7 @@ msgstr "الدليل /var/lib/mysql الذي يحتوي قواعد بيانات #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.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,31 +106,15 @@ msgstr "" "إن كنت تقوم بإزالة حزمة MariaDB كي تقوم لاحقاً بتثبيت نسخة أحدث أو إن كانت " "حزمة mariadb-server مختلفة تستخدمها، فيجب إبقاء البيانات." -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "تشغيل خادم MariaDB عند الإقلاع؟" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "" -"The MariaDB server can be launched automatically at boot time or manually " -"with the '/etc/init.d/mysql start' command." -msgstr "" -"يمكن تشغيل خادم MariaDB آلياً وقت الإقلاع أو يدوياً باستخدام الأمر '/etc/init." -"d/mysql start'." - #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "New password for the MariaDB \"root\" user:" msgstr "كلمة المرور الجديدة لمستخد \"root\" الخاص بـMariaDB:" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -145,7 +124,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 #, fuzzy #| msgid "If that field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed." @@ -153,7 +132,7 @@ msgstr "إن ترك الحقل فارغاً، فلن يتم تغيير كلمة #. Type: password #. Description -#: ../mariadb-server-10.1.templates:7001 +#: ../mariadb-server-10.2.templates:6001 #, fuzzy #| msgid "New password for the MariaDB \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -161,13 +140,13 @@ msgstr "كلمة المرور الجديدة لمستخد \"root\" الخاص ب #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "تعذر تعيين كلمة مرور للمستخدم \"root\" الخاص بـMariaDB." #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -179,7 +158,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 #, fuzzy #| msgid "" #| "You should check the account's password after tha package installation." @@ -188,30 +167,63 @@ msgstr "يجب عليك التحقق من كلمة مرور الحساب عقب #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.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.1/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " "more information." msgstr "" -"الرجاء قراءة الملف /usr/share/doc/mariadb-server-10.1/README.Debian للمزيد من " -"المعلومات." +"الرجاء قراءة الملف /usr/share/doc/mariadb-server-10.2/README.Debian للمزيد " +"من المعلومات." #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" +#~ msgid "Really proceed with downgrade?" +#~ msgstr "هل فعلاً تريد التثبيط؟" + +#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." +#~ msgstr "هناك ملف مسمى /var/lib/mysql/debian-*.flag موجود على هذا النظام." + +#, fuzzy +#~| msgid "" +#~| "Such file is an indication that a mariadb-server package with a higher " +#~| "version has been installed earlier." +#~ msgid "" +#~ "Such a file is an indication that a mariadb-server package with a higher " +#~ "version has been installed previously." +#~ msgstr "" +#~ "هذا الملف دلالة على أن نسخة أحدث من حزمة mariadb-server تم تثبيتها مسبقاً." + +#~ msgid "" +#~ "There is no guarantee that the version you're currently installing will " +#~ "be able to use the current databases." +#~ msgstr "" +#~ "ليست هناك أية ضمانة أن النسخة التي تقوم بتثبيتها ستكون قادرة على استخدام " +#~ "قواعد البيانات الحالية." + +#~ msgid "Start the MariaDB server on boot?" +#~ msgstr "تشغيل خادم MariaDB عند الإقلاع؟" + +#~ msgid "" +#~ "The MariaDB server can be launched automatically at boot time or manually " +#~ "with the '/etc/init.d/mysql start' command." +#~ msgstr "" +#~ "يمكن تشغيل خادم MariaDB آلياً وقت الإقلاع أو يدوياً باستخدام الأمر '/etc/" +#~ "init.d/mysql start'." + #~ msgid "" #~ "To use MariaDB, the following entries for users and groups should be " #~ "added to the system:" diff --git a/debian/po/ca.po b/debian/po/ca.po index f2a6a3dc0bf..107741fc003 100644 --- a/debian/po/ca.po +++ b/debian/po/ca.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-4.1\n" -"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"Report-Msgid-Bugs-To: mariadb-10.2@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" "Language-Team: Debian L10n Catalan <debian-l10n-catalan@lists.debian.org>\n" @@ -15,37 +15,39 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "Really proceed with downgrade?" +#: ../mariadb-server-10.2.templates:2001 +msgid "The old data directory will be saved at new location" msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." +#: ../mariadb-server-10.2.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 " +"upgraded (or downgraded)." msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"Such a file is an indication that a mariadb-server package with a higher " -"version has been installed previously." +"Therefore the previous data directory will be renamed to /var/lib/mysql-* " +"and a new data directory will be initialized at /var/lib/mysql." msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"There is no guarantee that the version you're currently installing will be " -"able to use the current databases." +"Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 #, fuzzy #| msgid "Important note for NIS/YP users!" msgid "Important note for NIS/YP users" @@ -53,7 +55,7 @@ msgstr "Nota important pels usuaris de NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -61,7 +63,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -69,13 +71,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "Remove all MariaDB databases?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -83,42 +85,22 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " "the data should be kept." msgstr "" -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -#, fuzzy -#| msgid "Should MySQL start on boot?" -msgid "Start the MariaDB server on boot?" -msgstr "Voleu que el MariaDB s'inici a l'arrencada ?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -#, fuzzy -msgid "" -"The MariaDB server can be launched automatically at boot time or manually " -"with the '/etc/init.d/mysql start' command." -msgstr "" -"El MariaDB es pot executar a l'arrencada o noms si executeu manualment '/" -"etc/init.d/mysql start'. Seleccioneu 's' si voleu que s'inicialitzi " -"automticament." - #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "New password for the MariaDB \"root\" user:" msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -126,25 +108,25 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "If this field is left blank, the password will not be changed." msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:7001 +#: ../mariadb-server-10.2.templates:6001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -153,31 +135,45 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "You should check the account's password after the package installation." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "" -"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " "more information." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" #, fuzzy +#~| msgid "Should MySQL start on boot?" +#~ msgid "Start the MariaDB server on boot?" +#~ msgstr "Voleu que el MariaDB s'inici a l'arrencada ?" + +#, fuzzy +#~ msgid "" +#~ "The MariaDB server can be launched automatically at boot time or manually " +#~ "with the '/etc/init.d/mysql start' command." +#~ msgstr "" +#~ "El MariaDB es pot executar a l'arrencada o noms si executeu manualment '/" +#~ "etc/init.d/mysql start'. Seleccioneu 's' si voleu que s'inicialitzi " +#~ "automticament." + +#, fuzzy #~ msgid "" #~ "To use mysql you must install an equivalent user and group to the " #~ "following and ensure yourself that /var/lib/mysql has the right " diff --git a/debian/po/cs.po b/debian/po/cs.po index 259bc9a96f8..dab52d819f9 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1\n" -"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"Report-Msgid-Bugs-To: mariadb-10.2@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" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" @@ -24,50 +24,45 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "Really proceed with downgrade?" -msgstr "Opravdu pokračovat v degradaci?" +#: ../mariadb-server-10.2.templates:2001 +msgid "The old data directory will be saved at new location" +msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." -msgstr "V systému existuje soubor /var/lib/mysql/debian-*.flag." +#: ../mariadb-server-10.2.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 " +"upgraded (or downgraded)." +msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -#, fuzzy -#| msgid "" -#| "Such file is an indication that a mariadb-server package with a higher " -#| "version has been installed earlier." +#: ../mariadb-server-10.2.templates:2001 msgid "" -"Such a file is an indication that a mariadb-server package with a higher " -"version has been installed previously." +"Therefore the previous data directory will be renamed to /var/lib/mysql-* " +"and a new data directory will be initialized at /var/lib/mysql." msgstr "" -"To znamená, že již byl nainstalován balík mariadb-server s vyšší verzí." -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"There is no guarantee that the version you're currently installing will be " -"able to use the current databases." +"Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" -"Neexistuje žádná záruka, že momentálně instalovaná verze bude umět pracovat " -"se stávajícími databázemi." #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.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.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -75,7 +70,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 #, fuzzy #| msgid "" #| "You should also check the permissions and the owner of the /var/lib/mysql " @@ -88,13 +83,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Odstranit všechny MariaDB databáze?" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -104,7 +99,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.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, " @@ -114,31 +109,15 @@ msgstr "" "MariaDB, nebo pokud tato data souběžně využívá jiný balík mariadb-server, " "měli byste data ponechat." -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "Spustit MariaDB server při startu systému?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "" -"The MariaDB server can be launched automatically at boot time or manually " -"with the '/etc/init.d/mysql start' command." -msgstr "" -"MariaDB se může spouštět automaticky při startu systému, nebo ručně příkazem " -"'/etc/init.d/mysql start'." - #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "New password for the MariaDB \"root\" user:" msgstr "Nové heslo MariaDB uživatele \"root\":" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -148,7 +127,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 #, fuzzy #| msgid "If that field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed." @@ -156,7 +135,7 @@ msgstr "Ponecháte-li pole prázdné, heslo se nezmění." #. Type: password #. Description -#: ../mariadb-server-10.1.templates:7001 +#: ../mariadb-server-10.2.templates:6001 #, fuzzy #| msgid "New password for the MySQL \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -164,13 +143,13 @@ msgstr "Nové heslo MariaDB uživatele \"root\":" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "Nelze nastavit heslo MariaDB uživatele \"root\"" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -182,7 +161,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 #, fuzzy #| msgid "" #| "You should check the account's password after tha package installation." @@ -191,29 +170,62 @@ msgstr "Po instalaci balíku byste měli heslo ověřit." #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.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.1/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " "more information." msgstr "" -"Více informací naleznete v /usr/share/doc/mariadb-server-10.1/README.Debian." +"Více informací naleznete v /usr/share/doc/mariadb-server-10.2/README.Debian." #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" +#~ msgid "Really proceed with downgrade?" +#~ msgstr "Opravdu pokračovat v degradaci?" + +#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." +#~ msgstr "V systému existuje soubor /var/lib/mysql/debian-*.flag." + +#, fuzzy +#~| msgid "" +#~| "Such file is an indication that a mariadb-server package with a higher " +#~| "version has been installed earlier." +#~ msgid "" +#~ "Such a file is an indication that a mariadb-server package with a higher " +#~ "version has been installed previously." +#~ msgstr "" +#~ "To znamená, že již byl nainstalován balík mariadb-server s vyšší verzí." + +#~ msgid "" +#~ "There is no guarantee that the version you're currently installing will " +#~ "be able to use the current databases." +#~ msgstr "" +#~ "Neexistuje žádná záruka, že momentálně instalovaná verze bude umět " +#~ "pracovat se stávajícími databázemi." + +#~ msgid "Start the MariaDB server on boot?" +#~ msgstr "Spustit MariaDB server při startu systému?" + +#~ msgid "" +#~ "The MariaDB server can be launched automatically at boot time or manually " +#~ "with the '/etc/init.d/mysql start' command." +#~ msgstr "" +#~ "MariaDB se může spouštět automaticky při startu systému, nebo ručně " +#~ "příkazem '/etc/init.d/mysql start'." + #~ msgid "" #~ "To use MariaDB, the following entries for users and groups should be " #~ "added to the system:" diff --git a/debian/po/da.po b/debian/po/da.po index 8abb89ebbd4..80259ba6a34 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-4.1\n" -"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"Report-Msgid-Bugs-To: mariadb-10.2@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" "Language-Team: Danish\n" @@ -25,52 +25,45 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "Really proceed with downgrade?" -msgstr "nsker du virkelig at fortstte nedgraderingen?" +#: ../mariadb-server-10.2.templates:2001 +msgid "The old data directory will be saved at new location" +msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." +#: ../mariadb-server-10.2.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 " +"upgraded (or downgraded)." msgstr "" -"Der er en fil med navnet /var/lib/mysql/debian-*.flag p dette system." -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -#, fuzzy -#| msgid "" -#| "Such file is an indication that a mariadb-server package with a higher " -#| "version has been installed earlier." +#: ../mariadb-server-10.2.templates:2001 msgid "" -"Such a file is an indication that a mariadb-server package with a higher " -"version has been installed previously." +"Therefore the previous data directory will be renamed to /var/lib/mysql-* " +"and a new data directory will be initialized at /var/lib/mysql." msgstr "" -"Sdan en fil tyder p at der tidligere har vret installeret en hjere " -"version af mariadb-server-pakken." -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"There is no guarantee that the version you're currently installing will be " -"able to use the current databases." +"Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" -"Det kan ikke garanteres at den version, du er ved at installere, kan benytte " -"data fra de eksisterende databaser." #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "Important note for NIS/YP users" msgstr "Vigtig oplysning til NIS/YP-brugere" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -78,7 +71,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 #, fuzzy #| msgid "" #| "You should also check the permissions and the owner of the /var/lib/mysql " @@ -91,13 +84,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Fjern alle MariaDB-databaser?" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -107,7 +100,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.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, " @@ -117,31 +110,15 @@ msgstr "" "eller hvis en anden mariadb-server-pakke allerede benytter den, br dataene " "bevares." -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "Start MariaDB-serveren under systemopstart?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "" -"The MariaDB server can be launched automatically at boot time or manually " -"with the '/etc/init.d/mysql start' command." -msgstr "" -"MariaDB-serveren kan enten startes op automatisk under systemopstarten, " -"eller manuelt med kommandoen '/etc/init.d/mysql start'." - #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "New password for the MariaDB \"root\" user:" msgstr "Ny adgangskode for MariaDB's \"root\"-bruger:" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -151,7 +128,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 #, fuzzy #| msgid "If that field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed." @@ -159,7 +136,7 @@ msgstr "Hvis du lader dette felt st tomt, vil adgangskoden ikke blive ndret." #. Type: password #. Description -#: ../mariadb-server-10.1.templates:7001 +#: ../mariadb-server-10.2.templates:6001 #, fuzzy #| msgid "New password for the MySQL \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -167,13 +144,13 @@ msgstr "Ny adgangskode for MariaDB's \"root\"-bruger:" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.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.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -186,36 +163,71 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.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.1.templates:8001 +#: ../mariadb-server-10.2.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.1/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " "more information." msgstr "" -"Se filen /usr/share/doc/mariadb-server-10.1/README.Debian for yderligere " +"Se filen /usr/share/doc/mariadb-server-10.2/README.Debian for yderligere " "oplysninger." #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" +#~ msgid "Really proceed with downgrade?" +#~ msgstr "nsker du virkelig at fortstte nedgraderingen?" + +#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." +#~ msgstr "" +#~ "Der er en fil med navnet /var/lib/mysql/debian-*.flag p dette system." + +#, fuzzy +#~| msgid "" +#~| "Such file is an indication that a mariadb-server package with a higher " +#~| "version has been installed earlier." +#~ msgid "" +#~ "Such a file is an indication that a mariadb-server package with a higher " +#~ "version has been installed previously." +#~ msgstr "" +#~ "Sdan en fil tyder p at der tidligere har vret installeret en hjere " +#~ "version af mariadb-server-pakken." + +#~ msgid "" +#~ "There is no guarantee that the version you're currently installing will " +#~ "be able to use the current databases." +#~ msgstr "" +#~ "Det kan ikke garanteres at den version, du er ved at installere, kan " +#~ "benytte data fra de eksisterende databaser." + +#~ msgid "Start the MariaDB server on boot?" +#~ msgstr "Start MariaDB-serveren under systemopstart?" + +#~ msgid "" +#~ "The MariaDB server can be launched automatically at boot time or manually " +#~ "with the '/etc/init.d/mysql start' command." +#~ msgstr "" +#~ "MariaDB-serveren kan enten startes op automatisk under systemopstarten, " +#~ "eller manuelt med kommandoen '/etc/init.d/mysql start'." + #~ msgid "" #~ "To use MariaDB, the following entries for users and groups should be " #~ "added to the system:" diff --git a/debian/po/de.po b/debian/po/de.po index 6147b55903e..4a0ec4282d4 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1_5.1.37-1_de\n" -"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"Report-Msgid-Bugs-To: mariadb-10.2@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" "Language-Team: german <debian-l10n-german@lists.debian.org>\n" @@ -27,49 +27,45 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "Really proceed with downgrade?" -msgstr "Möchten Sie wirklich eine ältere Version einspielen?" +#: ../mariadb-server-10.2.templates:2001 +msgid "The old data directory will be saved at new location" +msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." +#: ../mariadb-server-10.2.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 " +"upgraded (or downgraded)." msgstr "" -"Auf diesem System existiert eine Datei mit dem Namen /var/lib/mysql/debian-*." -"flag" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"Such a file is an indication that a mariadb-server package with a higher " -"version has been installed previously." +"Therefore the previous data directory will be renamed to /var/lib/mysql-* " +"and a new data directory will be initialized at /var/lib/mysql." msgstr "" -"Diese Datei ist ein Hinweis darauf, dass früher ein MariaDB-Server-Paket mit " -"einer höheren Version installiert war." -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"There is no guarantee that the version you're currently installing will be " -"able to use the current databases." +"Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" -"Es kann nicht garantiert werden, dass die gegenwärtig zu installierende " -"Version dessen Daten benutzen kann." #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "Important note for NIS/YP users" msgstr "Wichtige Anmerkung für NIS/YP-Benutzer!" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -79,7 +75,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -89,13 +85,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Alle MariaDB-Datenbanken entfernen?" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -105,7 +101,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.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, " @@ -115,31 +111,15 @@ msgstr "" "ein anderes mariadb-server-Paket dieses bereits benutzt, sollten die Daten " "behalten werden." -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "Soll der MariaDB-Server automatisch beim Booten starten?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "" -"The MariaDB server can be launched automatically at boot time or manually " -"with the '/etc/init.d/mysql start' command." -msgstr "" -"Der MariaDB-Dienst kann entweder automatisch beim Systemstart oder manuell " -"durch Eingabe des Befehls »/etc/init.d/mysql start« gestartet werden." - #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "New password for the MariaDB \"root\" user:" msgstr "Neues Passwort für den MariaDB »root«-Benutzer:" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -149,25 +129,25 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "If this field is left blank, the password will not be changed." msgstr "Wenn dieses Feld freigelassen wird, wird das Passwort nicht geändert." #. Type: password #. Description -#: ../mariadb-server-10.1.templates:7001 +#: ../mariadb-server-10.2.templates:6001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "Wiederholen Sie das Passwort für den MariaDB-»root«-Benutzer:" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "Konnte für den MariaDB-»root«-Benutzer kein Passwort setzen" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -180,7 +160,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "You should check the account's password after the package installation." msgstr "" "Sie sollten das Passwort des administrativen Benutzers nach der " @@ -188,13 +168,13 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.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.1/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " "more information." msgstr "" "Für weitere Informationen lesen Sie /usr/share/doc/mariadb-server-5.1/README." @@ -202,15 +182,47 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "Password input error" msgstr "Passwort-Eingabefehler" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" "Die beiden von Ihnen eingegebenen Passwörter sind nicht identisch. Bitte " "erneut versuchen." +#~ msgid "Really proceed with downgrade?" +#~ msgstr "Möchten Sie wirklich eine ältere Version einspielen?" + +#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." +#~ msgstr "" +#~ "Auf diesem System existiert eine Datei mit dem Namen /var/lib/mysql/" +#~ "debian-*.flag" + +#~ msgid "" +#~ "Such a file is an indication that a mariadb-server package with a higher " +#~ "version has been installed previously." +#~ msgstr "" +#~ "Diese Datei ist ein Hinweis darauf, dass früher ein MariaDB-Server-Paket " +#~ "mit einer höheren Version installiert war." + +#~ msgid "" +#~ "There is no guarantee that the version you're currently installing will " +#~ "be able to use the current databases." +#~ msgstr "" +#~ "Es kann nicht garantiert werden, dass die gegenwärtig zu installierende " +#~ "Version dessen Daten benutzen kann." + +#~ msgid "Start the MariaDB server on boot?" +#~ msgstr "Soll der MariaDB-Server automatisch beim Booten starten?" + +#~ msgid "" +#~ "The MariaDB server can be launched automatically at boot time or manually " +#~ "with the '/etc/init.d/mysql start' command." +#~ msgstr "" +#~ "Der MariaDB-Dienst kann entweder automatisch beim Systemstart oder " +#~ "manuell durch Eingabe des Befehls »/etc/init.d/mysql start« gestartet " +#~ "werden." diff --git a/debian/po/es.po b/debian/po/es.po index e0b72b87737..ed2cf509dbb 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -40,8 +40,8 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1_5.0.24-3\n" -"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"Report-Msgid-Bugs-To: mariadb-10.2@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" "Language-Team: Debian l10 Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -50,52 +50,45 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "Really proceed with downgrade?" -msgstr "¿Desea realmente continuar con la desactualización?" +#: ../mariadb-server-10.2.templates:2001 +msgid "The old data directory will be saved at new location" +msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." +#: ../mariadb-server-10.2.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 " +"upgraded (or downgraded)." msgstr "" -"Existe un archivo con el nombre /var/lib/mysql/debian-*.flag en este sistema." -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -#, fuzzy -#| msgid "" -#| "Such file is an indication that a mariadb-server package with a higher " -#| "version has been installed earlier." +#: ../mariadb-server-10.2.templates:2001 msgid "" -"Such a file is an indication that a mariadb-server package with a higher " -"version has been installed previously." +"Therefore the previous data directory will be renamed to /var/lib/mysql-* " +"and a new data directory will be initialized at /var/lib/mysql." msgstr "" -"Este fichero indica que se instaló previamente una versión superior del " -"paquete mariadb-server." -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"There is no guarantee that the version you're currently installing will be " -"able to use the current databases." +"Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" -"No se puede garantizar que la versión que está instalando pueda usar la base " -"de datos actual." #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "Important note for NIS/YP users" msgstr "Nota importante para los usuarios de NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -103,7 +96,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 #, fuzzy #| msgid "" #| "You should also check the permissions and the owner of the /var/lib/mysql " @@ -117,13 +110,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "Remove all MariaDB databases?" msgstr "¿Desea eliminar todas las bases de datos MariaDB?" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -133,7 +126,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.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, " @@ -143,31 +136,15 @@ msgstr "" "MariaDB más reciente o si hay un paquete «mariadb-server» distinto que los " "está utilizando." -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "¿Debería ejecutarse el servidor MariaDB al iniciarse el sistema?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "" -"The MariaDB server can be launched automatically at boot time or manually " -"with the '/etc/init.d/mysql start' command." -msgstr "" -"El servidor MariaDB puede iniciarse en el momento de arranque del sistema o " -"manualmente si escribe la orden «/etc/init.d/mysql start»." - #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "New password for the MariaDB \"root\" user:" msgstr "Nueva contraseña para el usuario «root» de MariaDB:" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -177,7 +154,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 #, fuzzy #| msgid "If that field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed." @@ -185,7 +162,7 @@ msgstr "No se modificará la contraseña si deja el espacio en blanco." #. Type: password #. Description -#: ../mariadb-server-10.1.templates:7001 +#: ../mariadb-server-10.2.templates:6001 #, fuzzy #| msgid "New password for the MySQL \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -193,13 +170,13 @@ msgstr "Nueva contraseña para el usuario «root» de MariaDB:" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "No se pudo fijar la contraseña para el usuario «root» de MariaDB" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -212,7 +189,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "You should check the account's password after the package installation." msgstr "" "Debería comprobar la contraseña de la cuenta después de la instalación del " @@ -220,30 +197,66 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.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.1/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " "more information." msgstr "" -"Consulte /usr/share/doc/mariadb-server-10.1/README.Debian para más " +"Consulte /usr/share/doc/mariadb-server-10.2/README.Debian para más " "información." #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" +#~ msgid "Really proceed with downgrade?" +#~ msgstr "¿Desea realmente continuar con la desactualización?" + +#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." +#~ msgstr "" +#~ "Existe un archivo con el nombre /var/lib/mysql/debian-*.flag en este " +#~ "sistema." + +#, fuzzy +#~| msgid "" +#~| "Such file is an indication that a mariadb-server package with a higher " +#~| "version has been installed earlier." +#~ msgid "" +#~ "Such a file is an indication that a mariadb-server package with a higher " +#~ "version has been installed previously." +#~ msgstr "" +#~ "Este fichero indica que se instaló previamente una versión superior del " +#~ "paquete mariadb-server." + +#~ msgid "" +#~ "There is no guarantee that the version you're currently installing will " +#~ "be able to use the current databases." +#~ msgstr "" +#~ "No se puede garantizar que la versión que está instalando pueda usar la " +#~ "base de datos actual." + +#~ msgid "Start the MariaDB server on boot?" +#~ msgstr "¿Debería ejecutarse el servidor MariaDB al iniciarse el sistema?" + +#~ msgid "" +#~ "The MariaDB server can be launched automatically at boot time or manually " +#~ "with the '/etc/init.d/mysql start' command." +#~ msgstr "" +#~ "El servidor MariaDB puede iniciarse en el momento de arranque del sistema " +#~ "o manualmente si escribe la orden «/etc/init.d/mysql start»." + #~ msgid "" #~ "To use MariaDB, the following entries for users and groups should be " #~ "added to the system:" diff --git a/debian/po/eu.po b/debian/po/eu.po index 8f1ae0c8ecd..22b0f337fd1 100644 --- a/debian/po/eu.po +++ b/debian/po/eu.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: eu\n" -"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"Report-Msgid-Bugs-To: mariadb-10.2@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" "Language-Team: Euskara <debian-l10n-eu@lists.debian.org>\n" @@ -18,51 +18,45 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.4\n" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "Really proceed with downgrade?" -msgstr "Benetan bertsio zaharragora itzuli nahi duzu?" +#: ../mariadb-server-10.2.templates:2001 +msgid "The old data directory will be saved at new location" +msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." -msgstr "Sisteman badago /var/lib/mysql/debian-*.flag izeneko fitxategi bat." +#: ../mariadb-server-10.2.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 " +"upgraded (or downgraded)." +msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -#, fuzzy -#| msgid "" -#| "Such file is an indication that a mariadb-server package with a higher " -#| "version has been installed earlier." +#: ../mariadb-server-10.2.templates:2001 msgid "" -"Such a file is an indication that a mariadb-server package with a higher " -"version has been installed previously." +"Therefore the previous data directory will be renamed to /var/lib/mysql-* " +"and a new data directory will be initialized at /var/lib/mysql." msgstr "" -"Fitxategi honek aurretik bertsio berriagoko mysql-zerbitzari pakete bat " -"instalatu dela adierazten du." -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"There is no guarantee that the version you're currently installing will be " -"able to use the current databases." +"Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" -"Ezin da ziurtatu instalatzen ari zaren bertsio honek dauden datubaseak " -"erabili ahal izango dituenik." #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "Important note for NIS/YP users" msgstr "NIS/YP erabiltzaileentzat ohar garrantzitsua" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -70,7 +64,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 #, fuzzy #| msgid "" #| "You should also check the permissions and the owner of the /var/lib/mysql " @@ -84,13 +78,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Ezabatu MariaDB datubase guztiak?" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -99,7 +93,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.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,31 +103,15 @@ msgstr "" "bazara, edo beste mariadb-server pakete bat berau erabiltzen ari bada, " "datuak mantendu egin beharko lirateke." -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "Abioan MariaDB zerbitzaria abiarazi?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "" -"The MariaDB server can be launched automatically at boot time or manually " -"with the '/etc/init.d/mysql start' command." -msgstr "" -"Sistema abioan MariaDB automatikoki abiarazi daiteke edo eskuz '/etc/init.d/" -"mysql start' eginaz." - #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "New password for the MariaDB \"root\" user:" msgstr "MariaDB \"root\" erabiltzailearen pasahitz berria:" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -143,7 +121,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 #, fuzzy #| msgid "If that field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed." @@ -151,19 +129,19 @@ msgstr "Eremua hau zurian utziaz gero ez da pasahitza aldatuko." #. Type: password #. Description -#: ../mariadb-server-10.1.templates:7001 +#: ../mariadb-server-10.2.templates:6001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "Errepikatu MariaDB \"root\" erabiltzailearen pasahitza:" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "Ezin da MariaDB \"root\" erabiltzailearen pasahitza ezarri" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -175,37 +153,71 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "You should check the account's password after the package installation." msgstr "" "Kontuaren pasahitza egiaztatu beharko zenuke paketea instalatu aurretik." #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 #, fuzzy #| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " +#| "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " "more information." msgstr "" -"Mesedez irakurri /usr/share/doc/mariadb-server-10.1/README.Debian fitxategia " +"Mesedez irakurri /usr/share/doc/mariadb-server-10.2/README.Debian fitxategia " "xehetasun gehiagorako." #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "Password input error" msgstr "Pasahitz sarrera errorea" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "Idatzi dituzun bi pasahitzak ez dira berdina. Mesedez saiatu berriz." +#~ msgid "Really proceed with downgrade?" +#~ msgstr "Benetan bertsio zaharragora itzuli nahi duzu?" + +#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." +#~ msgstr "Sisteman badago /var/lib/mysql/debian-*.flag izeneko fitxategi bat." + +#, fuzzy +#~| msgid "" +#~| "Such file is an indication that a mariadb-server package with a higher " +#~| "version has been installed earlier." +#~ msgid "" +#~ "Such a file is an indication that a mariadb-server package with a higher " +#~ "version has been installed previously." +#~ msgstr "" +#~ "Fitxategi honek aurretik bertsio berriagoko mysql-zerbitzari pakete bat " +#~ "instalatu dela adierazten du." + +#~ msgid "" +#~ "There is no guarantee that the version you're currently installing will " +#~ "be able to use the current databases." +#~ msgstr "" +#~ "Ezin da ziurtatu instalatzen ari zaren bertsio honek dauden datubaseak " +#~ "erabili ahal izango dituenik." + +#~ msgid "Start the MariaDB server on boot?" +#~ msgstr "Abioan MariaDB zerbitzaria abiarazi?" + +#~ msgid "" +#~ "The MariaDB server can be launched automatically at boot time or manually " +#~ "with the '/etc/init.d/mysql start' command." +#~ msgstr "" +#~ "Sistema abioan MariaDB automatikoki abiarazi daiteke edo eskuz '/etc/init." +#~ "d/mysql start' eginaz." + #~ msgid "" #~ "To use MariaDB, the following entries for users and groups should be " #~ "added to the system:" diff --git a/debian/po/fr.po b/debian/po/fr.po index 98d6740b7e2..cae8d7e903b 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" -"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"Report-Msgid-Bugs-To: mariadb-10.2@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" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -20,45 +20,45 @@ msgstr "" "X-Generator: Lokalize 0.3\n" "Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "Really proceed with downgrade?" -msgstr "Faut-il vraiment revenir à la version précédente ?" +#: ../mariadb-server-10.2.templates:2001 +msgid "The old data directory will be saved at new location" +msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." -msgstr "Un fichier /var/lib/mysql/debian-*.flag est présent sur ce système." +#: ../mariadb-server-10.2.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 " +"upgraded (or downgraded)." +msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"Such a file is an indication that a mariadb-server package with a higher " -"version has been installed previously." +"Therefore the previous data directory will be renamed to /var/lib/mysql-* " +"and a new data directory will be initialized at /var/lib/mysql." msgstr "" -"Cela indique qu'une version plus récente du paquet mariadb-server a été " -"précédemment installée." -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"There is no guarantee that the version you're currently installing will be " -"able to use the current databases." -msgstr "Il n'est pas garanti que cette version puisse en utiliser les données." +"Please manually export/import your data (e.g. with mysqldump) if needed." +msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "Important note for NIS/YP users" msgstr "Note importante pour les utilisateurs NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.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.1.templates:3001 +#: ../mariadb-server-10.2.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.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Faut-il supprimer toutes les bases de données MariaDB ?" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.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.1.templates:4001 +#: ../mariadb-server-10.2.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,31 +103,15 @@ msgstr "" "Si vous prévoyez d'installer une version plus récente de MariaDB ou si un " "autre paquet mariadb-server les utilise déjà, vous devriez les conserver." -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "Faut-il lancer MariaDB au démarrage ?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "" -"The MariaDB server can be launched automatically at boot time or manually " -"with the '/etc/init.d/mysql start' command." -msgstr "" -"MariaDB peut être lancé soit au démarrage, soit en entrant la commande « /" -"etc/init.d/mysql start »." - #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "New password for the MariaDB \"root\" user:" msgstr "Nouveau mot de passe du superutilisateur de MariaDB :" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -137,26 +121,26 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "If this field is left blank, the password will not be changed." msgstr "Si ce champ est laissé vide, le mot de passe ne sera pas changé." #. Type: password #. Description -#: ../mariadb-server-10.1.templates:7001 +#: ../mariadb-server-10.2.templates:6001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "Confirmation du mot de passe du superutilisateur de MariaDB :" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "" "Impossible de changer le mot de passe de l'utilisateur « root » de MariaDB" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -168,7 +152,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "You should check the account's password after the package installation." msgstr "" "Vous devriez vérifier le mot de passe de ce compte après l'installation du " @@ -176,32 +160,61 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 #, fuzzy #| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " +#| "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " "more information." msgstr "" -"Veuillez consulter le fichier /usr/share/doc/mysql-server-10.1/README.Debian " +"Veuillez consulter le fichier /usr/share/doc/mysql-server-10.2/README.Debian " "pour plus d'informations." #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "Password input error" msgstr "Erreur de saisie du mot de passe" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" "Le mot de passe et sa confirmation ne sont pas identiques. Veuillez " "recommencer." +#~ msgid "Really proceed with downgrade?" +#~ msgstr "Faut-il vraiment revenir à la version précédente ?" + +#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." +#~ msgstr "Un fichier /var/lib/mysql/debian-*.flag est présent sur ce système." + +#~ msgid "" +#~ "Such a file is an indication that a mariadb-server package with a higher " +#~ "version has been installed previously." +#~ msgstr "" +#~ "Cela indique qu'une version plus récente du paquet mariadb-server a été " +#~ "précédemment installée." + +#~ msgid "" +#~ "There is no guarantee that the version you're currently installing will " +#~ "be able to use the current databases." +#~ msgstr "" +#~ "Il n'est pas garanti que cette version puisse en utiliser les données." + +#~ msgid "Start the MariaDB server on boot?" +#~ msgstr "Faut-il lancer MariaDB au démarrage ?" + +#~ msgid "" +#~ "The MariaDB server can be launched automatically at boot time or manually " +#~ "with the '/etc/init.d/mysql start' command." +#~ msgstr "" +#~ "MariaDB peut être lancé soit au démarrage, soit en entrant la commande « /" +#~ "etc/init.d/mysql start »." + #~ msgid "" #~ "To use MySQL, the following entries for users and groups should be added " #~ "to the system:" diff --git a/debian/po/gl.po b/debian/po/gl.po index 122e4091c16..64b5a8d7458 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1\n" -"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"Report-Msgid-Bugs-To: mariadb-10.2@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" "Language-Team: Galician <proxecto@trasno.net>\n" @@ -15,51 +15,45 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "Really proceed with downgrade?" -msgstr "¿Quere pasar a unha versión anterior?" +#: ../mariadb-server-10.2.templates:2001 +msgid "The old data directory will be saved at new location" +msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." -msgstr "Neste sistema hai un ficheiro chamado /var/lib/mysql/debian-*.flag." +#: ../mariadb-server-10.2.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 " +"upgraded (or downgraded)." +msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -#, fuzzy -#| msgid "" -#| "Such file is an indication that a mariadb-server package with a higher " -#| "version has been installed earlier." +#: ../mariadb-server-10.2.templates:2001 msgid "" -"Such a file is an indication that a mariadb-server package with a higher " -"version has been installed previously." +"Therefore the previous data directory will be renamed to /var/lib/mysql-* " +"and a new data directory will be initialized at /var/lib/mysql." msgstr "" -"Este ficheiro indica que antes se instalou un paquete mariadb-server cunha " -"versión superior." -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"There is no guarantee that the version you're currently installing will be " -"able to use the current databases." +"Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" -"Non se pode garantir que a versión que está a instalar poida empregar as " -"bases de datos actuais." #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "Important note for NIS/YP users" msgstr "Nota importante para os usuarios de NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -67,7 +61,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 #, fuzzy #| msgid "" #| "You should also check the permissions and the owner of the /var/lib/mysql " @@ -81,13 +75,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "Remove all MariaDB databases?" msgstr "¿Eliminar tódalas bases de datos de MariaDB?" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -97,7 +91,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.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, " @@ -107,31 +101,15 @@ msgstr "" "recente ou se xa hai un paquete mariadb-server diferente a empregalo, " "debería conservar os datos." -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "¿Iniciar o servidor MariaDB co ordenador?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "" -"The MariaDB server can be launched automatically at boot time or manually " -"with the '/etc/init.d/mysql start' command." -msgstr "" -"Pódese iniciar automaticamente o servidor MariaDB ao iniciar o ordenador, ou " -"manualmente coa orde \"/etc/init.d/mysql start\"." - #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "New password for the MariaDB \"root\" user:" msgstr "Novo contrasinal para o usuario \"root\" de MariaDB:" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -141,7 +119,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 #, fuzzy #| msgid "If that field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed." @@ -149,7 +127,7 @@ msgstr "Se deixa o campo en branco, non se ha cambiar o contrasinal." #. Type: password #. Description -#: ../mariadb-server-10.1.templates:7001 +#: ../mariadb-server-10.2.templates:6001 #, fuzzy #| msgid "New password for the MySQL \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -157,13 +135,13 @@ msgstr "Novo contrasinal para o usuario \"root\" de MariaDB:" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "Non se puido establecer o contrasinal do usuario \"root\" de MariaDB" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -175,7 +153,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 #, fuzzy #| msgid "" #| "You should check the account's password after tha package installation." @@ -184,30 +162,64 @@ msgstr "Debería comprobar o contrasinal da conta trala instalación do paquete. #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.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.1/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " "more information." msgstr "" -"Consulte o ficheiro /usr/share/doc/mariadb-server-10.1/README.Debian para " +"Consulte o ficheiro /usr/share/doc/mariadb-server-10.2/README.Debian para " "máis información." #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" +#~ msgid "Really proceed with downgrade?" +#~ msgstr "¿Quere pasar a unha versión anterior?" + +#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." +#~ msgstr "Neste sistema hai un ficheiro chamado /var/lib/mysql/debian-*.flag." + +#, fuzzy +#~| msgid "" +#~| "Such file is an indication that a mariadb-server package with a higher " +#~| "version has been installed earlier." +#~ msgid "" +#~ "Such a file is an indication that a mariadb-server package with a higher " +#~ "version has been installed previously." +#~ msgstr "" +#~ "Este ficheiro indica que antes se instalou un paquete mariadb-server " +#~ "cunha versión superior." + +#~ msgid "" +#~ "There is no guarantee that the version you're currently installing will " +#~ "be able to use the current databases." +#~ msgstr "" +#~ "Non se pode garantir que a versión que está a instalar poida empregar as " +#~ "bases de datos actuais." + +#~ msgid "Start the MariaDB server on boot?" +#~ msgstr "¿Iniciar o servidor MariaDB co ordenador?" + +#~ msgid "" +#~ "The MariaDB server can be launched automatically at boot time or manually " +#~ "with the '/etc/init.d/mysql start' command." +#~ msgstr "" +#~ "Pódese iniciar automaticamente o servidor MariaDB ao iniciar o ordenador, " +#~ "ou manualmente coa orde \"/etc/init.d/mysql start\"." + #~ msgid "" #~ "To use MariaDB, the following entries for users and groups should be " #~ "added to the system:" diff --git a/debian/po/it.po b/debian/po/it.po index 459099cbc6a..7fe2c994a08 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -2,12 +2,12 @@ # Copyright (C) 2009 Software in the Public Interest # This file is distributed under the same license as the mysql-dfsg-5.1 package. # Luca Monducci <luca.mo@tiscali.it>, 2006 - 2009. -# +# msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1 5.1.37 italian debconf templates\n" -"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"Report-Msgid-Bugs-To: mariadb-10.2@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" "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n" @@ -16,48 +16,45 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "Really proceed with downgrade?" -msgstr "Procedere realmente con l'abbassamento di versione?" +#: ../mariadb-server-10.2.templates:2001 +msgid "The old data directory will be saved at new location" +msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." +#: ../mariadb-server-10.2.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 " +"upgraded (or downgraded)." msgstr "" -"Su questo sistema esiste un file con nome /var/lib/mysql/debian-*.flag." -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"Such a file is an indication that a mariadb-server package with a higher " -"version has been installed previously." +"Therefore the previous data directory will be renamed to /var/lib/mysql-* " +"and a new data directory will be initialized at /var/lib/mysql." msgstr "" -"Quel file indica che in precedenza è stata installata una versione superiore " -"del pacchetto mariadb-server." -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"There is no guarantee that the version you're currently installing will be " -"able to use the current databases." +"Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" -"Non è garantito che la versione che si sta installando sia in grado di usare " -"i database presenti." #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "Important note for NIS/YP users" msgstr "Nota importante per gli utenti NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -67,7 +64,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -77,13 +74,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Eliminare tutti i database MariaDB?" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -93,7 +90,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.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,31 +100,15 @@ msgstr "" "recente oppure se sono già in uso da un altro pacchetto mariadb-server, i " "dati non devono essere eliminati." -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "Lanciare il server MariaDB all'avvio?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "" -"The MariaDB server can be launched automatically at boot time or manually " -"with the '/etc/init.d/mysql start' command." -msgstr "" -"Il server MariaDB può essere lanciato automaticamente all'avvio del sistema " -"oppure manualmente con il comando «/etc/init.d/mysql start»." - #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "New password for the MariaDB \"root\" user:" msgstr "Nuova password per l'utente «root» di MariaDB:" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -137,25 +118,25 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "If this field is left blank, the password will not be changed." msgstr "Se questo campo è lasciato vuoto, la password non viene cambiata." #. Type: password #. Description -#: ../mariadb-server-10.1.templates:7001 +#: ../mariadb-server-10.2.templates:6001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "Ripetere la password per l'utente «root» di MariaDB:" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "Impossibile impostare la password per l'utente «root» di MariaDB" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -168,34 +149,64 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "You should check the account's password after the package installation." msgstr "" "Al termine dell'installazione si deve verificare la password dell'account." #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 #, fuzzy #| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " +#| "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " "more information." msgstr "" "Per maggiori informazioni si consulti il file /usr/share/doc/mariadb-" -"server-10.1/README.Debian." +"server-10.2/README.Debian." #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "Password input error" msgstr "Errore di inserimento della password" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "Le due password inserite sono diverse. Riprovare." +#~ msgid "Really proceed with downgrade?" +#~ msgstr "Procedere realmente con l'abbassamento di versione?" + +#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." +#~ msgstr "" +#~ "Su questo sistema esiste un file con nome /var/lib/mysql/debian-*.flag." + +#~ msgid "" +#~ "Such a file is an indication that a mariadb-server package with a higher " +#~ "version has been installed previously." +#~ msgstr "" +#~ "Quel file indica che in precedenza è stata installata una versione " +#~ "superiore del pacchetto mariadb-server." + +#~ msgid "" +#~ "There is no guarantee that the version you're currently installing will " +#~ "be able to use the current databases." +#~ msgstr "" +#~ "Non è garantito che la versione che si sta installando sia in grado di " +#~ "usare i database presenti." + +#~ msgid "Start the MariaDB server on boot?" +#~ msgstr "Lanciare il server MariaDB all'avvio?" + +#~ msgid "" +#~ "The MariaDB server can be launched automatically at boot time or manually " +#~ "with the '/etc/init.d/mysql start' command." +#~ msgstr "" +#~ "Il server MariaDB può essere lanciato automaticamente all'avvio del " +#~ "sistema oppure manualmente con il comando «/etc/init.d/mysql start»." diff --git a/debian/po/ja.po b/debian/po/ja.po index c1087266eaf..1d4d5d36896 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1 5.1.37-1\n" -"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"Report-Msgid-Bugs-To: mariadb-10.2@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" "Language-Team: Japanese <debian-japanese@lists.debian.org>\n" @@ -25,49 +25,45 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "Really proceed with downgrade?" -msgstr "本当にダウングレードを実行しますか?" +#: ../mariadb-server-10.2.templates:2001 +msgid "The old data directory will be saved at new location" +msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." +#: ../mariadb-server-10.2.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 " +"upgraded (or downgraded)." msgstr "" -"このシステムには /var/lib/mysql/debian-*.flag という名前のファイルが存在して" -"います。" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"Such a file is an indication that a mariadb-server package with a higher " -"version has been installed previously." +"Therefore the previous data directory will be renamed to /var/lib/mysql-* " +"and a new data directory will be initialized at /var/lib/mysql." msgstr "" -"このファイルが意味するのは、以前により新しいバージョンの mariadb-server パッ" -"ケージがインストールされていたことを示します。" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"There is no guarantee that the version you're currently installing will be " -"able to use the current databases." +"Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" -"このデータベースを現在インストールしようとしているバージョンで使えるかどうか" -"は保証できません。" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "Important note for NIS/YP users" msgstr "NIS/YP ユーザへの重要な注意" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -77,7 +73,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -85,13 +81,13 @@ msgstr "/var/lib/mysql の所有者権限をチェックする必要もありま #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "Remove all MariaDB databases?" msgstr "すべての MariaDB データベースを削除しますか?" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -101,7 +97,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.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,31 +107,15 @@ msgstr "" "ケージを削除しようとしている、あるいは別の mariadb-server パッケージを既に" "使っている場合、データは保持する必要があります。" -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "MariaDB をシステム起動時に開始しますか?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "" -"The MariaDB server can be launched automatically at boot time or manually " -"with the '/etc/init.d/mysql start' command." -msgstr "" -"MariaDB の起動方法について、システム起動時に自動的に開始するか、あるいは '/" -"etc/init.d/mysql start' と手で入力して起動するかを選べます。" - #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "New password for the MariaDB \"root\" user:" msgstr "MariaDB の \"root\" ユーザに対する新しいパスワード:" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -145,25 +125,25 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "If this field is left blank, the password will not be changed." msgstr "この値を空のままにしておいた場合は、パスワードは変更されません。" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:7001 +#: ../mariadb-server-10.2.templates:6001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "MariaDB の \"root\" ユーザに対する新しいパスワード:" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "MariaDB の \"root\" ユーザのパスワードを設定できません" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -175,33 +155,64 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "You should check the account's password after the package installation." msgstr "" "パッケージのインストール後、アカウントのパスワードを確認する必要があります。" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 #, fuzzy #| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " +#| "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " "more information." msgstr "" -"詳細は /usr/share/doc/mariadb-server-10.1/README.Debian を参照してください。" +"詳細は /usr/share/doc/mariadb-server-10.2/README.Debian を参照してください。" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "Password input error" msgstr "パスワード入力エラー" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "入力された二つのパスワードが一致しません。再入力してください。" +#~ msgid "Really proceed with downgrade?" +#~ msgstr "本当にダウングレードを実行しますか?" + +#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." +#~ msgstr "" +#~ "このシステムには /var/lib/mysql/debian-*.flag という名前のファイルが存在" +#~ "しています。" + +#~ msgid "" +#~ "Such a file is an indication that a mariadb-server package with a higher " +#~ "version has been installed previously." +#~ msgstr "" +#~ "このファイルが意味するのは、以前により新しいバージョンの mariadb-server " +#~ "パッケージがインストールされていたことを示します。" + +#~ msgid "" +#~ "There is no guarantee that the version you're currently installing will " +#~ "be able to use the current databases." +#~ msgstr "" +#~ "このデータベースを現在インストールしようとしているバージョンで使えるかどう" +#~ "かは保証できません。" + +#~ msgid "Start the MariaDB server on boot?" +#~ msgstr "MariaDB をシステム起動時に開始しますか?" + +#~ msgid "" +#~ "The MariaDB server can be launched automatically at boot time or manually " +#~ "with the '/etc/init.d/mysql start' command." +#~ msgstr "" +#~ "MariaDB の起動方法について、システム起動時に自動的に開始するか、あるいは " +#~ "'/etc/init.d/mysql start' と手で入力して起動するかを選べます。" diff --git a/debian/po/nb.po b/debian/po/nb.po index 992684fa3e1..ca8fd6e041d 100644 --- a/debian/po/nb.po +++ b/debian/po/nb.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: mysql_nb\n" -"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"Report-Msgid-Bugs-To: mariadb-10.2@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" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" @@ -17,48 +17,39 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.2\n" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -#, fuzzy -#| msgid "Do you really want to downgrade?" -msgid "Really proceed with downgrade?" -msgstr "Er du sikker på at du vil nedgradere?" +#: ../mariadb-server-10.2.templates:2001 +msgid "The old data directory will be saved at new location" +msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." +#: ../mariadb-server-10.2.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 " +"upgraded (or downgraded)." msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -#, fuzzy -#| msgid "" -#| "WARNING: The file /var/lib/mysql/debian-*.flag exists. This indicates " -#| "that a mysql-server package with a higher version has been installed " -#| "before. It can not be guaranteed that this version can use its data." +#: ../mariadb-server-10.2.templates:2001 msgid "" -"Such a file is an indication that a mariadb-server package with a higher " -"version has been installed previously." +"Therefore the previous data directory will be renamed to /var/lib/mysql-* " +"and a new data directory will be initialized at /var/lib/mysql." msgstr "" -"ADVARSEL: Fila /var/lib/mysql/debian-*.flag finnes. Dette viser at en " -"mariadb-server-pakke med et høyere versjonsnummer har vært installert før. " -"Det kan ikke garanteres at denne versjonen kan bruke data fra den høyere " -"versjonen." -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"There is no guarantee that the version you're currently installing will be " -"able to use the current databases." +"Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 #, fuzzy #| msgid "Important note for NIS/YP users!" msgid "Important note for NIS/YP users" @@ -66,7 +57,7 @@ msgstr "Viktig merknad for NIS/YP-brukere!" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -74,7 +65,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -82,13 +73,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "Remove all MariaDB databases?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -96,7 +87,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 #, fuzzy #| msgid "" #| "The script is about to remove the data directory /var/lib/mysql. If it is " @@ -111,31 +102,9 @@ msgstr "" "beholdes hvis det bare skal installeres en høyere MariaDB-versjon, eller " "hvis en annen mariadb-server-pakke allerede bruker den." -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -#, fuzzy -#| msgid "Should MySQL start on boot?" -msgid "Start the MariaDB server on boot?" -msgstr "Skal MariaDB startes ved maskinoppstart?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -#, fuzzy -#| msgid "" -#| "The MySQL can start automatically on boot time or only if you manually " -#| "type '/etc/init.d/mysql start'." -msgid "" -"The MariaDB server can be launched automatically at boot time or manually " -"with the '/etc/init.d/mysql start' command." -msgstr "" -"MariaDB kan startes automatisk når maskinen starter, eller bare hvis du " -"skriver «/etc/init.d/mysql start»." - #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 #, fuzzy #| msgid "New password for MySQL \"root\" user:" msgid "New password for the MariaDB \"root\" user:" @@ -143,7 +112,7 @@ msgstr "Nytt passord for MariaDBs «root»-bruker:" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 #, fuzzy #| msgid "" #| "It is highly recommended that you set a password for the MySQL " @@ -157,13 +126,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "If this field is left blank, the password will not be changed." msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:7001 +#: ../mariadb-server-10.2.templates:6001 #, fuzzy #| msgid "New password for MySQL \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -171,7 +140,7 @@ msgstr "Nytt passord for MariaDBs «root»-bruker:" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 #, fuzzy #| msgid "Unable to set password for MySQL \"root\" user" msgid "Unable to set password for the MariaDB \"root\" user" @@ -179,7 +148,7 @@ msgstr "Klarer ikke angi passord for MariaDBs «root»-bruker" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 #, fuzzy #| msgid "" #| "It seems an error occurred while setting the password for the MySQL " @@ -198,30 +167,65 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "You should check the account's password after the package installation." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "" -"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " "more information." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" +#, fuzzy +#~| msgid "Do you really want to downgrade?" +#~ msgid "Really proceed with downgrade?" +#~ msgstr "Er du sikker på at du vil nedgradere?" + +#, fuzzy +#~| msgid "" +#~| "WARNING: The file /var/lib/mysql/debian-*.flag exists. This indicates " +#~| "that a mysql-server package with a higher version has been installed " +#~| "before. It can not be guaranteed that this version can use its data." +#~ msgid "" +#~ "Such a file is an indication that a mariadb-server package with a higher " +#~ "version has been installed previously." +#~ msgstr "" +#~ "ADVARSEL: Fila /var/lib/mysql/debian-*.flag finnes. Dette viser at en " +#~ "mariadb-server-pakke med et høyere versjonsnummer har vært installert " +#~ "før. Det kan ikke garanteres at denne versjonen kan bruke data fra den " +#~ "høyere versjonen." + +#, fuzzy +#~| msgid "Should MySQL start on boot?" +#~ msgid "Start the MariaDB server on boot?" +#~ msgstr "Skal MariaDB startes ved maskinoppstart?" + +#, fuzzy +#~| msgid "" +#~| "The MySQL can start automatically on boot time or only if you manually " +#~| "type '/etc/init.d/mysql start'." +#~ msgid "" +#~ "The MariaDB server can be launched automatically at boot time or manually " +#~ "with the '/etc/init.d/mysql start' command." +#~ msgstr "" +#~ "MariaDB kan startes automatisk når maskinen starter, eller bare hvis du " +#~ "skriver «/etc/init.d/mysql start»." + #~ msgid "" #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?" #~ msgstr "" diff --git a/debian/po/nl.po b/debian/po/nl.po index 82864ed8456..b05a30d720d 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1 5.0.30-1\n" -"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" +"POT-Creation-Date: 2016-10-08 01:26+0300\n" "PO-Revision-Date: 2006-02-19 10:20+0100\n" "Last-Translator: Thijs Kinkhorst <thijs@debian.org>\n" "Language-Team: Debian-Dutch <debian-l10n-dutch@lists.debian.org>\n" @@ -16,49 +16,39 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -#, fuzzy -#| msgid "Do you really want to downgrade?" -msgid "Really proceed with downgrade?" -msgstr "Wilt u echt een oude versie herstellen?" +#: ../mariadb-server-10.2.templates:2001 +msgid "The old data directory will be saved at new location" +msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." +#: ../mariadb-server-10.2.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 " +"upgraded (or downgraded)." msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -#, fuzzy -#| msgid "" -#| "WARNING: The file /var/lib/mysql/debian-*.flag exists. This indicates " -#| "that a mysql-server package with a higher version has been installed " -#| "before. It can not be guaranteed that this version can use its data." +#: ../mariadb-server-10.2.templates:2001 msgid "" -"Such a file is an indication that a mariadb-server package with a higher " -"version has been installed previously." +"Therefore the previous data directory will be renamed to /var/lib/mysql-* " +"and a new data directory will be initialized at /var/lib/mysql." msgstr "" -"Waarschuwing: waarschijnlijk is een hogere versie van het mariadb-server " -"pakket geïnstalleerd geweest (het bestand /var/lib/mysql/debian-*.flag " -"bestaat). Er is geen garantie dat de gegevensbestanden, bewerkt met die " -"hogere versie, kunnen worden gebruikt met de versie van mysql die u nu " -"installeert." -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"There is no guarantee that the version you're currently installing will be " -"able to use the current databases." +"Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 #, fuzzy #| msgid "Important note for NIS/YP users!" msgid "Important note for NIS/YP users" @@ -66,7 +56,7 @@ msgstr "Belangrijke opmerking voor gebruikers van NIS/YP!" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -74,7 +64,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -82,13 +72,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "Remove all MariaDB databases?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -96,7 +86,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 #, fuzzy #| msgid "" #| "The script is about to remove the data directory /var/lib/mysql. If it is " @@ -112,31 +102,9 @@ msgstr "" "een ander mariadb-serverpakket de datamap al gebruikt, dan zou de data " "moeten worden behouden." -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -#, fuzzy -#| msgid "Should MySQL start on boot?" -msgid "Start the MariaDB server on boot?" -msgstr "Moet MariaDB starten als de computer start?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -#, fuzzy -#| msgid "" -#| "The MySQL can start automatically on boot time or only if you manually " -#| "type '/etc/init.d/mysql start'." -msgid "" -"The MariaDB server can be launched automatically at boot time or manually " -"with the '/etc/init.d/mysql start' command." -msgstr "" -"MariaDB kan automatisch starten bij het starten van de computer, of slechts " -"wanneer u '/etc/init.d/mysql start' handmatig uitvoert." - #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 #, fuzzy #| msgid "New password for MySQL \"root\" user:" msgid "New password for the MariaDB \"root\" user:" @@ -144,7 +112,7 @@ msgstr "Nieuw wachtwoord voor de MariaDB \"root\"-gebruiker:" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 #, fuzzy #| msgid "" #| "It is highly recommended that you set a password for the MySQL " @@ -158,13 +126,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "If this field is left blank, the password will not be changed." msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:7001 +#: ../mariadb-server-10.2.templates:6001 #, fuzzy #| msgid "New password for MySQL \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -172,7 +140,7 @@ msgstr "Nieuw wachtwoord voor de MariaDB \"root\"-gebruiker:" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 #, fuzzy #| msgid "Unable to set password for MySQL \"root\" user" msgid "Unable to set password for the MariaDB \"root\" user" @@ -180,7 +148,7 @@ msgstr "Kan het wachtwoord voor de MariaDB \"root\"-gebruiker niet instellen" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 #, fuzzy #| msgid "" #| "It seems an error occurred while setting the password for the MySQL " @@ -199,30 +167,66 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "You should check the account's password after the package installation." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "" -"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " "more information." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" +#, fuzzy +#~| msgid "Do you really want to downgrade?" +#~ msgid "Really proceed with downgrade?" +#~ msgstr "Wilt u echt een oude versie herstellen?" + +#, fuzzy +#~| msgid "" +#~| "WARNING: The file /var/lib/mysql/debian-*.flag exists. This indicates " +#~| "that a mysql-server package with a higher version has been installed " +#~| "before. It can not be guaranteed that this version can use its data." +#~ msgid "" +#~ "Such a file is an indication that a mariadb-server package with a higher " +#~ "version has been installed previously." +#~ msgstr "" +#~ "Waarschuwing: waarschijnlijk is een hogere versie van het mariadb-server " +#~ "pakket geïnstalleerd geweest (het bestand /var/lib/mysql/debian-*.flag " +#~ "bestaat). Er is geen garantie dat de gegevensbestanden, bewerkt met die " +#~ "hogere versie, kunnen worden gebruikt met de versie van mysql die u nu " +#~ "installeert." + +#, fuzzy +#~| msgid "Should MySQL start on boot?" +#~ msgid "Start the MariaDB server on boot?" +#~ msgstr "Moet MariaDB starten als de computer start?" + +#, fuzzy +#~| msgid "" +#~| "The MySQL can start automatically on boot time or only if you manually " +#~| "type '/etc/init.d/mysql start'." +#~ msgid "" +#~ "The MariaDB server can be launched automatically at boot time or manually " +#~ "with the '/etc/init.d/mysql start' command." +#~ msgstr "" +#~ "MariaDB kan automatisch starten bij het starten van de computer, of " +#~ "slechts wanneer u '/etc/init.d/mysql start' handmatig uitvoert." + #~ msgid "" #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?" #~ msgstr "" diff --git a/debian/po/pt.po b/debian/po/pt.po index 0c35c038b70..069d74348ed 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1\n" -"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"Report-Msgid-Bugs-To: mariadb-10.2@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" "Language-Team: Portuguese <traduz@debianpt.org>\n" @@ -16,51 +16,45 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "Really proceed with downgrade?" -msgstr "Deseja mesmo fazer downgrade?" +#: ../mariadb-server-10.2.templates:2001 +msgid "The old data directory will be saved at new location" +msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." -msgstr "Existe um ficheiro chamado /var/lib/mysql/debian-*.flag neste sistema." +#: ../mariadb-server-10.2.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 " +"upgraded (or downgraded)." +msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -#, fuzzy -#| msgid "" -#| "Such file is an indication that a mariadb-server package with a higher " -#| "version has been installed earlier." +#: ../mariadb-server-10.2.templates:2001 msgid "" -"Such a file is an indication that a mariadb-server package with a higher " -"version has been installed previously." +"Therefore the previous data directory will be renamed to /var/lib/mysql-* " +"and a new data directory will be initialized at /var/lib/mysql." msgstr "" -"Tal ficheiro significa que anteriormente foi instalado um pacote mariadb-" -"server com um número de versão superior." -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"There is no guarantee that the version you're currently installing will be " -"able to use the current databases." +"Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" -"Não existe nenhuma garantia que a versão que está actualmente a instalar " -"seja capaz de utilizar as bases de dados actuais." #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "Important note for NIS/YP users" msgstr "Nota importante para utilizadores de NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -68,7 +62,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 #, fuzzy #| msgid "" #| "You should also check the permissions and the owner of the /var/lib/mysql " @@ -81,13 +75,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Remover todas as bases de dados MariaDB?" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -97,7 +91,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.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, " @@ -107,31 +101,15 @@ msgstr "" "versão mais recente ou se um pacote mariadb-server já está os está a " "utilizar, os dados devem ser mantidos." -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "Iniciar o servidor MariaDB no arranque?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "" -"The MariaDB server can be launched automatically at boot time or manually " -"with the '/etc/init.d/mysql start' command." -msgstr "" -"O MariaDB pode ser automaticamente lançado no arranque ou manualmente " -"através do comando '/etc/init.d/mysql start'." - #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "New password for the MariaDB \"root\" user:" msgstr "Nova palavra-passe para o utilizador \"root\" do MariaDB:" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -141,7 +119,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 #, fuzzy #| msgid "If that field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed." @@ -150,7 +128,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:7001 +#: ../mariadb-server-10.2.templates:6001 #, fuzzy #| msgid "New password for the MySQL \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -158,7 +136,7 @@ msgstr "Nova palavra-passe para o utilizador \"root\" do MariaDB:" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "" "Não foi possível definir a palavra-passe para o utilizador \"root\" do " @@ -166,7 +144,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -179,7 +157,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 #, fuzzy #| msgid "" #| "You should check the account's password after tha package installation." @@ -189,30 +167,65 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.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.1/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " "more information." msgstr "" "Para mais informação por favor leia o ficheiro /usr/share/doc/mariadb-" -"server-10.1/README.Debian." +"server-10.2/README.Debian." #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" +#~ msgid "Really proceed with downgrade?" +#~ msgstr "Deseja mesmo fazer downgrade?" + +#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." +#~ msgstr "" +#~ "Existe um ficheiro chamado /var/lib/mysql/debian-*.flag neste sistema." + +#, fuzzy +#~| msgid "" +#~| "Such file is an indication that a mariadb-server package with a higher " +#~| "version has been installed earlier." +#~ msgid "" +#~ "Such a file is an indication that a mariadb-server package with a higher " +#~ "version has been installed previously." +#~ msgstr "" +#~ "Tal ficheiro significa que anteriormente foi instalado um pacote mariadb-" +#~ "server com um número de versão superior." + +#~ msgid "" +#~ "There is no guarantee that the version you're currently installing will " +#~ "be able to use the current databases." +#~ msgstr "" +#~ "Não existe nenhuma garantia que a versão que está actualmente a instalar " +#~ "seja capaz de utilizar as bases de dados actuais." + +#~ msgid "Start the MariaDB server on boot?" +#~ msgstr "Iniciar o servidor MariaDB no arranque?" + +#~ msgid "" +#~ "The MariaDB server can be launched automatically at boot time or manually " +#~ "with the '/etc/init.d/mysql start' command." +#~ msgstr "" +#~ "O MariaDB pode ser automaticamente lançado no arranque ou manualmente " +#~ "através do comando '/etc/init.d/mysql start'." + #~ msgid "" #~ "To use MariaDB, the following entries for users and groups should be " #~ "added to the system:" diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index 35f1b4fcea4..a2a39440389 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1\n" -"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"Report-Msgid-Bugs-To: mariadb-10.2@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" "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n" @@ -19,51 +19,45 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "pt_BR utf-8\n" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "Really proceed with downgrade?" -msgstr "Realmente proceder com o rebaixamento de versão?" +#: ../mariadb-server-10.2.templates:2001 +msgid "The old data directory will be saved at new location" +msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." -msgstr "Um arquivo de nome /var/lib/mysql/debian-*.flag existe no sistema." +#: ../mariadb-server-10.2.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 " +"upgraded (or downgraded)." +msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -#, fuzzy -#| msgid "" -#| "Such file is an indication that a mariadb-server package with a higher " -#| "version has been installed earlier." +#: ../mariadb-server-10.2.templates:2001 msgid "" -"Such a file is an indication that a mariadb-server package with a higher " -"version has been installed previously." +"Therefore the previous data directory will be renamed to /var/lib/mysql-* " +"and a new data directory will be initialized at /var/lib/mysql." msgstr "" -"A presença de um arquivo como este é uma indicação de que um pacote mariadb-" -"server com um número de versão mais alto já foi instalado anteriormente." -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"There is no guarantee that the version you're currently installing will be " -"able to use the current databases." +"Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" -"Não há garantias de que a versão que você está instalando no momento " -"conseguirá utilizar as bases de dados existentes." #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "Important note for NIS/YP users" msgstr "Aviso importante para usuários NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -71,7 +65,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 #, fuzzy #| msgid "" #| "You should also check the permissions and the owner of the /var/lib/mysql " @@ -84,13 +78,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Remover todas as bases de dados do MariaDB?" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -100,7 +94,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.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, " @@ -110,31 +104,15 @@ msgstr "" "versão mais recente ou, caso uma versão diferente do pacote mariadb-server " "esteja sendo utilizada, os dados deverão ser mantidos." -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "Iniciar o servidor MariaDB junto a inicialização da máquina?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "" -"The MariaDB server can be launched automatically at boot time or manually " -"with the '/etc/init.d/mysql start' command." -msgstr "" -"O servidor MariaDB pode ser iniciado automaticamente junto a inicialização " -"da máquina ou manualmente com o comando '/etc/init.d/mysql start'." - #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "New password for the MariaDB \"root\" user:" msgstr "Nova senha para o usuário \"root\" do MariaDB:" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -144,7 +122,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 #, fuzzy #| msgid "If that field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed." @@ -152,7 +130,7 @@ msgstr "Caso este campo seja deixado em branco, a senha não sera mudada." #. Type: password #. Description -#: ../mariadb-server-10.1.templates:7001 +#: ../mariadb-server-10.2.templates:6001 #, fuzzy #| msgid "New password for the MySQL \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -160,13 +138,13 @@ msgstr "Nova senha para o usuário \"root\" do MariaDB:" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "Impossível definir senha para o usuário \"root\" do MariaDB" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -179,7 +157,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 #, fuzzy #| msgid "" #| "You should check the account's password after tha package installation." @@ -188,30 +166,66 @@ msgstr "Você deverá checar a senha dessa conta após a instalação deste paco #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.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.1/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " "more information." msgstr "" -"Por favor, leia o arquivo /usr/share/doc/mariadb-server-10.1/README.Debian " +"Por favor, leia o arquivo /usr/share/doc/mariadb-server-10.2/README.Debian " "para maiores informações." #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" +#~ msgid "Really proceed with downgrade?" +#~ msgstr "Realmente proceder com o rebaixamento de versão?" + +#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." +#~ msgstr "Um arquivo de nome /var/lib/mysql/debian-*.flag existe no sistema." + +#, fuzzy +#~| msgid "" +#~| "Such file is an indication that a mariadb-server package with a higher " +#~| "version has been installed earlier." +#~ msgid "" +#~ "Such a file is an indication that a mariadb-server package with a higher " +#~ "version has been installed previously." +#~ msgstr "" +#~ "A presença de um arquivo como este é uma indicação de que um pacote " +#~ "mariadb-server com um número de versão mais alto já foi instalado " +#~ "anteriormente." + +#~ msgid "" +#~ "There is no guarantee that the version you're currently installing will " +#~ "be able to use the current databases." +#~ msgstr "" +#~ "Não há garantias de que a versão que você está instalando no momento " +#~ "conseguirá utilizar as bases de dados existentes." + +#~ msgid "Start the MariaDB server on boot?" +#~ msgstr "Iniciar o servidor MariaDB junto a inicialização da máquina?" + +#~ msgid "" +#~ "The MariaDB server can be launched automatically at boot time or manually " +#~ "with the '/etc/init.d/mysql start' command." +#~ msgstr "" +#~ "O servidor MariaDB pode ser iniciado automaticamente junto a " +#~ "inicialização da máquina ou manualmente com o comando '/etc/init.d/mysql " +#~ "start'." + #~ msgid "" #~ "To use MariaDB, the following entries for users and groups should be " #~ "added to the system:" diff --git a/debian/po/ro.po b/debian/po/ro.po index ceefecc8a1b..45ed4aff10b 100644 --- a/debian/po/ro.po +++ b/debian/po/ro.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: po-debconf://mysql-dfsg\n" -"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"Report-Msgid-Bugs-To: mariadb-10.2@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" "Language-Team: romanian <debian-l10n-romanian@lists.debian.org>\n" @@ -17,48 +17,39 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -#, fuzzy -#| msgid "Do you really want to downgrade?" -msgid "Really proceed with downgrade?" -msgstr "Sunteţi sigur că doriţi să instalaţi o versiune mai veche?" +#: ../mariadb-server-10.2.templates:2001 +msgid "The old data directory will be saved at new location" +msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." +#: ../mariadb-server-10.2.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 " +"upgraded (or downgraded)." msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -#, fuzzy -#| msgid "" -#| "WARNING: The file /var/lib/mysql/debian-*.flag exists. This indicates " -#| "that a mysql-server package with a higher version has been installed " -#| "before. It can not be guaranteed that this version can use its data." +#: ../mariadb-server-10.2.templates:2001 msgid "" -"Such a file is an indication that a mariadb-server package with a higher " -"version has been installed previously." +"Therefore the previous data directory will be renamed to /var/lib/mysql-* " +"and a new data directory will be initialized at /var/lib/mysql." msgstr "" -"AVERTISMENT: Fişierul /var/lib/mysql/debian-*.flag există. Acest lucru " -"indică faptul că anterior a fost instalată o versiune nouă a pachetului " -"mariadb-server. Nu se poate garanta că versiunea instalată acum poate folosi " -"datele versiunii instalate anterior." -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"There is no guarantee that the version you're currently installing will be " -"able to use the current databases." +"Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 #, fuzzy #| msgid "Important note for NIS/YP users!" msgid "Important note for NIS/YP users" @@ -66,7 +57,7 @@ msgstr "Notă importantă pentru utilizatorii NIS/YP!" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -74,7 +65,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -82,13 +73,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "Remove all MariaDB databases?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -96,7 +87,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 #, fuzzy #| msgid "" #| "The script is about to remove the data directory /var/lib/mysql. If it is " @@ -111,31 +102,9 @@ msgstr "" "doar să instalaţi o versiune nouă MariaDB sau datele sunt folosite de către " "un alt pachet mariadb-server, atunci ar trebui păstraţi datele." -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -#, fuzzy -#| msgid "Should MySQL start on boot?" -msgid "Start the MariaDB server on boot?" -msgstr "Doriţi ca MariaDB să pornească la initializarea sistemului?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -#, fuzzy -#| msgid "" -#| "The MySQL can start automatically on boot time or only if you manually " -#| "type '/etc/init.d/mysql start'." -msgid "" -"The MariaDB server can be launched automatically at boot time or manually " -"with the '/etc/init.d/mysql start' command." -msgstr "" -"MariaDB poate porni automat la iniţializarea sistemului sau doar dacă rulaţi " -"comanda „/etc/init.d/mysql start”." - #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 #, fuzzy #| msgid "New password for MySQL \"root\" user:" msgid "New password for the MariaDB \"root\" user:" @@ -143,7 +112,7 @@ msgstr "Noua parolă pentru utilizatorul „root” al MariaDB:" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 #, fuzzy #| msgid "" #| "It is highly recommended that you set a password for the MySQL " @@ -157,13 +126,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "If this field is left blank, the password will not be changed." msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:7001 +#: ../mariadb-server-10.2.templates:6001 #, fuzzy #| msgid "New password for MySQL \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -171,7 +140,7 @@ msgstr "Noua parolă pentru utilizatorul „root” al MariaDB:" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 #, fuzzy #| msgid "Unable to set password for MySQL \"root\" user" msgid "Unable to set password for the MariaDB \"root\" user" @@ -179,7 +148,7 @@ msgstr "Nu s-a putut stabili parola pentru utilizatorul „root” al MariaDB" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 #, fuzzy #| msgid "" #| "It seems an error occurred while setting the password for the MySQL " @@ -198,30 +167,65 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "You should check the account's password after the package installation." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "" -"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " "more information." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" +#, fuzzy +#~| msgid "Do you really want to downgrade?" +#~ msgid "Really proceed with downgrade?" +#~ msgstr "Sunteţi sigur că doriţi să instalaţi o versiune mai veche?" + +#, fuzzy +#~| msgid "" +#~| "WARNING: The file /var/lib/mysql/debian-*.flag exists. This indicates " +#~| "that a mysql-server package with a higher version has been installed " +#~| "before. It can not be guaranteed that this version can use its data." +#~ msgid "" +#~ "Such a file is an indication that a mariadb-server package with a higher " +#~ "version has been installed previously." +#~ msgstr "" +#~ "AVERTISMENT: Fişierul /var/lib/mysql/debian-*.flag există. Acest lucru " +#~ "indică faptul că anterior a fost instalată o versiune nouă a pachetului " +#~ "mariadb-server. Nu se poate garanta că versiunea instalată acum poate " +#~ "folosi datele versiunii instalate anterior." + +#, fuzzy +#~| msgid "Should MySQL start on boot?" +#~ msgid "Start the MariaDB server on boot?" +#~ msgstr "Doriţi ca MariaDB să pornească la initializarea sistemului?" + +#, fuzzy +#~| msgid "" +#~| "The MySQL can start automatically on boot time or only if you manually " +#~| "type '/etc/init.d/mysql start'." +#~ msgid "" +#~ "The MariaDB server can be launched automatically at boot time or manually " +#~ "with the '/etc/init.d/mysql start' command." +#~ msgstr "" +#~ "MariaDB poate porni automat la iniţializarea sistemului sau doar dacă " +#~ "rulaţi comanda „/etc/init.d/mysql start”." + #~ msgid "Cannot upgrade if ISAM tables are present!" #~ msgstr "Nu se poate face actualizarea dacă sunt prezente tabele ISAM!" diff --git a/debian/po/ru.po b/debian/po/ru.po index 5136933159b..213f64f6253 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1 5.1.37-1\n" -"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"Report-Msgid-Bugs-To: mariadb-10.2@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" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" @@ -30,47 +30,45 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "Really proceed with downgrade?" -msgstr "Действительно установить более старую версию?" +#: ../mariadb-server-10.2.templates:2001 +msgid "The old data directory will be saved at new location" +msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." -msgstr "В системе найден файл /var/lib/mysql/debian-*.flag." +#: ../mariadb-server-10.2.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 " +"upgraded (or downgraded)." +msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"Such a file is an indication that a mariadb-server package with a higher " -"version has been installed previously." +"Therefore the previous data directory will be renamed to /var/lib/mysql-* " +"and a new data directory will be initialized at /var/lib/mysql." msgstr "" -"Это означает, что ранее уже был установлен пакет mariadb-server более новой " -"версии." -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"There is no guarantee that the version you're currently installing will be " -"able to use the current databases." +"Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" -"Нет гарантий, что версия, которая устанавливается сейчас, будет способна " -"работать с имеющимися базами данных." #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "Important note for NIS/YP users" msgstr "Важное замечание для пользователей NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -80,7 +78,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -88,13 +86,13 @@ msgstr "Также проверьте права доступа и владел #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Удалить все базы данных MariaDB?" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -103,7 +101,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.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,31 +111,15 @@ msgstr "" "есть другие пакеты mariadb-server, использующие этот каталог, то данные " "лучше сохранить." -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "Запускать MariaDB при загрузке системы?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "" -"The MariaDB server can be launched automatically at boot time or manually " -"with the '/etc/init.d/mysql start' command." -msgstr "" -"Сервер MariaDB можно запускать автоматически при загрузке системы или " -"вручную по команде '/etc/init.d/mysql start'." - #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "New password for the MariaDB \"root\" user:" msgstr "Новый пароль для MariaDB пользователя \"root\":" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -147,25 +129,25 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "If this field is left blank, the password will not be changed." msgstr "Если оставить поле пустым, то пароль изменён не будет." #. Type: password #. Description -#: ../mariadb-server-10.1.templates:7001 +#: ../mariadb-server-10.2.templates:6001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "Повторите ввод пароля для MariaDB пользователя \"root\":" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "Невозможно задать пароль MariaDB пользователю \"root\"" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -177,32 +159,61 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "You should check the account's password after the package installation." msgstr "Проверьте пароль учётной записи после установки пакета." #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 #, fuzzy #| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " +#| "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " "more information." msgstr "" -"Подробности см. в файле /usr/share/doc/mariadb-server-10.1/README.Debian." +"Подробности см. в файле /usr/share/doc/mariadb-server-10.2/README.Debian." #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "Password input error" msgstr "Ошибка ввода пароля" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "Два введённых пароля не одинаковы. Повторите ввод." +#~ msgid "Really proceed with downgrade?" +#~ msgstr "Действительно установить более старую версию?" + +#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." +#~ msgstr "В системе найден файл /var/lib/mysql/debian-*.flag." + +#~ msgid "" +#~ "Such a file is an indication that a mariadb-server package with a higher " +#~ "version has been installed previously." +#~ msgstr "" +#~ "Это означает, что ранее уже был установлен пакет mariadb-server более " +#~ "новой версии." + +#~ msgid "" +#~ "There is no guarantee that the version you're currently installing will " +#~ "be able to use the current databases." +#~ msgstr "" +#~ "Нет гарантий, что версия, которая устанавливается сейчас, будет способна " +#~ "работать с имеющимися базами данных." + +#~ msgid "Start the MariaDB server on boot?" +#~ msgstr "Запускать MariaDB при загрузке системы?" + +#~ msgid "" +#~ "The MariaDB server can be launched automatically at boot time or manually " +#~ "with the '/etc/init.d/mysql start' command." +#~ msgstr "" +#~ "Сервер MariaDB можно запускать автоматически при загрузке системы или " +#~ "вручную по команде '/etc/init.d/mysql start'." diff --git a/debian/po/sv.po b/debian/po/sv.po index 0cd512a252b..b7aff17f1a6 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -1,14 +1,14 @@ # Translation of mysql-dfsg-5.1 debconf template to Swedish # Copyright (C) 2009 Martin Bagge <brother@bsnet.se> # This file is distributed under the same license as the mysql-dfsg-5.1 package. -# +# # Andreas Henriksson <andreas@fatal.se>, 2007 # Martin Bagge <brother@bsnet.se>, 2009 msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1 5.0.21-3\n" -"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"Report-Msgid-Bugs-To: mariadb-10.2@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" "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n" @@ -19,47 +19,45 @@ msgstr "" "X-Poedit-Language: Swedish\n" "X-Poedit-Country: Sweden\n" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "Really proceed with downgrade?" -msgstr "Vill du verkligen genomföra nedgraderingen?" +#: ../mariadb-server-10.2.templates:2001 +msgid "The old data directory will be saved at new location" +msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." -msgstr "En fil med namnet /var/lib/mysql/debian-*.flag hittades i systemet." +#: ../mariadb-server-10.2.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 " +"upgraded (or downgraded)." +msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"Such a file is an indication that a mariadb-server package with a higher " -"version has been installed previously." +"Therefore the previous data directory will be renamed to /var/lib/mysql-* " +"and a new data directory will be initialized at /var/lib/mysql." msgstr "" -"En sådan fil är en indikation på att paketet mariadb-server med ett högre " -"versionsnummer har installerats tidigare." -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"There is no guarantee that the version you're currently installing will be " -"able to use the current databases." +"Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" -"Det finns ingen garanti för att den version som du håller på att installera " -"kommer att kunna använda de aktuella databaserna." #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "Important note for NIS/YP users" msgstr "Viktig information för NIS/YP-användare" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -69,7 +67,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -79,13 +77,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Ta bort alla MariaDB-databaser?" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -95,7 +93,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.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,31 +103,15 @@ msgstr "" "en nyare version eller om en annan mariadb-server redan använder filerna ska " "de inte raderas." -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "Ska MariaDB startas vid systemets uppstart?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "" -"The MariaDB server can be launched automatically at boot time or manually " -"with the '/etc/init.d/mysql start' command." -msgstr "" -"MariaDB-servern kan startas vid systemets uppstart eller manuellt med " -"kommandot \"/etc/init.d/mysql start\"." - #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "New password for the MariaDB \"root\" user:" msgstr "Nytt lösenord för MariaDBs \"root\"-användare:" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -139,25 +121,25 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "If this field is left blank, the password will not be changed." msgstr "Om detta fält lämnas tom kommer lösenordet inte att ändras." #. Type: password #. Description -#: ../mariadb-server-10.1.templates:7001 +#: ../mariadb-server-10.2.templates:6001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "Repetera lösenordet för MariaDBs \"root\"-användare:" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "Kunde inte sätta lösenord för MariaDBs \"root\"-användare" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -170,36 +152,66 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "You should check the account's password after the package installation." msgstr "Du bör kontrollera kontots lösenord efter installationen av paketet." #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 #, fuzzy #| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " +#| "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " "more information." msgstr "" -"Läs filen /usr/share/doc/mariadb-server-10.1/README.Debian för mer " +"Läs filen /usr/share/doc/mariadb-server-10.2/README.Debian för mer " "information." #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "Password input error" msgstr "Fel vid inmatning av lösenord" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "De två lösenorden du angav stämde inte överrens. Prova igen." +#~ msgid "Really proceed with downgrade?" +#~ msgstr "Vill du verkligen genomföra nedgraderingen?" + +#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." +#~ msgstr "En fil med namnet /var/lib/mysql/debian-*.flag hittades i systemet." + +#~ msgid "" +#~ "Such a file is an indication that a mariadb-server package with a higher " +#~ "version has been installed previously." +#~ msgstr "" +#~ "En sådan fil är en indikation på att paketet mariadb-server med ett högre " +#~ "versionsnummer har installerats tidigare." + +#~ msgid "" +#~ "There is no guarantee that the version you're currently installing will " +#~ "be able to use the current databases." +#~ msgstr "" +#~ "Det finns ingen garanti för att den version som du håller på att " +#~ "installera kommer att kunna använda de aktuella databaserna." + +#~ msgid "Start the MariaDB server on boot?" +#~ msgstr "Ska MariaDB startas vid systemets uppstart?" + +#~ msgid "" +#~ "The MariaDB server can be launched automatically at boot time or manually " +#~ "with the '/etc/init.d/mysql start' command." +#~ msgstr "" +#~ "MariaDB-servern kan startas vid systemets uppstart eller manuellt med " +#~ "kommandot \"/etc/init.d/mysql start\"." + #~ msgid "" #~ "To use MySQL, the following entries for users and groups should be added " #~ "to the system:" diff --git a/debian/po/templates.pot b/debian/po/templates.pot index c164f1f4811..258dcde2c81 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"Project-Id-Version: mariadb-10.2\n" +"Report-Msgid-Bugs-To: mariadb-10.2@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" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,43 +17,45 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "Really proceed with downgrade?" +#: ../mariadb-server-10.2.templates:2001 +msgid "The old data directory will be saved at new location" msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." +#: ../mariadb-server-10.2.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 " +"upgraded (or downgraded)." msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"Such a file is an indication that a mariadb-server package with a higher " -"version has been installed previously." +"Therefore the previous data directory will be renamed to /var/lib/mysql-* " +"and a new data directory will be initialized at /var/lib/mysql." msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"There is no guarantee that the version you're currently installing will be " -"able to use the current databases." +"Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "Important note for NIS/YP users" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -61,7 +63,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -69,13 +71,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "Remove all MariaDB databases?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -83,36 +85,22 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " "the data should be kept." msgstr "" -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -msgid "" -"The MariaDB server can be launched automatically at boot time or manually " -"with the '/etc/init.d/mysql start' command." -msgstr "" - #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "New password for the MariaDB \"root\" user:" msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -120,25 +108,25 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "If this field is left blank, the password will not be changed." msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:7001 +#: ../mariadb-server-10.2.templates:6001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -147,26 +135,26 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "You should check the account's password after the package installation." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "" -"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " "more information." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.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 dafbd6121d8..c501fde3db8 100644 --- a/debian/po/tr.po +++ b/debian/po/tr.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-4.1\n" -"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"Report-Msgid-Bugs-To: mariadb-10.2@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" "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n" @@ -16,37 +16,39 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "Really proceed with downgrade?" +#: ../mariadb-server-10.2.templates:2001 +msgid "The old data directory will be saved at new location" msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 -msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." +#: ../mariadb-server-10.2.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 " +"upgraded (or downgraded)." msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"Such a file is an indication that a mariadb-server package with a higher " -"version has been installed previously." +"Therefore the previous data directory will be renamed to /var/lib/mysql-* " +"and a new data directory will be initialized at /var/lib/mysql." msgstr "" -#. Type: boolean +#. Type: note #. Description -#: ../mariadb-server-10.1.templates:2001 +#: ../mariadb-server-10.2.templates:2001 msgid "" -"There is no guarantee that the version you're currently installing will be " -"able to use the current databases." +"Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 #, fuzzy #| msgid "Important note for NIS/YP users!" msgid "Important note for NIS/YP users" @@ -54,7 +56,7 @@ msgstr "NIS/YP kullanıcıları için önemli not!" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -62,7 +64,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.1.templates:3001 +#: ../mariadb-server-10.2.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -70,13 +72,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "Remove all MariaDB databases?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -84,42 +86,22 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.1.templates:4001 +#: ../mariadb-server-10.2.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " "the data should be kept." msgstr "" -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -#, fuzzy -#| msgid "Should MySQL start on boot?" -msgid "Start the MariaDB server on boot?" -msgstr "MariaDB açılış sırasında başlatılsın mı?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.1.templates:5001 -#, fuzzy -msgid "" -"The MariaDB server can be launched automatically at boot time or manually " -"with the '/etc/init.d/mysql start' command." -msgstr "" -"MariaDB açılış sırasında veya '/etc/init.d/mysql start' komutunu vermeniz " -"halinde elle başlatılabilir. Eğer açılışta otomatik olarak başlatılmasını " -"istiyorsanız burada 'evet'i seçin." - #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "New password for the MariaDB \"root\" user:" msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -127,25 +109,25 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:6001 +#: ../mariadb-server-10.2.templates:5001 msgid "If this field is left blank, the password will not be changed." msgstr "" #. Type: password #. Description -#: ../mariadb-server-10.1.templates:7001 +#: ../mariadb-server-10.2.templates:6001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -154,30 +136,44 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "You should check the account's password after the package installation." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:8001 +#: ../mariadb-server-10.2.templates:7001 msgid "" -"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " "more information." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.1.templates:9001 +#: ../mariadb-server-10.2.templates:8001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" +#, fuzzy +#~| msgid "Should MySQL start on boot?" +#~ msgid "Start the MariaDB server on boot?" +#~ msgstr "MariaDB açılış sırasında başlatılsın mı?" + +#, fuzzy +#~ msgid "" +#~ "The MariaDB server can be launched automatically at boot time or manually " +#~ "with the '/etc/init.d/mysql start' command." +#~ msgstr "" +#~ "MariaDB açılış sırasında veya '/etc/init.d/mysql start' komutunu vermeniz " +#~ "halinde elle başlatılabilir. Eğer açılışta otomatik olarak başlatılmasını " +#~ "istiyorsanız burada 'evet'i seçin." + #~ msgid "" #~ "To use mysql you must install an equivalent user and group to the " #~ "following and ensure yourself that /var/lib/mysql has the right " diff --git a/debian/rules b/debian/rules index 1c824626dca..809911d4179 100755 --- a/debian/rules +++ b/debian/rules @@ -3,285 +3,184 @@ export DH_VERBOSE=1 export DEB_BUILD_HARDENING=1 -PACKAGE=mariadb-10.1 - -include /usr/share/dpatch/dpatch.make - -TMP=$(CURDIR)/debian/tmp/ - -ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH) -ARCH_OS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +# enable Debian Hardening +# see: https://wiki.debian.org/Hardening +export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk + +ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH) +ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) +BUILDDIR := builddir DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEBVERSION = $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' ) - +DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM) +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) +DEBVERSION := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' ) DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':')) DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') DEB_NOEPOCH_VERSION ?= $(shell echo $(DEB_VERSION) | cut -d: -f2-) DEB_UPSTREAM_VERSION ?= $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//') DEB_UPSTREAM_VERSION_MAJOR_MINOR := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -r -n 's/^([0-9]+\.[0-9]+).*/\1/p') - -DISTRIBUTION = $(shell lsb_release -i -s) -RELEASE = $(shell lsb_release -r -s) - -MAKE_J = -j$(shell if [ -f /proc/cpuinfo ] ; then grep -c processor.* /proc/cpuinfo ; else echo 1 ; fi) -ifeq (${MAKE_J}, -j0) - MAKE_J = -j1 -endif - -MAKE_TEST_TARGET=test-force -ifneq ($(findstring fulltest,$(DEB_BUILD_OPTIONS)),) -# make test-bt is the testsuite run by the MySQL build team -# before a release, but it is long - MAKE_TEST_TARGET=test-bt +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +DISTRIBUTION := $(shell lsb_release -i -s) +RELEASE := $(shell lsb_release -r -s) +TMP:=$(CURDIR)/debian/tmp + +CC := $(DEB_HOST_GNU_TYPE)-gcc +CXX := $(DEB_HOST_GNU_TYPE)-g++ + +# Parallel build support as advised +# at https://www.debian.org/doc/debian-policy/ch-source.html#s-debianrules-options +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + MAKEFLAGS += -j $(NUMJOBS) +else + # NUMJOBS cannot be empty as it is used as a parameter to mtr, default to 1. + NUMJOBS = 1 endif -USE_ASSEMBLER=--enable-assembler - -ifneq (,$(filter $(ARCH), amd64 i386 ia64 s390)) - TESTSUITE_FAIL_CMD=exit 1 +# Ignore test suite exit code on unstable platforms +ifneq (,$(filter $(ARCH), mips mipsel)) + TESTSUITE_FAIL_CMD:=true else - TESTSUITE_FAIL_CMD=true + TESTSUITE_FAIL_CMD:=exit 1 endif -BUILDDIR = builddir -builddir = $(BUILDDIR) +# Add support for verbose builds +MAKEFLAGS += VERBOSE=1 -# This causes seg11 crashes if LDAP is used for groups in /etc/nsswitch.conf -# so it is disabled by default although, according to MySQL, it brings >10% -# performance gain if enabled. See #299382. -ifeq ($(STATIC_MYSQLD), 1) - USE_STATIC_MYSQLD=--with-mysqld-ldflags=-all-static -endif +override_dh_auto_clean: + @echo "RULES.$@" + dh_testdir + dh_testroot + [ ! -d mysql-test/var ] || rm -rf mysql-test/var + rm -rf $(BUILDDIR) + debconf-updatepo # Update po-files when clean runs before each build + +override_dh_prep: + # Don't clean /tmp/ away, it is needed by all binary packages -configure: patch configure-stamp -configure-stamp: +override_dh_auto_configure: @echo "RULES.$@" dh_testdir -ifneq ($(ARCH_OS),hurd) - if [ ! -d /proc/self ]; then echo "/proc IS NEEDED" 1>&2; exit 1; fi + # Versioned symbols are only available on Linux. + # Remove symbols file on kFreeBSD builds so that + # dpkg-gensymbols will not fail the build. +ifneq (,$(filter $(ARCH), kfreebsd-i386 kfreebsd-amd64)) + rm debian/libmariadb3.symbols endif - ( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \ - sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/usr/local/bin:/usr/bin:/bin"} \ - CC=$${MYSQL_BUILD_CC:-gcc} \ - CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized"} \ - CXX=$${MYSQL_BUILD_CXX:-g++} \ - CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized"} \ - cmake .. \ - -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \ - -DBUILD_CONFIG=mysql_release \ - -DCOMPILATION_COMMENT="mariadb.org binary distribution" \ - -DSYSTEM_TYPE="debian-linux-gnu" \ - -DDEB=ubuntu' - + mkdir -p $(BUILDDIR) && cd $(BUILDDIR) && \ + sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/usr/lib/ccache:/usr/local/bin:/usr/bin:/bin"} \ + CC=${CC} \ + CXX=${CXX} \ + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + $(CMAKEFLAGS) \ + -DCOMPILATION_COMMENT="mariadb.org binary distribution" \ + -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \ + -DSYSTEM_TYPE="debian-$(DEB_BUILD_GNU_SYSTEM)" \ + $${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) \ + -DBUILD_CONFIG=mysql_release \ + -DDEB=$(DISTRIBUTION) ..' touch $@ -build: build-stamp +# This is needed, otherwise 'make test' will run before binaries have been built +override_dh_auto_build: + @echo "RULES.$@" + # Print build env info to help debug builds on different platforms + dpkg-architecture + cd $(BUILDDIR) && $(MAKE) + touch $@ -build-stamp: configure +override_dh_auto_test: @echo "RULES.$@" dh_testdir + # Skip unstable tests if such are defined for arch + [ ! -f debian/unstable-tests.$(ARCH) ] || cat debian/unstable-tests.$(ARCH) >> mysql-test/unstable-tests + # Run testsuite +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + cd $(BUILDDIR)/mysql-test && ./mtr --force --mem --parallel=$(NUMJOBS) --skip-rpl --suite=main --skip-test-list=unstable-tests || $(TESTSUITE_FAIL_CMD) ; +endif - cd $(builddir) && $(MAKE) $(MAKE_J) $(AM_EXTRA_MAKEFLAGS) +override_dh_auto_install: + @echo "RULES.$@" + dh_testdir + dh_testroot -ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),) - if [ ! -f testsuite-stamp ] ; then \ - cd $(builddir) && $(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ; \ - fi +# Skip TokuDB if arch is not amd64 +ifneq ($(ARCH), amd64) + sed -i -e "/Package: mariadb-plugin-tokudb/,+16d" debian/control endif - touch testsuite-stamp + # 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 - touch build-stamp + # Run 'make install' without output since it is uninteresting and + # silencing it helps to make overall build log shorter and more readable + @echo "Running $(MAKE) install DESTDIR=$(TMP) ..." + cd $(BUILDDIR) && $(MAKE) install DESTDIR=$(TMP) > /dev/null -clean: clean-patched unpatch - rm -rf debian/patched -clean-patched: - @echo "RULES.clean-patched" - dh_testdir - dh_testroot - rm -f configure-stamp* - rm -f build-stamp* - rm -f testsuite-stamp - # - [ ! -f Makefile ] || $(MAKE) clean - [ ! -d mysql-test/var ] || rm -rf mysql-test/var - # - rm -rf $(BUILDDIR) + # If mariadb-test package is removed, also remove most of it's files + grep --quiet "Package: mariadb-test" debian/control || rm -rf $(TMP)/usr/share/mysql/mysql-test - debconf-updatepo - dh_clean -v + # Delete runnable files we don't want to have in the test data package. + # This avoids triggering multiple Lintian errors. + rm -rf $(TMP)/usr/share/mysql/mysql-test/plugin/tokudb/tokudb/*.py + rm -rf $(TMP)/usr/share/mysql/mysql-test/plugin/tokudb/tokudb/t/*.py + # 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 -install: build - @echo "RULES.$@" - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # some self written manpages which hopefully - # gets overwritten sooner or later with upstreams - mkdir -p $(TMP)/usr/share/man/man1/ - mkdir -p $(TMP)/usr/share/man/man8/ - cp debian/additions/*.1 $(TMP)/usr/share/man/man1/ - mkdir -p $(TMP)/etc/mysql/conf.d/ - cp debian/additions/mysqld_safe_syslog.cnf $(TMP)/etc/mysql/conf.d/ - - # make install (trailing slash needed for innobase) - cd $(builddir) && $(MAKE) install DESTDIR=$(TMP)/ - # - # After installing, remove rpath to make lintian happy. - set +e; \ - find ./debian/tmp/ -type f -print0 \ - | xargs -0 --no-run-if-empty chrpath -k 2>/dev/null \ - | fgrep RPATH= \ - | cut -d: -f 1 \ - | xargs --no-run-if-empty chrpath -d; \ - set -e - - # libmysqlclient-dev: forgotten header file since 3.23.25? - cp $(BUILDDIR)/include/my_config.h $(TMP)/usr/include/mysql/ - cp include/my_dir.h $(TMP)/usr/include/mysql/ - - # mysql-common: We provide our own version of this package for - # completeness, but we can use an existing version; mariadb-specic - # stuff is in mariadb-common - install -d $(TMP)/etc/mysql - install -m 0644 debian/additions/my.cnf $(TMP)/etc/mysql/my.cnf - - # mariadb-common: MariaDB-specific config stuff. - install -d $(TMP)/etc/mysql/conf.d - install -m 0644 debian/additions/mariadb.cnf $(TMP)/etc/mysql/conf.d/mariadb.cnf - - # mariadb-client - install -m 0755 debian/additions/mysqlreport $(TMP)/usr/bin/ - install -m 0755 debian/additions/innotop/innotop $(TMP)/usr/bin/ - install -m 0644 debian/additions/innotop/innotop.1 $(TMP)/usr/share/man/man1/ - - # mariadb-server - install -m 0755 $(BUILDDIR)/scripts/mysqld_safe $(TMP)/usr/bin/mysqld_safe - mkdir -p $(TMP)/usr/share/doc/mariadb-server-10.1/examples - # We have a sane my.cnf, cruft not needed (remove my-*.cnf and config-*.cnf) - # $(TMP)/usr/share/mysql/*cnf $(TMP)/usr/share/doc/mariadb-server-10.1/examples/ - rm -vf $(TMP)/usr/share/mysql/my-*.cnf \ - $(TMP)/usr/share/mysql/config-*.cnf \ - $(TMP)/usr/share/mysql/mi_test_all* \ - $(TMP)/usr/share/mysql/mysql-log-rotate \ - $(TMP)/usr/share/mysql/mysql.server \ - $(TMP)/usr/share/mysql/binary-configure - nm -n $(BUILDDIR)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/mariadb-server-10.1/mysqld.sym.gz - install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/mysql/ - install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/ - install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/ - - install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-server-10.1/INFO_SRC - install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-server-10.1/INFO_BIN - - # mariadb-test - mv $(TMP)/usr/mysql-test $(TMP)/usr/share/mysql - - # For 5.0 -> 10.1 transition + # For 5.0 -> 10.2 transition d=$(TMP)/usr/share/mysql-common/internal-use-only/; \ mkdir -p $$d; \ - cp debian/mariadb-server-10.1.mysql.init $$d/_etc_init.d_mysql; \ - cp debian/mariadb-server-10.1.mysql-server.logrotate $$d/_etc_logrotate.d_mysql-server; \ + 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; - # install AppArmor profile + # rename and install AppArmor profile install -D -m 644 debian/apparmor-profile $(TMP)/etc/apparmor.d/usr.sbin.mysqld # install Apport hook - install -D -m 644 debian/mariadb-server-10.1.py $(TMP)/usr/share/apport/package-hooks/source_mariadb-10.1.py - - autorm=debian/autorm-file; \ - rm -f $$autorm; \ - ignore=''; \ - for p in $$MARIADB_OPTIONAL_DEBS; do \ - p=mariadb-$$p; \ - dh_movefiles --package=$$p || echo "../$$p*.deb" >> $$autorm; \ - ignore="$$ignore --no-package=$$p"; \ - done; \ - sh -c "dh_movefiles $$ignore" - -# Build architecture-independent files here. -binary-indep: build install - @echo "RULES.binary-indep" - dh_testdir -i - dh_testroot -i - dh_installdebconf -i - dh_installdocs -i - dh_installexamples -i - dh_installmenu -i - dh_installlogrotate -i - dh_installinit -i - dh_installcron -i - dh_installman -i - dh_installinfo -i - dh_installlogcheck -i - dh_installchangelogs -i - dh_link -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_perl -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - -# Build architecture-dependent files here. -binary-arch: build install - @echo "RULES.binary-arch" - dh_testdir - dh_testroot + install -D -m 644 debian/mariadb-server-10.2.py $(TMP)/usr/share/apport/package-hooks/source_mariadb-10.2.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 + + # 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 + + touch $@ - dh_installdebconf -a - dh_installdocs -a - dh_installexamples -a - dh_installmenu -a - dh_installlogrotate -a --name mysql-server - if [ -x /usr/bin/dh_systemd_enable -a -f debian/mariadb-server-10.1/lib/systemd/system/mariadb.service ]; then dh_systemd_enable -pmariadb-server-10.1 mariadb.service; fi - if [ -x /usr/bin/dh_systemd_enable -a -f debian/mariadb-server-10.1/lib/systemd/system/mariadb@.service ]; then dh_systemd_enable --no-enable -pmariadb-server-10.1 mariadb@.service; fi - # Start mysql in runlevel 19 before 20 where apache, proftpd etc gets - # started which might depend on a running database server. - dh_installinit -a --name=mysql -- defaults 19 21 - if [ -x /usr/bin/dh_systemd_start -a -f debian/mariadb-server-10.1/lib/systemd/system/mariadb.service ]; then dh_systemd_start -pmariadb-server-10.1 --restart-after-upgrade mariadb.service; fi - dh_installcron -a --name mysql-server - dh_installman -a - dh_installinfo -a - dh_installlogcheck -a - dh_installchangelogs -a - dh_strip -a - dh_link -a # .so muss nach .so.1.2.3 installier werden! - dh_compress -a --exclude=INFO_BIN - dh_fixperms -a - dh_makeshlibs -a - dh_makeshlibs -plibmariadbclient18 -V'libmariadbclient18 (>= 5.5.1-1)' - dh_installdeb -a - dh_perl -a - dh_shlibdeps -a -l debian/libmariadbclient18/usr/lib -L libmariadbclient18 - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a - -source diff: - @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false - -binary: binary-indep binary-arch +override_dh_installlogrotate-arch: + dh_installlogrotate --name mysql-server + +override_dh_systemd_enable: + dh_systemd_enable --name=mariadb + dh_systemd_enable --no-enable --name=mariadb@ + +# Start mysql at sequence number 19 before 20 where apache, proftpd etc gets +# started which might depend on a running database server. +override_dh_installinit-arch: + dh_installinit --name=mysql -- defaults 19 21 + dh_systemd_start --restart-after-upgrade + +override_dh_installcron-arch: + dh_installcron --name mysql-server get-orig-source: - @wget -nv -T10 -t3 \ - -O /tmp/mysql-$(DEB_UPSTREAM_VERSION).tar.gz \ - http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-$(DEB_UPSTREAM_VERSION_MAJOR_MINOR)/mysql-$(DEB_UPSTREAM_VERSION).tar.gz - @tar xfz /tmp/mysql-$(DEB_UPSTREAM_VERSION).tar.gz -C /tmp - @rm -rf /tmp/mysql-$(DEB_UPSTREAM_VERSION)/Docs - @rm -rf /tmp/mysql-$(DEB_UPSTREAM_VERSION)/debian - @mv /tmp/mysql-$(DEB_UPSTREAM_VERSION) /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig - @cd /tmp ; tar czf $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig - @rm -f /tmp/mysql-$(DEB_UPSTREAM_VERSION).tar.gz - @rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig - -.PHONY: clean clean-patched configure build binary binary-indep binary-arch install patch unpatch + uscan --force-download --verbose + +%: + dh $@ --parallel --with dpatch --with systemd # vim: ts=8 diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000000..89ae9db8f88 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) |