diff --git a/debian/README.Maintainer b/debian/README.Maintainer index b1e0a60..8e6c9e2 100644 --- a/debian/README.Maintainer +++ b/debian/README.Maintainer @@ -1,114 +1,193 @@ +# README for Debian package maintainers # + +This file mostly applies to how the packaging work-flow works for the official +Debian packages, but it may contain useful information also for anybody doing +their own private .deb builds. + + +## Building from sources with git-buildpackage ## + +Clone sources with all branches + sudo apt-get install git-buildpackage + gbp-clone --pristine-tar git://git.debian.org/git/pkg-mysql/mariadb-10.0.git + +Alternatively use Github mirror at https://github.com/ottok/mariadb-10.0.git + +On later runs make sure to have latest version of sources + gbp-pull --pristine-tar --force + + +Build + git-buildpackage --git-pristine-tar + +For a more elaborate setup with automatic build dependency installation and +multi-target chroot usage check out how http://labs.seravo.fi/~otto/mariadb-repo/build.sh +uses git-buildpackage with pbuilder. + +If the build fails the easiest way to clean up before a new run is + git clean -f -d && git reset --hard + + +### Tip ### + + 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" + + If you want to run the build in parallel on 2 CPUs and have verbose output, use: + export DEB_BUILD_OPTIONS="parallel=2 verbose" + + The options above can also be combined freely to get required behaviour. + + +## Importing initial sources from upstream the first fime ## + +Create repository + mkdir mariadb-10.0 + cd mariadb-10.0 + git init + git branch upstream + git-import-orig --pristine-tar ../../upstream/mariadb-10.0.14 + +Fill in values prompted + What will be the source package name? [mariadb] mariadb-10.0 + What is the upstream version? [10.0.14] + +Checkout master into working dir and finish up manually what needs to be done + git checkout master + +Eventually commit and push, build, test binaries, test packages etc.. + git commit -m "Created Debian packaging using git-buildpackage for easy maintenance" + git push --all + git push --tags + + +## Upgrading sources from upstream ## + +Upstream will publish maintenance releases at least 5 years after the major +version release, and security updates are likely to come even after that as +long as major distributions ship the version. + +See table at +https://mariadb.com/kb/en/mariadb/development/mariadb-maintenance-policy/ + +Release notes are available at +https://mariadb.com/kb/en/mariadb/development/release-notes/ + + +### Steps to import new upstream version ### + +Download new source package + cd pkg-mariadb-10.0 + uscan --verbose + +Enter git repository path and apply new sources + cd mariadb-10.0 + git-import-orig --pristine-tar ../mariadb-10.0.14.tar.gz + +Generate new debian/changelog entry + dch -v 10.0.14-1 -D unstable + +Manually merge what needs to be done + +Commit and push + git commit -am "Merged with upstream 10.0.14" + git push --all; git push --all github + git push --tags; git push --tags github + +Note that in above if you want to sync to Github directly you need to have +collaborator rights to the Github repo and you need to add it as a secondary +remote location with: + git remote add origin git@github.com:ottok/mariadb-10.0.git + +To push to the git.debian.org repos you need to a member of the pkg-mysql team +at Alioth. It does not matter which repository you push to, eventually they are +synced with each other anyway. + + +### Maintaining patches ### + +Test that the patches still apply by running: + export QUILT_PATCHES=debian/patches + quilt import + quilt push -a + +If there are any rejects, inspect the files and update the patches. + + +### Maintaining debian/copyright ### + +First install packages: license-reconcile devscripts cdbs + +Check if licenses match + license-reconcile + +Create new copyright file + licensecheck --copyright -r . -c . | /usr/lib/cdbs/licensecheck2dep5 > /tmp/copyright + +..but you need to do lots of manual work to merge the new file with the old, as +licensecheck has a lot of cruft and the original copyright file already had +those cleaned up. + + +### Quality control ### + +Run wrap-and-sort to style contents in debian/* + wrap-and-sort + +Once packages are done check their quality with Lintian + lintian -EvIL +pedantic --color=always *.deb + + +## Uploading to Ubuntu PPA for testing ## + +Make sure you have key ID set up in ~/.devscripts to avoid using -k parameter + DEBSIGN_KEYID=CEE8DA88 + +These are good to have as environment variables (replace values with your own) + DEBEMAIL="otto@seravo.fi" + DEBFULLNAME="Otto Kekäläinen" + export DEBEMAIL DEBFULLNAME + +The run the commands to automatically change version and upload + backportpackage -u ppa:mysql-ubuntu/mariadb -d precise -r *.dsc -S ~ppa1 -y + +## Uploading to Ubuntu security releases ## + +See example with documented procedure: + * https://bugs.launchpad.net/ubuntu/+source/mariadb-5.5/+bug/1464895 + +Probably the most optimal work-flow would be to create a git branch (e.g. +ubuntu-14.04) with custom gbp.conf and maintaining it by importing upstream in +one commit, and updating changelog and other stuff, including refreshing +patches in another commits, so that it would be easy to produce a patch file +that Ubuntu security team can apply upon the mix of previous debian/ contents +from Ubuntu archive and updated others from upstream. This would allow to use +git-buildpackage to produce test builds instead of plain 'fakeroot dpkg-buildpackage'. + +## Comparison to other distributions ## + +For tracking security release information, finding solutions for build errors +on many architectures and for general quality control it can be useful to keep +an eye on what packagers in other distributions do: + +Fedora: + * https://apps.fedoraproject.org/packages/mariadb/ + * http://pkgs.fedoraproject.org/cgit/mariadb.git/ +OpenSUSE: + * https://build.opensuse.org/package/show/server:database/mariadb +Arch Linux: + * https://projects.archlinux.org/svntogit/packages.git/?h=packages/mariadb +Mageia: + * http://svnweb.mageia.org/packages/cauldron/mariadb/current/ + +## Notes about hard to fix bugs ## + +The following issues at https://qa.debian.org/bls/packages/m/mariadb-10.0.html +are due to a bug in GCC which has been reported to GCC and will become fixed +eventually: + E array-bounds /??PKGBUILDDIR??/strings/decimal.c:300 (arm64, armel, armhf, i386, mips, mipsel, powerpc, ppc64el, sparc) + E array-bounds /??PKGBUILDDIR??/strings/decimal.c:496 (arm64, armel, armhf, i386, mips, mipsel, powerpc, ppc64el, sparc) -########################### -## FIXME for 5.1 ## -########################### - -* put this trigger-recreation thing into the init scripts -- what?! - -########################################################################### -# Here are some information that are only of interest for the current and # -# following Debian maintainers of MySQL. # -########################################################################### - -The debian/ directory is under SVN control, see debian/control for URL. - -# -# Preparing a new version -# -The new orig.tar.gz (without non-free documentation) is created in /tmp/ when -running this command: - -debian/rules get-orig-source - -# -# mysqlreport -# -The authors e-mail address is . - -# -# Remarks to dependencies -# -libwrap0-dev (>= 7.6-8.3) - According to bug report 114582 where where build problems on - IA-64/sid with at least two prior versions. -psmisc - /usr/bin/killall in the initscript - -zlib1g in libmysqlclient-dev: - "mysql_config --libs" ads "-lz" - -Build-Dep: - -debhelper (>=4.1.16): - See po-debconf(7). - -autoconf (>= 2.13-20), automake1.7 - Try to get rid of them. - -doxygen, tetex-bin, tetex-extra, gs - for ndb/docs/*tex - -# -# Remarks to the start scripts -# - -## initscripts rely on mysqladmin from a different package -We have the problem that "/etc/init.d/mysql stop" relies on mysqladmin which -is in another package (mysql-client) and a passwordless access that's maybe -only available if the user configured his /root/.my.cnf. Can this be a problem? -* normal mode: not because the user is required to have it. Else: -* purge/remove: not, same as normal mode -* upgrade: not, same as normal mode -* first install: not, it depends on mysql-client which at least is unpacked - so mysqladmin is there (to ping). It is not yet configured - passwordles but if there's a server running then there's a - /root/.my.cnf. Anyways, we simply kill anything that's mysqld. - -## Passwordless access for the maintainer scripts -Another issue is that the scripts needs passwordless access. To ensure this -a debian-sys-maint user is configured which has process and shutdown privs. -The file with the randomly (that's important!) generated password must be -present as long as the databases remain installed because else a new install -would have no access. This file should be used like: - mysqladmin --defaults-file=/etc/mysql/debian.cnf restart -to avoid providing the password in plaintext on a commandline where it would -be visible to any user via the "ps" command. - -## When to start the daemon? -We aim to give the admin full control on when MySQL is running. -Issues to be faced here: -OLD: - 1. Debconf asks whether MySQL should be started on boot so update-rc.d is - only run if the answer has been yes. The admin is likely to forget - this decision but update-rc.d checks for an existing line in - /etc/runlevel.conf and leaves it intact. - 2. On initial install, if the answer is yes, the daemon has to be started. - 3. On upgrades it should only be started if it was already running, everything - else is confusing. Especiall relying on an debconf decision made month ago - is considered suboptimal. See bug #274264 - Implementation so far: - prerm (called on upgrade before stopping the server): - check for a running server and set flag if necessary - preinst (called on initial install and before unpacking when upgrading): - check for the debconf variable and set flag if necessary - postinst (called on initial install and after each upgrade after unpacking): - call update-rc.d if debconf says yes - call invoce-rc.d if the flag has been set - Problems remaining: - dpkg-reconfigure and setting mysql start on boot to yes did not start mysql - (ok "start on boot" literally does not mean "start now" so that might have been ok) -NEW: - 1. --- no debconf anymore for the sake of simplicity. We have runlevel.conf, - the admin should use it - 2. On initial install the server is started. - 3. On upgrades the server is started exactly if it was running before so the - runlevel configuration is irrelevant. It will be preserved by the mean of - update-rc.d's builtin check. - Implementation: - prerm (called on upgrade before stopping the server): - check for a running server and set flag if necessary - preinst (called on initial install and before unpacking when upgrading): - check for $1 beeing (initial) "install" and set flag - postinst (called on initial install and after each upgrade after unpacking): - call update-rc.d - call invoce-rc.d if the flag has been set diff --git a/debian/additions/debian-start b/debian/additions/debian-start old mode 100644 new mode 100755 index 9fd0030..f76256c --- a/debian/additions/debian-start +++ b/debian/additions/debian-start @@ -15,13 +15,14 @@ MYCHECK_SUBJECT="WARNING: mysqlcheck has found corrupt tables" MYCHECK_PARAMS="--all-databases --fast --silent" MYCHECK_RCPT="root" +## Checking for corrupt, not cleanly closed 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. # (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 old mode 100644 new mode 100755 index f507128..adfbb3a --- a/debian/additions/debian-start.inc.sh +++ b/debian/additions/debian-start.inc.sh @@ -65,8 +65,8 @@ function check_root_accounts() { logger -p daemon.info -i -t$0 "Checking for insecure root accounts." - ret=$( echo "SELECT count(*) FROM mysql.user WHERE user='root' and password='';" | $MYSQL --skip-column-names ) + ret=$( echo "SELECT count(*) FROM mysql.user WHERE user='root' and password='' and plugin='';" | $MYSQL --skip-column-names ) if [ "$ret" -ne "0" ]; then - logger -p daemon.warn -i -t$0 "WARNING: mysql.user contains $ret root accounts without password!" + logger -p daemon.warn -i -t$0 "WARNING: mysql.user contains $ret root accounts without password or plugin!" fi } diff --git a/debian/additions/echo_stderr b/debian/additions/echo_stderr old mode 100644 new mode 100755 diff --git a/debian/additions/mariadb.cnf b/debian/additions/mariadb.cnf index 927e9d1..395e794 100644 --- a/debian/additions/mariadb.cnf +++ b/debian/additions/mariadb.cnf @@ -1,17 +1,17 @@ -# MariaDB-specific config file. -# Read by /etc/mysql/my.cnf - -[client] -# Default is Latin1, if you need UTF-8 set this (also in server section) -#default-character-set = utf8 - -[mysqld] +# The MariaDB configuration file # -# * Character sets +# The MariaDB/MySQL tools read configuration files in the following order: +# 1. "/etc/mysql/mariadb.cnf" (this file) to set global defaults, +# 2. "/etc/mysql/conf.d/*.cnf" to set global options. +# 3. "/etc/mysql/mariadb.conf.d/*.cnf" to set MariaDB-only options. +# 4. "~/.my.cnf" to set user-specific options. # -# Default is Latin1, if you need UTF-8 set all this (also in client section) +# If the same option is defined multiple times, the last one will apply. # -#character-set-server = utf8 -#collation-server = utf8_general_ci -#character_set_server = utf8 -#collation_server = utf8_general_ci +# One can use all long options that the program supports. +# Run program with --help to get a list of available options and with +# --print-defaults to see which it would actually understand and use. + +# Import all .cnf files from configuration directory +!includedir /etc/mysql/conf.d/ +!includedir /etc/mysql/mariadb.conf.d/ # # why different include dirs for mysql and mariadb? ##=> debian wish to decouple, we don't want it # diff --git a/debian/additions/mariadb.conf.d/client.cnf b/debian/additions/mariadb.conf.d/client.cnf new file mode 100644 index 0000000..cf52032 --- /dev/null +++ b/debian/additions/mariadb.conf.d/client.cnf # # I'd suggest to use number prefixes, like 10-client.cnf # (this tells that files are read in order) ##=> ok # @@ -0,0 +1,7 @@ +[client] +# Default is Latin1, if you need UTF-8 set this (also in server section) +default-character-set = utf8mb4 + +[mysql] +default-character-set = utf8mb4 + diff --git a/debian/additions/mariadb.conf.d/mysqld_safe.cnf b/debian/additions/mariadb.conf.d/mysqld_safe.cnf new file mode 100644 index 0000000..f483b6f --- /dev/null +++ b/debian/additions/mariadb.conf.d/mysqld_safe.cnf # # why many .cnf files? ##=> ok, will copy rpm structure (file per package) # @@ -0,0 +1,8 @@ +[mysqld_safe] +# This will be passed to all mysql clients +# It has been reported that passwords should be enclosed with ticks/quotes +# escpecially if they contain "#" chars... +# Remember to edit /etc/mysql/debian.cnf when changing the socket location. +socket = /var/run/mysqld/mysqld.sock +nice = 0 +syslog diff --git a/debian/additions/mysql-server.lintian-overrides b/debian/additions/mysql-server.lintian-overrides deleted file mode 100644 index 9d741cf..0000000 --- a/debian/additions/mysql-server.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -W: mysql-dfsg source: maintainer-script-lacks-debhelper-token debian/mysql-server.postinst -W: mysql-server: possible-bashism-in-maintainer-script postinst:68 'p{("a".."z","A".."Z",0..9)[int(rand(62))]}' diff --git a/debian/additions/mysqld_safe_syslog.cnf b/debian/additions/mysqld_safe_syslog.cnf deleted file mode 100644 index 3b0445d..0000000 --- a/debian/additions/mysqld_safe_syslog.cnf +++ /dev/null @@ -1,2 +0,0 @@ -[mysqld_safe] -syslog diff --git a/debian/dist/Ubuntu/apparmor-profile b/debian/apparmor-profile similarity index 100% rename from debian/dist/Ubuntu/apparmor-profile rename to debian/apparmor-profile diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 3ee877a..9210c20 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -27,44 +27,7 @@ RELEASE_NAME="" PATCHLEVEL="+maria" LOGSTRING="MariaDB build" -# Look up distro-version specific stuff. -# -# Libreadline changed to GPLv3. Old GPLv2 version is available, but it -# is called different things on different versions. CODENAME="$(lsb_release -sc)" -case "${CODENAME}" in - etch) LIBREADLINE_DEV=libreadline-dev ;; - lenny|hardy|intrepid|jaunty|karmic|lucid) LIBREADLINE_DEV='libreadline5-dev | libreadline-dev' ;; - squeeze|maverick|natty) LIBREADLINE_DEV=libreadline5-dev ;; - *) LIBREADLINE_DEV=libreadline-gplv2-dev ;; -esac - -case "${CODENAME}" in - etch|lenny|hardy|intrepid|jaunty|karmic) CMAKE_DEP='' ;; - *) CMAKE_DEP='cmake (>= 2.7), ' ;; -esac - -# Clean up build file symlinks that are distro-specific. First remove all, then set -# new links. -DISTRODIRS="$(ls ./debian/dist)" -for distrodir in ${DISTRODIRS}; do - DISTROFILES="$(ls ./debian/dist/${distrodir})" - for distrofile in ${DISTROFILES}; do - rm -f "./debian/${distrofile}"; - done; -done; - -# Set no symlinks for build files in the debian dir, so we avoid adding AppArmor on Debian. -DISTRO="$(lsb_release -si)" -echo "Copying distribution specific build files for ${DISTRO}" -DISTROFILES="$(ls ./debian/dist/${DISTRO})" -for distrofile in ${DISTROFILES}; do - rm -f "./debian/${distrofile}" - sed -e "s/\\\${LIBREADLINE_DEV}/${LIBREADLINE_DEV}/g" \ - -e "s/\\\${CMAKE_DEP}/${CMAKE_DEP}/g" \ - < "./debian/dist/${DISTRO}/${distrofile}" > "./debian/${distrofile}" - chmod --reference="./debian/dist/${DISTRO}/${distrofile}" "./debian/${distrofile}" -done; # # this is needed again in 10.1 for libcrack :( # how to solve conditional dependenies/packages? ##=> for now do 10.1 only on where libcrack is available # (not debian6, precise, wheezy) # # Adjust changelog, add new version. # diff --git a/debian/changelog b/debian/changelog index b22466b..2447747 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,29 +1,240 @@ -mariadb-10.0 (10.0.0) unstable; urgency=low +mariadb-10.0 (10.0.20-3) UNRELEASED; urgency=medium - * Initial release. + [ Andreas Beckmann ] + * mariadb-common: Depend on a version of mysql-common that ships + /usr/share/mysql-common/configure-symlinks. (Closes: #787533) + * mariadb-common.postinst: Drop fallback my.cnf symlink management. + * mariadb-common.preinst: Clean up my.cnf/my.cnf.old from the fallback. - -- Sergei Golubchik Sat, 20 Oct 2012 17:18:44 -0100 + [ Otto Kekäläinen ] + * Minor Lintian fixes -mariadb-5.5 (5.5.1) unstable; urgency=low + [ Olaf van der Spek ] + * Minor spell checking (Closes: #792123) - * Initial release. + [ Israel Tsadok ] + * Fix mariadb-server-10.0.preinst script that failed to save a new + /var/lib/mysql-upgrade/DATADIR.link if a previous DATADIR.link existed and + the /var/lib/mysql directory was a symbolic link with an absolute path + as target (Closes: #792918) - -- Kristian Nielsen Fri, 6 Jan 2012 15:17:23 -0100 + -- Andreas Beckmann Wed, 08 Jul 2015 09:09:58 +0200 -mariadb-5.3 (5.3.0) unstable; urgency=low +mariadb-10.0 (10.0.20-2) unstable; urgency=low - * Initial release. + * Fix bash test logic in postinstall (Closes: #789589) + * Add extra sort in d/rules mysqld.sym.gz command to satisfy Debian + reproducible build requirements + * Switch to utf8mb4 as default character set - -- Sergei Golubchik Mon, 1 Nov 2010 09:16:01 -0100 + -- Otto Kekäläinen Fri, 03 Jul 2015 17:11:01 +0300 -mariadb-5.2 (5.2.0) unstable; urgency=low +mariadb-10.0 (10.0.20-1) unstable; urgency=low - * Initial release. + * New upstream release. Includes fix for the following security vulnerability: + - CVE-2015-3152: Client command line option --ssl-verify-server-cert (and + MYSQL_OPT_SSL_VERIFY_SERVER_CERT option of the client API) when used + together with --ssl will ensure that the established connection is + SSL-encrypted and the MariaDB server has a valid certificate. + * New release includes fix for memory corruption on arm64 (Closes: #787221) + * Added patch to enhance build reproducibility regarding the file INFO_BIN - -- Kristian Nielsen Wed, 17 Mar 2010 12:54:51 -0100 + -- Otto Kekäläinen Fri, 19 Jun 2015 13:01:56 +0300 -mariadb-5.1 (5.1.0) unstable; urgency=low +mariadb-10.0 (10.0.19-1) unstable; urgency=low - * Initial release. + * New upstream release. Fixed the server crash caused by mysql_upgrade + (MDEV-8115). + * Upload to unstable from master branch as Jessie is not released. - -- Peter Lieverdink Tue, 29 Sep 2009 17:05:03 +1000 + -- Otto Kekäläinen Sat, 09 May 2015 22:24:03 +0300 + +mariadb-10.0 (10.0.18-1~exp1) experimental; urgency=low + + * New upstream release. Includes fixes for the following security + vulnerabilities: + - CVE-2014-8964 bundled PCRE contained heap-based buffer overflow + vulnerability that allowed the server to crash or have other unspecified + impact via a crafted regular expression made possible with the + REGEXP_SUBSTR function (MDEV-8006). + - CVE-2015-0501 + - CVE-2015-2571 + - CVE-2015-0505 + - CVE-2015-0499 + * Cleanup in d/copyright + * Make the mariadb-common depends versioned to guarantee that latest + config files are installed + + -- Otto Kekäläinen Thu, 07 May 2015 23:21:20 +0300 + +mariadb-10.0 (10.0.17-1~exp2) experimental; urgency=low + + * d/control: Related to innochecksum manpage move, also break/replace + the mysql-client-5.5/6 packages (Closes: #779873) + * Add automatic fallback to the new /etc/mysql/my.cnf management scheme + for cases where mysql-common/configure-symlinks is not yet available + and users complain the installation ends up broken. + * New release confirmed to build with GCC-5 (Closes: #777996) + + -- Otto Kekäläinen Fri, 06 Mar 2015 16:42:21 +0200 + +mariadb-10.0 (10.0.17-1~exp1) experimental; urgency=low + + [ Jan Wagner ] + * Adding mysqld_multi.server_lsb-header.patch, provides LSB headers for + example initscript (Closes: #778762) + * Adding mysqld_multi_confd.patch, makes mysqld_multi reading conf.d + (Closes: #778761) + + [ Robie Basak ] + * Move innochecksum back to mariadb-server-core-10.0 to align with other + variants (LP: #1421520). + * Fix typo in mariadb-server-10.0.postinst. + * Fix typo in postinst mktemp call (LP: #1420831). + + [ Arnaud Fontaine ] + * d/control: innochecksum manpage has been moved to mariadb-client-10.0 in + 10.0.13-1 (ba97056), thus add Breaks/Replaces in mariadb-client-10.0 + against mariadb-server-10.0 << 10.0.13-1~. + + [ Otto Kekäläinen ] + * Follow to new /etc/mysql/my.cnf management scheme + * Remove the my.cnf move command as it increases complexity too much and might + emit an error code if mariadb-common is upgraded before mysql-common is. + * Add patch to enhance build reproducibility + * Remove /var/log/mysql.log from logrotate. Everything should be inside + the mysql directory (/var/log/mysql/) and not directly on plain /var/log + * New upstream release. Includes fixes for the following security + vulnerabilities (changelog updated post release): + - CVE-2015-2568 + - CVE-2015-2573 + - CVE-2015-0433 + - CVE-2015-0441 + + -- Otto Kekäläinen Mon, 02 Mar 2015 20:01:13 +0200 + +mariadb-10.0 (10.0.16-1~exp3) experimental; urgency=low + + * Update the mail.ssl test to match new cacert.pem + * Stop asking and setting a database root user password. Instead enable + the auth_socket plugin and let unix user root access MariaDB without + a separate password. Admins using sudo or cron scripts can use the + same access too, and there is no debian-sys-maint password either anymore. + + -- Otto Kekäläinen Fri, 30 Jan 2015 18:52:55 +0200 + +mariadb-10.0 (10.0.16-1~exp2) experimental; urgency=low + + * Fix typo in preinstall script (Closes: #776494). + * Backported new cacert.pem etc from 5.5 the replace the expired ones. + + -- Otto Kekäläinen Wed, 28 Jan 2015 20:57:23 +0200 + +mariadb-10.0 (10.0.16-1~exp1) experimental; urgency=low + + * New upstream release. Includes fixes for the following security + vulnerabilities: + - CVE-2015-0411 + - CVE-2015-0382 + - CVE-2015-0381 + - CVE-2015-0432 + - CVE-2014-6568 + - CVE-2015-0374 + + -- Otto Kekäläinen Tue, 27 Jan 2015 17:04:21 +0200 + +mariadb-10.0 (10.0.15-2~exp1) experimental; urgency=low + + * Fix mariadb-server-10.0.postinst so that the flag removal will not emit + an error code if there are no previous debian-*.flag files. This will + fix a dpkg issue caught by piuparts testing. + * Increase the debconf downgrade warning dialog priority to critical to make + sure all users see it and understand why their system broke after downgrade. + * Attempt to fix FTBFS on mips, mipsel, powerpc introduced by upstream + release 10.0.15 (Closes: #772964). + + -- Otto Kekäläinen Fri, 12 Dec 2014 14:07:50 +0200 + +mariadb-10.0 (10.0.15-1) unstable; urgency=low + + [ Arnaud Fontaine ] + * Bump libpcre3-dev Build-Depends to >= 2:8.35-3.2~ (Closes: #767903). + + [ Otto Kekäläinen } + * New upstream release, includes fixes for the following security issues: + - CVE-2014-6507 + - CVE-2014-6491 + - CVE-2014-6500 + - CVE-2014-6469 + - CVE-2014-6555 + - CVE-2014-6559 + - CVE-2014-6494 + - CVE-2014-6496 + - CVE-2014-6464 + * Disable on non-amd64 platforms the new Mroonga storage engine which + was introduced in the new upstream release. + * Allow mariadb-server-10.0 to overwrite file man1/mysql_plugin.1.gz in + mysql-client-5.5 with breaks and replaces (Closes: #771213). + * Clean up old debian-*.flag files from datadir to avoid unexpected + behavior at later upgrades (Closes: #770177). + + -- Otto Kekäläinen Tue, 25 Nov 2014 21:45:43 +0200 + +mariadb-10.0 (10.0.14-4) unstable; urgency=low + + * Updated patch d/username-in-tests-replace.patch to fix the + obfuscation done by anti-spam measures in the MariaDB + commit message view (Closes: #769865). + * Unified indentantion to two spaces in init file for easier + debugging of #609537 + + -- Otto Kekäläinen Mon, 17 Nov 2014 11:45:11 +0200 + +mariadb-10.0 (10.0.14-3) unstable; urgency=low + + * Added patch d/username-in-tests-replace.patch to fix + test failure (Closes: #769212). + * Added versioned dependency on libpcre3 (Closes: #767903). + + -- Otto Kekäläinen Wed, 12 Nov 2014 15:00:11 +0300 + +mariadb-10.0 (10.0.14-2) unstable; urgency=low + + [ Tobias Frost ] + * Fix two lintian warnings in d/copyright (missing "-" between GPL and 2) + * Always be verbose when building the package and show compiler args + + [ Otto Kekäläinen ] + * Upload to unstable + * Updated German translation by Chris Leick and Holger Wansing + (Closes: #763952) + * Updated Dutch translation by Frans Spiesschaert (Closes: #764013) + * Removed libssl-dev from build dependencies in favour of using + bundled YaSSL instead (Closes: #761911) + * Fixed debconf value saving (Closes: #761452) + * Re-enabled TokuDB after backporting upstream fix in MDEV-6815 + * Removed libmariadbclient packages that provided the Debian-only + libmariadbclient.so library that nobody used. Instead developers are + encouraged to use the libraries from the package libmariadb-client-lgpl + instead (Closes: #739452) (Closes: #742172). + + -- Otto Kekäläinen Sat, 18 Oct 2014 19:00:11 +0300 + +mariadb-10.0 (10.0.14-1) experimental; urgency=low + + * New upstream release. (Closes: #757026) + * d/control: Removed Provides: libmysqlclient-dev (Closes: #759309) + * d/control: Removed Provides: libmysqld-dev with same motivation + * Updated Swedish translation by Martin Bagge + and Anders Jonsson (Closes: #762795) + * Updated Spanish translation by Javier Fernandez-Sanguino (Closes: #762751) + * Updated Portugese translation by Miguel Figueiredo (Closes: #763194) + * Updated Czech translation by Miroslav Kure (Closes: #763309) + + -- Otto Kekäläinen Thu, 28 Aug 2014 00:39:02 +0300 + +mariadb-10.0 (10.0.10-1) experimental; urgency=low + + * Initial Upload (Closes: #740473) + + -- Otto Kekäläinen Tue, 01 Apr 2014 09:56:38 +0300 diff --git a/debian/compat b/debian/compat index 7ed6ff8..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +9 # # is that ok for precise and debian6? ##=> ok for precise and wheezy (debian7) # diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..a79cd8c --- /dev/null +++ b/debian/control @@ -0,0 +1,264 @@ +Source: mariadb-10.0 +Section: database +Priority: optional +Maintainer: Debian MySQL Maintainers # # should be changed, I suppose # +Uploaders: Otto Kekäläinen , Arnaud Fontaine +Build-Depends: bison, + chrpath, + cmake, + debhelper (>= 9), # # versioned? was not. is the version needed? debian/compat is 9, not enought? ##=> wiki.debian.org/Multiarch/Implementation # + dh-apparmor, # # also on debian? ##=> yes, and we won't build 10.1 on debian6 # + libaio-dev [linux-any], # # what's linux-any ? # + libboost-dev, + libjemalloc-dev [linux-any], # # not versioned? was >= 3.0.0 # we don't need jemalloc without tokudb, # but if we build with tokudb it must be >= 3.0.0 ##=> not an issue now as we don't build on precise and debian6 # + libjudy-dev, + libncurses5-dev (>= 5.0-6~), + libpam0g-dev, + libpcre3-dev (>= 2:8.35-3.2~), + libreadline-gplv2-dev, + lsb-release, + perl, + po-debconf, + psmisc, + zlib1g-dev (>= 1:1.1.3-5~) # # missing: procps | hurd, libwrap0-dev (>= 7.6-8.3), libssl-dev, dpatch, hardening-wrapper # why? ##=> libssl should be added back # 10.1 needs libcrack2-dev (>= 2.9.0) (where available) # +Standards-Version: 3.9.6 +Homepage: http://mariadb.org/ +Vcs-Git: git://anonscm.debian.org/pkg-mysql/mariadb-10.0.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-mysql/mariadb-10.0.git # # needs to be changed # + +Package: libmariadbd-dev # # s/libmariadb/libmysql/g # +Architecture: any +Section: libdevel +Pre-Depends: ${misc:Pre-Depends} # # why do we need it? ##=> multi-arch support ##=> wiki.debian.org/Multiarch/Implementation # +Depends: ${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 and header files. + +Package: mariadb-common +Architecture: all +Depends: mysql-common (>= 5.6.25), ${misc:Depends} +Multi-Arch: foreign +Description: MariaDB common metapackage + 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. + +Package: mariadb-client-core-10.0 +Architecture: any +Depends: mariadb-common (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} +Conflicts: mysql-client-5.5, mysql-client-5.6 +Breaks: mariadb-client-core-5.5, + mysql-client-core-5.5, + mysql-client-core-5.6, + virtual-mysql-client-core # # why this particular split between breaks and conflicts? # +Replaces: mariadb-client-core-5.5, + mysql-client-core-5.5, + mysql-client-core-5.6, + virtual-mysql-client-core +Provides: virtual-mysql-client-core +Description: MariaDB database core 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 + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the core client files, as used by Akonadi. + +Package: mariadb-client-10.0 +Architecture: any +Depends: debianutils (>=1.6), # # why? # + libdbi-perl, + libterm-readkey-perl, + mariadb-client-core-10.0 (>= ${source:Version}), + ${misc:Depends}, + ${perl:Depends}, + ${shlibs:Depends} +Recommends: libdbd-mysql-perl (>= 1.2202) # # really? why libdbi-perl is required but libdbd-perl is optional? # the one makes no sense without the other. and libterm-readkey-perl # is required, why it's really optional, everything works without it. # +Conflicts: mysql-client-core-5.5, mysql-client-core-5.6 +Breaks: mariadb-client-5.5, + mariadb-server-10.0 (<< 10.0.13-1~), + mysql-client, + mysql-client-5.5, + mysql-client-5.6, + virtual-mysql-client +Replaces: mariadb-client-5.5, + mariadb-server-10.0 (<< 10.0.13-1~), + mysql-client, + mysql-client-5.5, + mysql-client-5.6, + virtual-mysql-client +Provides: virtual-mysql-client # # doesn't provide mysq-client-5.5? # +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 + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the client binaries and the additional tools + innotop and mysqlreport. + +Package: mariadb-server-core-10.0 +Architecture: any +Depends: mariadb-common (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} +Conflicts: mariadb-galera-server-5.5, mysql-server-5.5, mysql-server-5.6 # # same q about conflicts vs breaks # +Breaks: mariadb-client-10.0 (<< ${source:Version}), + mariadb-server-core-5.5, + mysql-server-core-5.5, + mysql-server-core-5.6, + mysql-client-5.5, + mysql-client-5.6, + virtual-mysql-server-core +Replaces: mariadb-client-10.0 (<< ${source:Version}), + mariadb-server-core-5.5, + mysql-server-core-5.5, + mysql-server-core-5.6, + mysql-client-5.5, + mysql-client-5.6, + virtual-mysql-server-core +Provides: virtual-mysql-server-core # # and about provides # +Description: MariaDB database core server 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 core server files, as used by Akonadi. + +Package: mariadb-test-10.0 +Architecture: any +Depends: mariadb-client-10.0 (>= ${source:Version}), + mariadb-server-10.0 (>= ${source:Version}), # # make it = ${source:Version}, the test won't necessarily pass with a later # version of a server (or a client) # + ${misc:Depends}, + ${shlibs:Depends} +Breaks: mariadb-test (<< ${source:Version}), + mariadb-test-5.5, + mysql-testsuite, + mysql-testsuite-5.5, + mysql-testsuite-5.6, + virtual-mysql-testsuite +Replaces: mariadb-test (<< ${source:Version}), + mariadb-test-5.5, + mysql-testsuite, + mysql-testsuite-5.5, + mysql-testsuite-5.6, + 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-server-10.0 +Architecture: any +Suggests: mailx, mariadb-test, tinyca # # I wouldn't suggest mariadb-test. why mailx? # +Recommends: libhtml-template-perl # # what is that for? # +Pre-Depends: adduser (>= 3.40), debconf, mariadb-common (>= ${source:Version}) # # I don't think it needs Pre-Depends, normal Depends should be ok # +Depends: libdbi-perl, + lsb-base (>= 3.0-10), + mariadb-client-10.0 (>= ${source:Version}), + mariadb-server-core-10.0 (>= ${binary:Version}), + passwd, + perl (>= 5.6), + psmisc, + ${misc:Depends}, + ${shlibs:Depends} +Conflicts: mariadb-tokudb-engine-10.0, + mariadb-tokudb-engine-5.5, + mysql-server-core-5.5, + mysql-server-core-5.6 +Breaks: mariadb-galera-server, + mariadb-galera-server-5.5, + mariadb-server-5.5, + mariadb-tokudb-engine-10.0, + mariadb-tokudb-engine-5.5, + mysql-client-5.5, + mysql-server, + mysql-server-5.5, + mysql-server-5.6, + virtual-mysql-server +Replaces: mariadb-galera-server, + mariadb-galera-server-5.5, + mariadb-server-5.5, + mariadb-tokudb-engine-10.0, + mariadb-tokudb-engine-5.5, + mysql-client-5.5, + mysql-server, + mysql-server-5.5, + mysql-server-5.6, + virtual-mysql-server +Provides: virtual-mysql-server # # same q about conflicts/breaks and about provides # +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 + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the server binaries. + +Package: mariadb-server +Architecture: all +Depends: mariadb-server-10.0 (>= ${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.0), 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. + . + 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. + +Package: mariadb-client +Architecture: all +Depends: mariadb-client-10.0 (>= ${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.0), 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.0 (>= ${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.0), as determined by the MariaDB + maintainers. + +Package: mariadb-connect-engine-10.0 # # should be renamed to mariadb-connect-engine # because the plugin version should always match the server # version and the user should not be able to pin # plugin to 10.0 # # same for mariadb-oqgraph-engine-10.0 and for mariadb-tests-10.0 # +Architecture: any +Depends: libxml2, + mariadb-server-10.0|mariadb-galera-server-10.0, + unixodbc, + ${misc:Depends}, + ${shlibs:Depends} +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.0 +Architecture: any +Depends: libjudydebian1, + mariadb-server-10.0|mariadb-galera-server-10.0, + ${misc:Depends}, + ${shlibs:Depends} +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. # # libmariadbclient/libmysqlclient packages are removed in debian, # should be restored here # diff --git a/debian/copyright b/debian/copyright index 9c98778..89b60ce 100644 --- a/debian/copyright +++ b/debian/copyright # ##=> do not upstream it! # @@ -1,61 +1,1198 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: MariaDB 10.0 +Upstream-Contact: https://mariadb.atlassian.net/browse/MDEV # # may be an email? # +Source: https://code.launchpad.net/~maria-captains/maria/10.0 # # github # +Comment: + Originally produced by a modified version of licensecheck2dep5 + from CDBS by Clint Byrum . Hand modified to reduce + redundancy in the output and add appropriate license text. The file + has been rechecked against the source using the development version + of license-reconcile, see #686485. + . + Also, MySQL carries the "FOSS License Exception" specified in README + . + Quoting from README: + . + MySQL FOSS License Exception We want free and open source + software applications under certain licenses to be able to use + specified GPL-licensed MySQL client libraries despite the fact + that not all such FOSS licenses are compatible with version + 2 of the GNU General Public License. Therefore there are + special exceptions to the terms and conditions of the GPLv2 + as applied to these client libraries, which are identified + and described in more detail in the FOSS License Exception at + . + . + The text of the Above URL is quoted below, as of Aug 17, 2011. + . + > FOSS License Exception + > . + > Updated July 1, 2010 + > . + > What is the FOSS License Exception? Oracle's Free and Open Source + > Software ("FOSS") License Exception (formerly known as the FLOSS + > License Exception) allows developers of FOSS applications to include + > Oracle's MySQL Client Libraries (also referred to as "MySQL Drivers" + > or "MySQL Connectors") with their FOSS applications. MySQL Client + > Libraries are typically licensed pursuant to version 2 of the General + > Public License ("GPL"), but this exception permits distribution of + > certain MySQL Client Libraries with a developer's FOSS applications + > licensed under the terms of another FOSS license listed below, + > even though such other FOSS license may be incompatible with the GPL. + > . + > The following terms and conditions describe the circumstances under + > which Oracle's FOSS License Exception applies. + > . + > Oracle's FOSS License Exception Terms and Conditions Definitions. + > "Derivative Work" means a derivative work, as defined under applicable + > copyright law, formed entirely from the Program and one or more + > FOSS Applications. + > . + > "FOSS Application" means a free and open source software application + > distributed subject to a license listed in the section below titled + > "FOSS License List." + > . + > "FOSS Notice" means a notice placed by Oracle or MySQL in a copy + > of the MySQL Client Libraries stating that such copy of the MySQL + > Client Libraries may be distributed under Oracle's or MySQL's FOSS + > (or FLOSS) License Exception. + > . + > "Independent Work" means portions of the Derivative Work that are not + > derived from the Program and can reasonably be considered independent + > and separate works. + > . + > "Program" means a copy of Oracle's MySQL Client Libraries that + > contains a FOSS Notice. + > . + > A FOSS application developer ("you" or "your") may distribute a + > Derivative Work provided that you and the Derivative Work meet all + > of the following conditions: You obey the GPL in all respects for + > the Program and all portions (including modifications) of the Program + > included in the Derivative Work (provided that this condition does not + > apply to Independent Works); The Derivative Work does not include any + > work licensed under the GPL other than the Program; You distribute + > Independent Works subject to a license listed in the section below + > titled "FOSS License List"; You distribute Independent Works in + > object code or executable form with the complete corresponding + > machine-readable source code on the same medium and under the same + > FOSS license applying to the object code or executable forms; All + > works that are aggregated with the Program or the Derivative Work + > on a medium or volume of storage are not derivative works of the + > Program, Derivative Work or FOSS Application, and must reasonably + > be considered independent and separate works. Oracle reserves all + > rights not expressly granted in these terms and conditions. If all + > of the above conditions are not met, then this FOSS License Exception + > does not apply to you or your Derivative Work. + > . + > FOSS License List + > . + > License Name Version(s)/Copyright Date + > Release Early Certified Software + > Academic Free License 2.0 + > Apache Software License 1.0/1.1/2.0 + > Apple Public Source License 2.0 + > Artistic license From Perl 5.8.0 + > BSD license "July 22 1999" + > Common Development and Distribution License (CDDL) 1.0 + > Common Public License 1.0 + > Eclipse Public License 1.0 + > European Union Public License (EUPL)[1] 1.1 + > GNU Library or "Lesser" General Public License (LGPL) 2.0/2.1/3.0 + > GNU General Public License (GPL) 3.0 + > IBM Public License 1.0 + > Jabber Open Source License 1.0 + > MIT License (As listed in file MIT-License.txt) - + > Mozilla Public License (MPL) 1.0/1.1 + > Open Software License 2.0 + > OpenSSL license (with original SSLeay license) "2003" ("1998") + > PHP License 3.0/3.01 + > Python license (CNRI Python License) - + > Python Software Foundation License 2.1.1 + > Sleepycat License "1999" + > University of Illinois/NCSA Open Source License - + > W3C License "2001" + > X11 License "2001" + > Zlib/libpng License - + > Zope Public License 2.0 + > [1] When an Independent Work is licensed under a "Compatible License" + > pursuant to the EUPL, the Compatible License rather than the EUPL is + > the applicable license for purposes of these FOSS License Exception + > Terms and Conditions. + . + The above text is subject to this copyright notice: + © 2010, Oracle and/or its affiliates. -== MariaDB == +Files: * +Copyright: + 2000-2012, Oracle and/or its affiliates. All rights reserved. + 2008-2013 Monty Program AB +License: GPL-2 + +Files: debian/* +Copyright: + 1997-1998, Scott Hanson + 1997, Christian Schwarz + 1999-2007, 2009, Christian Hammers + 2000-2001, Christopher C. Chimelis + 2001, Matthew Wilcox + 2005-2007, sean finney + 2006, Adam Conrad + 2007-2011, Norbert Tretkowski + 2007-2008, Monty Taylor + 2008, Devin Carraway + 2008, Steffen Joeris + 2009, Canonical Ltd + 2010, Xavier Oswald + 2011, Clint Byrum + 2011, Ondřej Surý + 2012, Nicholas Bamber + 2013, Kristian Nielsen + 2013-2014, Otto Kekäläinen +License: GPL-2+ + +Files: plugin/feedback/* +Copyright: 2010 Sergei Golubchik and Monty Program Ab +License: GPL-2 + +Files: debian/additions/mysqlreport* +Copyright: 2006-2008, Daniel Nichter +License: GPL-2+ + +Files: + dbug/example1.c + dbug/example2.c + dbug/example3.c + dbug/factorial.c + dbug/main.c + dbug/my_main.c + dbug/remove_function_from_trace.pl + dbug/tests.c + dbug/tests-t.pl + include/probes_mysql_nodtrace.h + libmysqld/resource.h + mysql-test/* + storage/ndb/bin/* + storage/ndb/demos/* + support-files/binary-configure.sh + support-files/my-huge.cnf.sh + support-files/my-innodb-heavy-4G.cnf.sh + support-files/my-large.cnf.sh + support-files/my-medium.cnf.sh + support-files/my-small.cnf.sh + support-files/mysqld_multi.server.sh + support-files/mysql-log-rotate.sh + support-files/mysql.server-sys5.sh + Docs/* +Copyright: UNKNOWN +Comment: These files fall under the blanket license specified in the file + COPYING and README + GPLv2 Disclaimer: + For the avoidance of doubt, except that if any license choice + other than GPL or LGPL is available it will apply instead, + Oracle elects to use only the General Public License version 2 + (GPLv2) at this time for any software where a choice of GPL + license versions is made available with the language indicating + that GPLv2 or any later version may be used, or where a choice + of which version of the GPL is applied is otherwise unspecified. +License: GPL-2 + +Files: BUILD/* + client/* + client/echo.c + client/get_password.c + cmake/* + dbug/dbug_add_tags.pl + extra/* + include/* + libmysql/* + libmysqld/* + libservices/* + mysql-test/include/have_perfschema.inc + mysql-test/lib/mtr_cases.pm + mysql-test/lib/mtr_gcov.pl + mysql-test/lib/mtr_gprof.pl + mysql-test/lib/mtr_io.pl + mysql-test/lib/mtr_match.pm + mysql-test/lib/mtr_process.pl + mysql-test/lib/mtr_report.pm + mysql-test/lib/mtr_results.pm + mysql-test/lib/mtr_stress.pl + mysql-test/lib/mtr_unique.pm + mysql-test/lib/My/Config.pm + mysql-test/lib/My/CoreDump.pm + mysql-test/lib/My/File/* + mysql-test/lib/My/Find.pm + mysql-test/lib/My/Handles.pm + mysql-test/lib/My/Options.pm + mysql-test/lib/My/Platform.pm + mysql-test/lib/My/SafeProcess/Base.pm + mysql-test/lib/My/SafeProcess/safe_kill_win.cc + mysql-test/lib/My/SafeProcess/safe_process.cc + mysql-test/lib/My/SafeProcess/safe_process_win.cc + mysql-test/lib/My/SysInfo.pm + mysql-test/lib/My/Test.pm + mysql-test/lib/t/* + mysql-test/lib/v1/mtr_cases.pl + mysql-test/lib/v1/mtr_gcov.pl + mysql-test/lib/v1/mtr_gprof.pl + mysql-test/lib/v1/mtr_im.pl + mysql-test/lib/v1/mtr_io.pl + mysql-test/lib/v1/mtr_match.pl + mysql-test/lib/v1/mtr_process.pl + mysql-test/lib/v1/mtr_report.pl + mysql-test/lib/v1/mtr_stress.pl + mysql-test/lib/v1/mtr_timer.pl + mysql-test/lib/v1/mtr_unique.pl + mysql-test/lib/v1/My/* + mysql-test/lib/v1/mysql-test-run.pl + mysql-test/lib/v1/mtr_misc.pl + mysql-test/mysql-stress-test.pl + mysql-test/mysql-test-run.pl + mysql-test/std_data/* + mysql-test/suite/perfschema/include/* + mysql-test/suite/perfschema_stress/include/* + mysys/* + packaging/WiX/ca/* + plugin/audit_null/* + plugin/auth_* + plugin/daemon_example/* + plugin/fulltext/* + scripts/* + sql/* + sql-common/* + storage/* + strings/* + support-files/config.huge.ini.sh + support-files/config.medium.ini.sh + support-files/config.small.ini.sh + support-files/MacOSX/* + support-files/RHEL4-SElinux/mysql.* + support-files/MySQL-shared-compat.spec.sh + support-files/compiler_warnings.supp + support-files/mysql.* + support-files/dtrace/* + support-files/ndb-config-2-node.ini.sh + tests/* + unittest/* + vio/* +Copyright: 1979-2009 MySQL AB + 1995-2010 Sun Microsystems Inc + 1994-1997,2000-2014 Oracle and/or its affiliates + 2010 Kristian Nielsen + 2012 MariaDB Services + 2013 MariaDB Foundation + 2010,2013 Sergei Golubchik + 1985,1995,2008-2011,2012-2014 Monty Program AB + 2008-2014 SykSQL Ab + 1993-2014 Olivier Bertrand + 2008-2014 Kentoku Shiba + 2013 Sergey Vojtovich and MariaDB Foundation + 2006 MySQL AB & MySQL Finland AB & TCX DataKonsult AB + 2012 Michael Widenius + 2010-2011 DeNA Co.,Ltd. + 2011 Kentoku SHIBA +License: GPL-2 + +Files: extra/yassl/COPYING* extra/yassl/taocrypt/COPYING* +Copyright: 1989, 1991 Free Software Foundation, Inc +License: GPL-verbatim + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Files: include/maria.h include/myisamchk.h +Copyright: 2006-2008 MySQL AB + 2008-2009 Sun Microsystems, Inc + 2009, 2013, Monty Program Ab +License: GPL-2+ + +Files: plugin/auth_pam/testing/pam_mariadb_mtr.c +Copyright: none +License: public-domain + +Files: plugin/locale_info/locale_info.cc +Copyright: 2013, Spaempresarial - Brazil, Roberto Spadim +License: BSD-3-clause + +Files: plugin/qc_info/qc_info.cc +Copyright: 2008, Roland Bouman +License: BSD-3-clause + +Files: tests/async_queries.c tests/nonblock-wrappers.h sql-common/mysql_async.c +Copyright: 2011 Kristian Nielsen and Monty Program Ab +License: LGPL-2.1+ + +Files: include/ma_dyncol.h include/queues.h mysys/ma_dyncol.c mysys/queues.c + unittest/mysys/ma_dyncol-t.c +Copyright: 2010,2011,2013 Monty Program Ab + 2011,2012 Oleksandr Byelkin +License: BSD-2-clause + +Files: include/my_context.h mysys/my_context.c +Copyright: 2011,2012 Kristian Nielsen and Monty Program Ab +License: LGPL-2.1+ + +Files: mysys/my_port.c +Copyright: 2002 MySQL AB +License: LGPL-2 + +Files: mysys/my_safehash.* +Copyright: 2003-2007 MySQL AB +License: GPL-2+ + +Files: strings/bmove_upp.c strings/is_prefix.c strings/llstr.c + strings/longlong2str.c strings/strcont.c strings/strfill.c strings/strmov.c + strings/strnmov.c strings/bchange.c strings/int2str.c strings/my_strtoll10.c + strings/str2int.c strings/strappend.c strings/strcend.c +Copyright: 2009-2013, Monty Program Ab + 2000,2003 TXT DataKonsult Ab & Monty Program Ab +License: BSD-2-clause + +Files: strings/strxmov.c strings/strxnmov.c strings/strxnmov.c strings/strxmov.c + strings/strnlen.c +Copyright: 2009-2011, Monty Program Ab + 2000 TXT DataKonsult Ab & Monty Program Ab + Richard A. O'Keefe +License: BSD-2-clause + +Files: client/async_example.c +Copyright: 2011 Kristian Nielsen and Monty Program Ab +License: LGPL-2.1+ + +Files: storage/oqgraph/* +Copyright: + 2007-2013 Arjen G Lentz & Antony T Curtis for Open Query + 2000-2006 MySQL AB +License: GPL-2+ + +Files: storage/connect/connect.cc +Copyright: 2004-2012 Olivier Bertrand +License: GPL-2+ + +Files: storage/connect/inihandl.c +Copyright: 1993 Miguel de Icaza + 1996 Alexandre Julliard +License: LGPL-2.1+ + +Files: storage/oqgraph/ha_oqgraph.* + storage/oqgraph/oqgraph_probes.d +Copyright: + 2007-2013 Arjen G Lentz & Antony T Curtis for Open Query + 2000-2006 MySQL AB +License: GPL-2 + +Files: extra/*/INSTALL +Copyright: 1994-1996, 1999-2002, 2004-2006, Free Software Foundation, Inc. +License: unlimited-free-doc + This file is free documentation; the Free Software Foundation gives + unlimited permission to copy, distribute and modify it. + +Files: mysql-test/lib/mtr_misc.pl + mysql-test/lib/My/SafeProcess.pm +Copyright: 2004, 2007, 2011, Oracle and/or its affiliates +License: LGPL + +Files: + storage/myisam/ft_update.c + storage/myisam/fulltext.h + storage/myisam/ft_boolean_search.c + storage/myisam/ft_stopwords.c + storage/myisam/ft_nlq_search.c + storage/myisam/ft_parser.c + storage/myisam/myisam_ftdump.c +Copyright: + 2000, 2001, 2010, 2011, Oracle and/or its affiliates + Sergei A. Golubchik +License: GPL-2 + +Files: storage/myisam/ft_myisam.c +Copyright: 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +License: GPL-2+ + +Files: storage/innobase/* +Copyright: + 1994-2011 Sergei A. Golubchik + 1996 Michael Widenius + 1994-2014 Oracle and/or its affiliates + 2008-2009 Google Inc + 2009 Sun Microsystems, Inc + 2009 Percona Inc + 2013, 2014 SkySQL Ab + 2012 Facebook Inc +License: GPL-2 + +Files: storage/maria/* +Copyright: + 2008-2009 Sun Microsystems, Inc + 2008 Sun AB + 2006 MySQL Finland AB + 2006 TCX DataKonsult AB + 2003-2008 MySQL AB + 2007-2008 Michael Widenius + 2007 Guilhem Bichot + 2006 Sergei A. Golubchik + 2007 Sanja Belkin + 2006 Ramil Kalimullin + 2006 Alexey Botchkov + 2008-2011 Monty Program Ab + 2004-2008 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +License: GPL-2 + +Files: storage/xtradb/* +Copyright: + 1994-2014 Oracle and/or its affiliate + 2011-2013 Orcale Corpn + 1994-2013 Innobase Oy + 2008-2009 Google Inc + 2009-2010,2012 Facebook Inc + 2009-2012 Percona Inc + 2013, 2014, SkySQL Ab +License: GPL-2 + +Files: storage/innobase/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc +Copyright: 2009, 2010 Facebook, Inc. + 2011 Oracle and/or its affiliates. +License: GPL-2 and BSD-2-clause + +Files: storage/innobase/COPYING.Google storage/xtradb/COPYING.Google +Copyright: 2008 Google Inc +License: BSD-3-clause + +Files: storage/innobase/COPYING.Percona storage/xtradb/COPYING.Percona +Copyright: 2008-2009 Percona Inc +License: BSD-3-clause + +Files: cmd-line-utils/readline/* +Copyright: 1987-2006 Free Software Foundation Inc +License: GPL-2+ + +Files: cmd-line-utils/libedit/* +Copyright: 1989-1990,1992-1993 The Regents of the University of California. +License: BSD-3-clause + +Files: cmd-line-utils/libedit/chartype.* cmd-line-utils/libedit/eln.c +Copyright: 2009, The NetBSD Foundation, Inc. +License: BSD-4-clause + +Files: cmd-line-utils/libedit/np/wcsdup.c +Copyright: 2006 Aleksey Cheusov +License: public-domain + +Files: cmd-line-utils/libedit/filecomplete.c + cmd-line-utils/libedit/filecomplete.h + cmd-line-utils/libedit/np/fgetln.c + cmd-line-utils/libedit/read.h + cmd-line-utils/libedit/readline.c + cmd-line-utils/libedit/readline/* +Copyright: 1997-2001 The NetBSD Foundation Inc +License: BSD-2-clause + +Files: sql-bench/*.sh +Copyright: 2009 Sun Microsystems, Inc + 2000-2007 MySQL AB +License: LGPL + +Files: client/completion_hash.h + scripts/mysqlaccess.sh + scripts/mysql_fix_extensions.sh + scripts/mysql_setpermission.sh + storage/myisam/ftbench/ft-test-run.sh + storage/myisam/mi_test_all.sh + storage/ndb/test/run-test/atrt-* + storage/ndb/test/run-test/make-config.sh + storage/ndb/test/run-test/make-html-reports.sh + storage/ndb/test/run-test/make-index.sh + storage/ndb/test/run-test/ndb-autotest.sh + strings/ctype-uca.c + strings/ctype-ucs2.c + strings/ctype-utf8.c + support-files/MacOSX/postflight.sh + support-files/MacOSX/preflight.sh + mysql-test/lib/My/ConfigFactory.pm + mysql-test/mysql-stress-test.pl + BUILD/*.sh + BUILD/compile-amd64-debug-max-no-ndb + BUILD/compile-solaris-amd64 + BUILD/compile-amd64-valgrind-max + BUILD/compile-pentium64-max + BUILD/compile-pentium64 + BUILD/compile-pentium-valgrind-max-no-ndb + scripts/mysqlhotcopy.sh + scripts/mysqld_multi.sh + mysql-test/mysql-stress-test.pl + mysql-test/std_data/checkDBI_DBD-mysql.pl +Copyright: 2000-2013 Oracle and/or its affiliates + 2000-2007 MySQL AB + 2009 Sun Microsystems Inc +License: LGPL + +Files: BUILD/util.sh +Copyright: 2010 Kristian Nielsen and Monty Program AB +License: GPL-2 + +Files: storage/archive/azio.c + storage/archive/azlib.h + zlib/* +Copyright: + 1995-2005 Jean-loup Gailly + 1995-2005 Mark Adler +License: zlib/libpng + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + . + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + . + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. -The Debian package of MySQL was first debianzed on 1997-04-12 by Christian -Schwarz and ist maintained since 1999-04-20 by -Christian Hammers . +Files: sql-bench/innotest1.sh + sql-bench/innotest1a.sh + sql-bench/innotest1b.sh + sql-bench/innotest2.sh + sql-bench/innotest2a.sh + sql-bench/innotest2b.sh +Copyright: 2000-2002 Innobase Oy & MySQL AB +Comment: These files fall under the blanket license specified in the file COPYING +License: GPL-2 -The MariaDB packages were initally made by http://ourdelta.org/, and -are now managed by the MariaDB development team, -maria-developers@lists.launchpad.net +Files: sql-bench/graph-compare-results.sh + cmd-line-utils/libedit/config.h + cmd-line-utils/libedit/historyn.c + cmd-line-utils/libedit/tokenizern.c +Copyright: UNKNOWN +Comment: These files fall under the blanket license specified in the file + COPYING and README +License: GPL-2 -MariaDB can be downloaded from http://downloads.askmonty.org/mariadb/ +Files: storage/myisam/rt_index.h + storage/myisam/rt_key.* + storage/myisam/rt_mbr.* + storage/myisam/sp_defs.h +Copyright: + 2000,2002-2007 MySQL AB + Ramil Kalimullin +License: GPL-2 +Files: strings/ctype-bin.c + strings/ctype-eucjpms.c + strings/ctype-ujis.c Copyright: + 2000,2002,2005-2011 Oracle and/or its affiliates + tommy@valley.ne.jp +License: LGPL + +Files: scripts/mysqld_safe.sh + support-files/mysql-multi.server.sh + support-files/mysql.server.sh +Copyright: 1996 Abandoned TCX DataKonsult AB & Monty Program KB & Detron HB +License: public-domain + +Files: sql/sql_yacc.cc sql/sql_yacc.h storage/xtradb/fts/fts0pars.cc + storage/xtradb/include/fts0pars.h +Copyright: 1984,1989-1990,2000-2011 Free Software Foundation, Inc. +License: GPL-3+-with-bison-exception + +Files: storage/innobase/include/pars0grm.h storage/xtradb/include/pars0grm.h + storage/xtradb/pars/pars0grm.cc storage/innobase/pars/pars0grm.cc +Copyright: 1995-2009 Innobase Oy. + 1984,1989-1990,2000-2004 Free Software Foundation Inc. +License: GPL-2+-with-bison-exception + 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, 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-1301, USA. + . + As a special exception, you may create a larger work that contains + part or all of the Bison parser skeleton and distribute that work + under terms of your choice, so long as that work isn't itself a + parser generator using the skeleton or a modified version thereof + as a parser skeleton. Alternatively, if you modify or redistribute + the parser skeleton itself, you may (at your option) remove this + special exception, which will cause the skeleton and the resulting + Bison output files to be licensed under the GNU General Public + License without this special exception. + . + This special exception was added by the Free Software Foundation in + version 2.2 of Bison. + +Files: storage/innobase/fts/fts0pars.cc + storage/innobase/fts/fts0pars.cc + storage/innobase/include/fts0pars.h +Copyright: 1984, 1989-1990, 2000-2006 Free Software Foundation, Inc. +License: GPL-3+-with-bison-exception + +License: GPL-3+-with-bison-exception + 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 3 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, see . + . + As a special exception, you may create a larger work that contains + part or all of the Bison parser skeleton and distribute that work + under terms of your choice, so long as that work isn't itself a + parser generator using the skeleton or a modified version thereof + as a parser skeleton. Alternatively, if you modify or redistribute + the parser skeleton itself, you may (at your option) remove this + special exception, which will cause the skeleton and the resulting + Bison output files to be licensed under the GNU General Public + License without this special exception. + . + This special exception was added by the Free Software Foundation in + version 2.2 of Bison. + + +Files: include/t_ctype.h + strings/t_ctype.h +Copyright: 2000 MySQL AB + 1998 Theppitak Karoonboonyanan + 1998-1999 Pruet Boonma +License: GPL-2 + +Files: strings/strend.c +Copyright: Richard A. O'Keefe. + 2000 TXT DataKonsult Ab & Monty Program Ab + 2009-2011, Monty Program Ab +License: BSD-2-clause + +Files: cmd-line-utils/libedit/np/strlcat.c + cmd-line-utils/libedit/np/strlcpy.c +Copyright: 1998 Todd C. Miller +License: ISC + Permission to use, copy, modify, and distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + . + THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL + WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE + FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION + OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +Files: sql/nt_servc.cc + sql/nt_servc.h +Copyright: 1998 Abandoned Irena Pancirov - Irnet Snc +License: public-domain + +Files: dbug/dbug.c + dbug/dbug_long.h +Copyright: 1987 Abandoned Fred Fish +License: public-domain + +Files: cmd-line-utils/libedit/np/vis.c +Copyright: 1989-1993 The Regents of the University of California. + 1999-2005 The NetBSD Foundation Inc +License: BSD-3-clause + +Files: scripts/dheadgen.pl +Copyright: 2008-2009 Sun Microsystems Inc +License: BSD-3-clause + +Files: storage/ndb/test/src/getarg.c +Copyright: 1997-2000 - Kungliga Tekniska Högskolan +License: BSD-3-clause + +Files: storage/ndb/test/include/getarg.h +Copyright: 2003-2005 MySQL AB + 1997-1999 Kungliga Tekniska Högskolan +License: BSD-3-clause or GPL-2 + +Files: plugin/handler_socket/* +Copyright: + 2010 DeNA Co.,Ltd. +License: BSD-3-clause + +Files: pcre/* +Copyright: 1997-2014 University of Cambridge + 2003-2014 Google Inc. +License: BSD-3-clause + +Files: plugin/semisync/* +Copyright: + 2007 Google Inc + 1995-2008 MySQL AB + 2008-2010 Sun Microsystems Inc +License: GPL-2 + +Files: */CMakeLists.txt +Copyright: + 2006-2011,2013 Oracle and/or its affiliates + 2009, 2010 Sun Microsystems, Inc + 2006,2007 MySQL AB +License: GPL-2 + +Files: mysys/CMakeLists.txt +Copyright: 2006, 2014, Oracle and/or its affiliates +License: GPL-2 + +Files: plugin/server_audit/CMakeLists.txt +Copyright: 2013 Alexey Botchkov and SkySQL Ab +License: GPL-2 + +Files: storage/ndb/test/ndbnet/* +Copyright: 2004-2005 MySQL AB +License: LGPL + +Files: strings/ctype-win1250ch.c +Copyright: 2002-2010 Oracle and/or its affiliates. + 2001 Jan Pazdziora +License: GPL-2 + +Files: strings/ctype-tis620.c +Copyright: 1998 Theppitak Karoonboonyanan + 1989-1991 Samphan Raruenrom + 2000-2010 Oracle and/or its affiliates. + 2003 Sathit Jittanupat + 2001 Korakot Chaovavanich and + 1998-1999 Pruet Boonma +License: GPL-2 + +Files: storage/innobase/handler/ha_innodb.h +Copyright: 2000-2010 MySQL AB & Innobase Oy. +License: GPL-2 + +Files: strings/dtoa.c +Copyright: 2007-2012 Oracle and/or its affiliates. + 1991,2000-2001 Lucent Technologies +License: LGPL + +Files: scripts/mysqldumpslow.sh +Copyright: + 2000-2002,2005-2008 MySQL AB + 2008-2009 Sun Microsystems Inc +License: LGPL + +Files: libmysqld/lib_sql.cc +Copyright: 2000 SWsoft company +License: SWsoft + This material is provided "as is", with absolutely no warranty expressed + or implied. Any use is at your own risk. + . + Permission to use or copy this software for any purpose is hereby granted + without fee, provided the above notices are retained on all copies. + Permission to modify the code and to distribute modified code is granted, + provided the above notices are retained, and a notice that the code was + modified is included with the above copyright notice. + +Files: tests/mail_to_db.pl +Copyright: 1998 Abandoned TCX DataKonsult AB & Monty Program KB & Detron HB +License: public-domain + +Files: scripts/mysqlaccess.conf +Copyright: 1997, Yves.Carlier@rug.ac.be +License: GPL-2 + +Files: debian/additions/innotop/* +Copyright: 2006-2009, Baron Schwartz +License: GPL-2 or Artistic + +Files: include/mysql_version.h.in +Copyright: 1996, 1999, 2001 MySQL AB +License: public-domain + +Files: storage/federatedx/* +Copyright: + 2007 Antony T Curtis + 2008-2009 Patrick Galbraith +License: BSD-3-clause + +Files: storage/tokudb/* +Copyright: 2007-2014 Tokutek, Inc +License: GPL-2 + +Files: storage/tokudb/ft-index/third_party/xz-4.999.9beta/build-aux/ltmain.sh + storage/tokudb/ft-index/third_party/xz-4.999.9beta/build-aux/depcomp + storage/tokudb/ft-index/third_party/xz-4.999.9beta/build-aux/config.guess + storage/tokudb/ft-index/third_party/xz-4.999.9beta/build-aux/compile + storage/tokudb/ft-index/third_party/xz-4.999.9beta/src/scripts/xzless.in + storage/tokudb/ft-index/third_party/xz-4.999.9beta/build-aux/config.sub + storage/tokudb/ft-index/third_party/xz-4.999.9beta/src/scripts/xzdiff.in + storage/tokudb/ft-index/third_party/xz-4.999.9beta/lib/getopt_int.h + storage/tokudb/ft-index/third_party/xz-4.999.9beta/lib/Makefile.am + storage/tokudb/ft-index/third_party/xz-4.999.9beta/src/scripts/xzmore.in + storage/tokudb/ft-index/third_party/xz-4.999.9beta/src/scripts/xzgrep.in + storage/tokudb/ft-index/third_party/xz-4.999.9beta/extra/scanlzma/scanlzma.c + storage/tokudb/ft-index/third_party/xz-4.999.9beta/build-aux/missing + storage/tokudb/ft-index/third_party/xz-4.999.9beta/m4/* +Copyright: 1987-2009 Free Software Foundation, Inc. + 1992,1993 Jean-loup Gailly + Andrew Dudman + Lasse Collin + 2006 Timo Lindfors + 1996 Fran,cois Pinard + 1996 Gordon Matzigkeit +License: GPL-2+ + +Files: storage/tokudb/ft-index/third_party/xz-4.999.9beta/m4/acx_pthread.m4 +Copyright: 2007 Steven G. Johnson +License: GPL-3+ + +Files: storage/tokudb/ft-index/third_party/xz-4.999.9beta/lib/getopt* +Copyright: 1987-2009 Free Software Foundation, Inc. +License: LGPL-2.1+ + +Files: storage/tokudb/ft-index/third_party/xz-4.999.9beta/lib/getopt_int.h +Copyright: 1989-1994,1996-1999,2001,2003,2004 Free Software Foundation, Inc. +License: GPL-2+ + +Files: storage/tokudb/ft-index/third_party/xz-4.999.9beta/build-aux/install-sh +Copyright: Copyright (C) 1994 X Consortium +License: MIT/X11 + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to + deal in the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- + TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + . + Except as contained in this notice, the name of the X Consortium shall not + be used in advertising or otherwise to promote the sale, use or other deal- + ings in this Software without prior written authorization from the X Consor- + tium. + . + FSF changes to this file are in the public domain. + +Files: zlib/CMakeLists.txt +Copyright: 2006, 2014, Oracle and/or its affiliates +License: GPL-2 + +License: GPL-2 + 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; version 2 of the License. + . + 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. + . + On Debian and systems the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2` + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +License: GPL-2+ + 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. + . + On Debian and systems the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2` + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . -According to the file "COPYING" all parts of this package are licenced -under the terms of the GNU GPL Version 2 of which a copy is available -in /usr/share/common-licenses. +License: LGPL-2.1+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1, 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 Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public License along + with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + . + On Debian and systems the full text of the GNU Library General Public + License version 2.1 can be found in the file + `/usr/share/common-licenses/LGPL-2.1` -To allow free software with other licences than the GPL to link against the -shared library, special terms for "derived works" are granted in the README file of MySQL 5.5, as follows: +License: LGPL + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; version 2 + of the License. + . + This library 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 + Library General Public License for more details. + . + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA + . + On Debian and systems the full text of the GNU Library General Public + License version 2 can be found in the file + `/usr/share/common-licenses/LGPL-2` -> MySQL FOSS License Exception -> We want free and open source software applications under certain -> licenses to be able to use specified GPL-licensed MySQL client -> libraries despite the fact that not all such FOSS licenses are -> compatible with version 2 of the GNU General Public License. -> Therefore there are special exceptions to the terms and conditions -> of the GPLv2 as applied to these client libraries, which are -> identified and described in more detail in the FOSS License -> Exception at -> . +License: BSD-2-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + 2. Redistributions in binary form must the following disclaimer in + the documentation and/or other materials provided with the + distribution. -The manual had to be removed as it is not free in the sense of the -Debian Free Software Guidelines (DFSG). +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. +License: BSD-4-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by the NetBSD + Foundation, Inc. and its contributors. + 4. Neither the name of The NetBSD Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. -== innotop == +License: Artistic + The "Artistic License" + . + Preamble + . + The intent of this document is to state the conditions under which a + Package may be copied, such that the Copyright Holder maintains some + semblance of artistic control over the development of the package, + while giving the users of the package the right to use and distribute + the Package in a more-or-less customary fashion, plus the right to make + reasonable modifications. + . + Definitions: + . + "Package" refers to the collection of files distributed by the + Copyright Holder, and derivatives of that collection of files + created through textual modification. + . + "Standard Version" refers to such a Package if it has not been + modified, or has been modified in accordance with the wishes + of the Copyright Holder as specified below. + . + "Copyright Holder" is whoever is named in the copyright or + copyrights for the package. + . + "You" is you, if you're thinking about copying or distributing + this Package. + . + "Reasonable copying fee" is whatever you can justify on the + basis of media cost, duplication charges, time of people involved, + and so on. (You will not be required to justify it to the + Copyright Holder, but only to the computing community at large + as a market that must bear the fee.) + . + "Freely Available" means that no fee is charged for the item + itself, though there may be fees involved in handling the item. + It also means that recipients of the item may redistribute it + under the same conditions they received it. + . + 1. You may make and give away verbatim copies of the source form of the + Standard Version of this Package without restriction, provided that you + duplicate all of the original copyright notices and associated disclaimers. + . + 2. You may apply bug fixes, portability fixes and other modifications + derived from the Public Domain or from the Copyright Holder. A Package + modified in such a way shall still be considered the Standard Version. + . + 3. You may otherwise modify your copy of this Package in any way, provided + that you insert a prominent notice in each changed file stating how and + when you changed that file, and provided that you do at least ONE of the + following: + . + a) place your modifications in the Public Domain or otherwise make them + Freely Available, such as by posting said modifications to Usenet or + an equivalent medium, or placing the modifications on a major archive + site such as uunet.uu.net, or by allowing the Copyright Holder to include + your modifications in the Standard Version of the Package. + . + b) use the modified Package only within your corporation or organization. + . + c) rename any non-standard executables so the names do not conflict + with standard executables, which must also be provided, and provide + a separate manual page for each non-standard executable that clearly + documents how it differs from the Standard Version. + . + d) make other distribution arrangements with the Copyright Holder. + . + 4. You may distribute the programs of this Package in object code or + executable form, provided that you do at least ONE of the following: + . + a) distribute a Standard Version of the executables and library files, + together with instructions (in the manual page or equivalent) on where + to get the Standard Version. + . + b) accompany the distribution with the machine-readable source of + the Package with your modifications. + . + c) give non-standard executables non-standard names, and clearly + document the differences in manual pages (or equivalent), together + with instructions on where to get the Standard Version. + . + d) make other distribution arrangements with the Copyright Holder. + . + 5. You may charge a reasonable copying fee for any distribution of this + Package. You may charge any fee you choose for support of this + Package. You may not charge a fee for this Package itself. However, + you may distribute this Package in aggregate with other (possibly + commercial) programs as part of a larger (possibly commercial) software + distribution provided that you do not advertise this Package as a + product of your own. You may embed this Package's interpreter within + an executable of yours (by linking); this shall be construed as a mere + form of aggregation, provided that the complete Standard Version of the + interpreter is so embedded. + . + 6. The scripts and library files supplied as input to or produced as + output from the programs of this Package do not automatically fall + under the copyright of this Package, but belong to whoever generated + them, and may be sold commercially, and may be aggregated with this + Package. If such scripts or library files are aggregated with this + Package via the so-called "undump" or "unexec" methods of producing a + binary executable image, then distribution of such an image shall + neither be construed as a distribution of this Package nor shall it + fall under the restrictions of Paragraphs 3 and 4, provided that you do + not represent such an executable image as a Standard Version of this + Package. + . + 7. C subroutines (or comparably compiled subroutines in other + languages) supplied by you and linked into this Package in order to + emulate subroutines and variables of the language defined by this + Package shall not be considered part of this Package, but are the + equivalent of input as in Paragraph 6, provided these subroutines do + not change the language in any way that would cause it to fail the + regression tests for the language. + . + 8. Aggregation of this Package with a commercial distribution is always + permitted provided that the use of this Package is embedded; that is, + when no overt attempt is made to make this Package's interfaces visible + to the end user of the commercial distribution. Such use shall not be + construed as a distribution of this Package. + . + 9. The name of the Copyright Holder may not be used to endorse or promote + products derived from this software without specific prior written permission. + . + 10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + . + The End -Copyright 2006-2009, Baron Schwartz -URL: http://innotop.sourceforge.net +License: public-domain + The work is public domain (no license). -License: -> This software is dual licensed, either GPL version 2 or Artistic License. -> -> This package 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 package 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 package; if not, write to the Free Software -> Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +License: GPL-3+ + 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 3 of the License, or + (at your option) any later version. + . + This package 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, see . + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". -On Debian systems, the complete text of the GNU General Public License and the -Artistic License can be found in `/usr/share/common-licenses/'. +License: LGPL-2 + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License Version 2 as published by the Free Software Foundation. + . + This package 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 + Lesser General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU Lesser General + Public License can be found in "/usr/share/common-licenses/LGPL-2". diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control deleted file mode 100644 index b3027b3..0000000 --- a/debian/dist/Debian/control +++ /dev/null @@ -1,287 +0,0 @@ -Source: mariadb-10.0 -Section: misc -Priority: optional -Maintainer: MariaDB Developers -XSBC-Original-Maintainer: Maria Developers -Uploaders: MariaDB Developers -Build-Depends: procps | hurd, debhelper, libncurses5-dev (>= 5.0-6), - perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), - zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, - libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, - dpatch, gawk, bison, lsb-release, hardening-wrapper, - ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0) -Standards-Version: 3.8.3 -Homepage: http://mariadb.org/ -Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/10.0/files -Vcs-Bzr: bzr://lp:maria - -Package: libmariadbclient18 -Section: libs -Architecture: any -Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} -Conflicts: mariadb-server-10.0 (<< 10.0.5), mariadb-galera-server-10.0 (<< 10.0.5), - mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33), - mariadb-server-5.1, - mariadb-server-5.2, - mariadb-server-5.3 -Description: MariaDB database client library - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes the client library. - -Package: libmysqlclient18 -Section: libs -Architecture: any -Depends: libmariadbclient18 (= ${source:Version}) -Replaces: libmysqlclient18 (<< ${source:Version}) -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. - -Package: libmariadbd-dev -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 - 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. - -Package: libmariadbclient-dev -Architecture: any -Section: libdevel -Depends: libmariadbclient18 (>= ${source:Version}), zlib1g-dev, , ${shlibs:Depends}, ${misc:Depends} -Replaces: libmariadbclient16-dev, libmysqlclient16-dev -Conflicts: libmysqlclient-dev, libmariadbclient16-dev, libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev, libmysqlclient15-dev, libmysqlclient16-dev -Provides: 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 - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes development libraries and header files. - -Package: mysql-common -Section: database -Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: MariaDB database common files (e.g. /etc/mysql/my.cnf) - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes files needed by all versions of the client library - (e.g. /etc/mysql/my.cnf). - -Package: mariadb-common -Section: database -Architecture: all -Depends: mysql-common, ${shlibs:Depends}, ${misc:Depends} -Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf) - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - 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.0 -Architecture: any -Depends: mariadb-common, libmariadbclient18 (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} -Provides: mysql-client-core, mysql-client-core-5.1, mysql-client-core-5.5 -Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, - mysql-client-5.1 (<< ${source:Version}), mysql-client-5.5 (<< ${source:Version}), - mysql-client-core-5.1, mysql-client-core-5.5, - mariadb-client-5.1, mariadb-client-core-5.1, - mariadb-client-5.2, mariadb-client-core-5.2, - mariadb-client-5.3, mariadb-client-core-5.3, - mariadb-client-5.5, mariadb-client-core-5.5 -Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, - mysql-client-5.1, mysql-client-5.5, - mysql-client-core-5.1, mysql-client-core-5.5, - mariadb-client-5.1, mariadb-client-core-5.1, - mariadb-client-5.2, mariadb-client-core-5.2, - mariadb-client-5.3, mariadb-client-core-5.3, - mariadb-client-5.5, mariadb-client-core-5.5 -Description: MariaDB database core 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 - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes the core client files, as used by Akonadi. - -Package: mariadb-client-10.0 -Architecture: any -Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), - mariadb-common, libmariadbclient18 (>= ${source:Version}), - mariadb-client-core-10.0 (>= ${source:Version}), ${perl:Depends}, - ${shlibs:Depends}, ${misc:Depends} -Suggests: libterm-readkey-perl -Provides: virtual-mysql-client, mysql-client, - mysql-client-4.1, mysql-client-5.1, mysql-client-5.5 -Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, - mariadb-client (<< ${source:Version}), - mariadb-client-5.1, - mariadb-client-5.2, - mariadb-client-5.3, - mariadb-client-5.5, mysql-client-5.5 -Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, - mariadb-client (<< ${source:Version}), - mariadb-client-5.1, - mariadb-client-5.2, - mariadb-client-5.3, - mariadb-client-5.5, mysql-client-5.5 -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 - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes the client binaries and the additional tools - innotop and mysqlreport. - -Package: mariadb-server-core-10.0 -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version}) -Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5 -Conflicts: mysql-server-5.0, mysql-server-core-5.0, - mariadb-server-core-5.1, mysql-server-core-5.1, - mariadb-server-core-5.2, - mariadb-server-core-5.3, - mariadb-server-core-5.5, mysql-server-core-5.5 -Replaces: mysql-server-5.0, mysql-server-core-5.0, - mariadb-server-core-5.1, mysql-server-core-5.1, - mariadb-server-core-5.2, - mariadb-server-core-5.3, - mariadb-server-core-5.5, mysql-server-core-5.5 -Description: MariaDB database core server 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 core server files, as used by Akonadi. - -Package: mariadb-test-10.0 -Section: database -Architecture: any -Depends: mariadb-server-10.0 (= ${source:Version}), mariadb-client-10.0 (= ${source:Version}) -Suggests: patch -Conflicts: mariadb-test (<< ${source:Version}), - mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3, - mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33) -Replaces: mariadb-test (<< ${source:Version}), - mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3 -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.0 -Architecture: any -Suggests: tinyca, mailx, mariadb-test -Recommends: libhtml-template-perl -Pre-Depends: mariadb-common, adduser (>= 3.40), debconf -Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, - perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, - passwd, lsb-base (>= 3.0-10), bsdutils, - mariadb-server-core-10.0 (>= ${binary:Version}) -Provides: mariadb-server, mysql-server, virtual-mysql-server -Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), - mysql-server-4.1, mysql-server-5.0, - mariadb-server-5.1, mysql-server-5.1, - mariadb-server-5.2, - mariadb-server-5.3, - mariadb-server-5.5, mysql-server-5.5, - mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0 -Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), - mysql-server-4.1, mysql-server-5.0, - mariadb-server-5.1, mysql-server-5.1, - mariadb-server-5.2, - mariadb-server-5.3, - mariadb-server-5.5, mysql-server-5.5, - libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0), - mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0 -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 - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes the server binaries. - -Package: mariadb-server -Section: database -Architecture: all -Depends: mariadb-server-10.0 (= ${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.0), 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. - . - 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. - -Package: mariadb-client -Section: database -Architecture: all -Depends: mariadb-client-10.0 (= ${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.0), as determined by the MariaDB - maintainers. Install this package if in doubt about which MariaDB version - you want, as this is the one we consider to be in the best shape. - -Package: mariadb-test -Section: database -Architecture: all -Depends: mariadb-test-10.0 (= ${source:Version}) -Description: MariaDB database regression test suite (metapackage depending on the latest version) - This is an empty package that depends on the current "best" version of - mariadb-test (currently mariadb-test-10.0), as determined by the MariaDB - maintainers. - -Package: mariadb-connect-engine-10.0 -Section: database -Architecture: any -Depends: mariadb-server-10.0|mariadb-galera-server-10.0, unixODBC, libxml2 -Build-depends: mariadb-server-10.0|mariadb-galera-server-10.0, unixODBC-dev, libxml2-dev -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. - -Package: mariadb-oqgraph-engine-10.0 -Section: database -Architecture: any -Depends: mariadb-server-10.0|mariadb-galera-server-10.0, libjudydebian1 -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. - diff --git a/debian/dist/Debian/mariadb-server-10.0.README.Debian b/debian/dist/Debian/mariadb-server-10.0.README.Debian deleted file mode 100644 index f398f2f..0000000 --- a/debian/dist/Debian/mariadb-server-10.0.README.Debian +++ /dev/null @@ -1,109 +0,0 @@ -* MYSQL WON'T START OR STOP?: -============================= -You may never ever delete the special mysql user "debian-sys-maint". This -user together with the credentials in /etc/mysql/debian.cnf are used by the -init scripts to stop the server as they would require knowledge of the mysql -root users password else. -So in most of the times you can fix the situation by making sure that the -debian.cnf file contains the right password, e.g. by setting a new one -(remember to do a "flush privileges" then). - -* WHAT TO DO AFTER UPGRADES: -============================ -The privilege tables are automatically updated so all there is left is read -the changelogs on dev.mysql.com to see if any changes affect custom apps. - -* WHAT TO DO AFTER INSTALLATION: -================================ -The MySQL manual describes certain steps to do at this stage in a separate -chapter. They are not necessary as the Debian packages does them -automatically. - -The only thing that is left over for the admin is - - setting the passwords - - creating new users and databases - - read the rest of this text - -* DOWNGRADING TO 4.0 or 4.1: -============================ -Unsupported. Period. -But if you do and get problems or make interesting experiences, mail me, it -might help others. -Ok, if you really want, I would recommend to "mysqldump --opt" all tables, -then purge 4.1, delete /var/lib/mysql, install 4.0 and insert the dumps. Be -carefully, though, with the "mysql" table, you might not simply overwrite that -one as the password for the mysql "debian-sys-maint" user is stored in -/etc/mysql/debian.cnf and needed by /etc/init.d/ to start mysql and check if -it's alive. - -* SOME APPLICATION CAN NO LONGER CONNECT: -========================================= -This application is probably linked against libmysqlclient12 or below and -somebody has created a mysql user with new-style passwords. -The old_passwords=1 option in /etc/mysql/my.cnf might help. If not the -application that inserted the user has to be changed or the application that -tries to connect updated to libmysqlclient14 or -15. - -* NETWORKING: -============= -For security reasons, the Debian package has enabled networking only on the -loop-back device using "bind-address" in /etc/mysql/my.cnf. Check with -"netstat -tlnp" where it is listening. If your connection is aborted -immediately see if "mysqld: all" or similar is in /etc/hosts.allow and read -hosts_access(5). - -* WHERE IS THE DOCUMENTATION?: -============================== -Unfortunately due to licensing restrictions, debian currently not able -to provide the mysql-doc package in any format. For the most up to date -documentation, please go to http://dev.mysql.com/doc. - -* PASSWORDS: -============ -It is strongly recommended to set a password for the mysql root user (which - /usr/bin/mysql -u root -D mysql -e "update user set password=password('new-password') where user='root'" - /usr/bin/mysql -u root -e "flush privileges" -If you already had a password set add "-p" before "-u" to the lines above. - - -If you are tired to type the password in every time or want to automate your -scripts you can store it in the file $HOME/.my.cnf. It should be chmod 0600 -(-rw------- username username .my.cnf) to ensure that nobody else can read -it. Every other configuration parameter can be stored there, too. You will -find an example below and more information in the MySQL manual in -/usr/share/doc/mariadb-doc or www.mysql.com. - -ATTENTION: It is necessary, that a .my.cnf from root always contains a "user" -line wherever there is a "password" line, else, the Debian maintenance -scripts, that use /etc/mysql/debian.cnf, will use the username -"debian-sys-maint" but the password that is in root's .my.cnf. Also note, -that every change you make in the /root/.my.cnf will affect the mysql cron -script, too. - - # an example of $HOME/.my.cnf - [client] - user = your-mysql-username - password = enter-your-good-new-password-here - -* BIG_ROWS FOR EVEN MORE ROWS IN A TABLE: -========================================= -If you ever run out of rows in a table there is the possibility of building -the package with "-DBIG_ROWS" which, according to a MySQL employee on -packagers@lists.mysql.com should lead to a 64bit row index (I guess > 2^32 -rows) but also to an approx. 5% performance loss. - -* BerkeleyDB Storage Engine -=========================== -Support for BerkeleyDB has been removed in 5.1, and consequently both the -have-bdb and skip-bdb configuration options will cause the server to fail. -Removing the options from /etc/mysql/my.cnf will fix this problem. - -* FURTHER NOTES ON REPLICATION -=============================== -If the MySQL server is acting as a replication slave, you should not -set --tmpdir to point to a directory on a memory-based filesystem or to -a directory that is cleared when the server host restarts. A replication -slave needs some of its temporary files to survive a machine restart so -that it can replicate temporary tables or LOAD DATA INFILE operations. If -files in the temporary file directory are lost when the server restarts, -replication fails. diff --git a/debian/dist/Debian/mariadb-server-10.0.dirs b/debian/dist/Debian/mariadb-server-10.0.dirs deleted file mode 100644 index 320299b..0000000 --- a/debian/dist/Debian/mariadb-server-10.0.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.0 -var/run/mysqld -var/lib/mysql-upgrade diff --git a/debian/dist/Debian/mariadb-server-10.0.postinst b/debian/dist/Debian/mariadb-server-10.0.postinst deleted file mode 100644 index 19594fb..0000000 --- a/debian/dist/Debian/mariadb-server-10.0.postinst +++ /dev/null @@ -1,269 +0,0 @@ -#!/bin/bash -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 } - -export PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin - -# This command can be used as pipe to syslog. With "-s" it also logs to stderr. -ERR_LOGGER="logger -p daemon.err -t mysqld_safe -i" -# This will make an error in a logged command immediately apparent by aborting -# the install, rather than failing silently and leaving a broken install. -set -o pipefail - -invoke() { - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d mysql $1 - else - /etc/init.d/mysql $1 - fi -} - -MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --disable-log-bin --skip-grant-tables --default-storage-engine=myisam" - -test_mysql_access() { - mysql --no-defaults -u root -h localhost /dev/null 2>&1 -} - -# call with $1 = "online" to connect to the server, otherwise it bootstraps -set_mysql_rootpw() { - # forget we ever saw the password. don't use reset to keep the seen status - db_set mysql-server/root_password "" - - tfile=`mktemp` - if [ ! -f "$tfile" ]; then - return 1 - fi - - # this avoids us having to call "test" or "[" on $rootpw - cat << EOF > $tfile -USE mysql; -SET sql_log_bin=0; -UPDATE user SET password=PASSWORD("$rootpw") WHERE user='root'; -FLUSH PRIVILEGES; -EOF - if grep -q 'PASSWORD("")' $tfile; then - retval=0 - elif [ "$1" = "online" ]; then - mysql --no-defaults -u root -h localhost <$tfile >/dev/null - retval=$? - else - $MYSQL_BOOTSTRAP <$tfile - retval=$? - fi - rm -f $tfile - 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 - 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. - 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 -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 -/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, -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 - done - - # Ensure the existence and right permissions for the database and - # log files. - if [ ! -d "$mysql_statedir" -a ! -L "$mysql_statedir" ]; then mkdir "$mysql_statedir"; fi - if [ ! -d "$mysql_statedir/mysql" -a ! -L "$mysql_statedir/mysql" ]; then mkdir "$mysql_statedir/mysql"; fi - if [ ! -d "$mysql_newlogdir" -a ! -L "$mysql_newlogdir" ]; then mkdir "$mysql_newlogdir"; 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 - # 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 - 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 - - # To avoid downgrades. - touch $mysql_statedir/debian-10.0.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 - /bin/bash /usr/bin/mysql_install_db --rpm --user=mysql --disable-log-bin 2>&1 | $ERR_LOGGER - set -e - - ## On every reconfiguration the maintenance user is recreated. - # - # - It is easier to regenerate the password every time but as people - # use fancy rsync scripts and file alteration monitors, the existing - # password is used and existing files not touched. - # - The mysqld statement is like that in mysql_install_db because the - # server is not already running. This has some implications: - # - The amount of newlines and semicolons in the query is important! - # - GRANT is not possible with --skip-grant-tables and "INSERT - # (user,host..) VALUES" is not --ansi compliant - # - The echo is just for readability. ash's buildin has no "-e" so use /bin/echo. - # - The Super_priv, Show_db_priv, Create_tmp_table_priv and Lock_tables_priv - # may not be present as old Woody 3.23 databases did not have it and the - # admin might not already have run mysql_upgrade which adds them. - # As the binlog cron scripts to need at least the Super_priv, I do first - # 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; - if [ -e "$dc" -a -n "`fgrep mysql_upgrade $dc 2>/dev/null`" ]; then - pass="`sed -n 's/^[ ]*password *= *// p' $dc | head -n 1`" - else - pass=`perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..16)'`; - if [ ! -d "$mysql_cfgdir" ]; then install -o 0 -g 0 -m 0755 -d $mysql_cfgdir; fi - cat /dev/null > $dc - echo "# Automatically generated for Debian scripts. DO NOT TOUCH!" >>$dc - echo "[client]" >>$dc - echo "host = localhost" >>$dc - echo "user = debian-sys-maint" >>$dc - echo "password = $pass" >>$dc - echo "socket = $mysql_rundir/mysqld.sock" >>$dc - echo "[mysql_upgrade]" >>$dc - echo "host = localhost" >>$dc - echo "user = debian-sys-maint" >>$dc - echo "password = $pass" >>$dc - echo "socket = $mysql_rundir/mysqld.sock" >>$dc - echo "basedir = /usr" >>$dc - fi - # If this dir chmod go+w then the admin did it. But this file should not. - chown 0:0 $dc - chmod 0600 $dc - - # update privilege tables - password_column_fix_query=`/bin/echo -e \ - "USE mysql;\n" \ - "ALTER TABLE user CHANGE Password Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL;"` - replace_query=`/bin/echo -e \ - "USE mysql;\n" \ - "SET sql_mode='';\n" \ - "REPLACE INTO user SET " \ - " host='localhost', user='debian-sys-maint', password=password('$pass'), " \ - " Select_priv='Y', Insert_priv='Y', Update_priv='Y', Delete_priv='Y', " \ - " Create_priv='Y', Drop_priv='Y', Reload_priv='Y', Shutdown_priv='Y', " \ - " Process_priv='Y', File_priv='Y', Grant_priv='Y', References_priv='Y', " \ - " Index_priv='Y', Alter_priv='Y', Super_priv='Y', Show_db_priv='Y', "\ - " Create_tmp_table_priv='Y', Lock_tables_priv='Y', Execute_priv='Y', "\ - " Repl_slave_priv='Y', Repl_client_priv='Y', Create_view_priv='Y', "\ - " Show_view_priv='Y', Create_routine_priv='Y', Alter_routine_priv='Y', "\ - " Create_user_priv='Y', Event_priv='Y', Trigger_priv='Y',"\ - " ssl_cipher='', x509_issuer='', x509_subject='';"`; - # Engines supported by etch should be installed per default. The query sequence is supposed - # to be aborted if the CREATE TABLE fails due to an already existent table in which case the - # admin might already have chosen to remove one or more plugins. Newlines are necessary. - install_plugins=`/bin/echo -e \ - "USE mysql;\n" \ - "CREATE TABLE IF NOT EXISTS plugin (name char(64) COLLATE utf8_bin NOT NULL DEFAULT '', " \ - " dl char(128) COLLATE utf8_bin NOT NULL DEFAULT '', " \ - " PRIMARY KEY (name)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='MySQL plugins';" ` - - # Upgrade password column format before the root password gets set. - echo "$password_column_fix_query" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER - - db_get mysql-server/root_password && rootpw="$RET" - if ! set_mysql_rootpw; then - password_error="yes" - fi - - set +e - echo "$replace_query" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER - echo "$install_plugins" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER - set -e - ;; - - abort-upgrade|abort-remove|abort-configure) - ;; - - *) - echo "postinst called with unknown argument '$1'" 1>&2 - exit 1 - ;; -esac - -# here we check to see if we can connect as root without a password -# this should catch upgrades from previous versions where the root -# password wasn't set. if there is a password, or if the connection -# fails for any other reason, nothing happens. -if [ "$1" = "configure" ]; then - if test_mysql_access; then - db_input medium mysql-server/root_password || true - db_go - db_get mysql-server/root_password && rootpw="$RET" - - if ! set_mysql_rootpw "online"; then - password_error="yes" - fi - fi - - if [ "$password_error" = "yes" ]; then - db_input high mysql-server/error_setting_password || true - db_go - fi - -fi - -db_stop # in case invoke failes - -#DEBHELPER# - -exit 0 diff --git a/debian/dist/Debian/rules b/debian/dist/Debian/rules deleted file mode 100755 index 2122a3c..0000000 --- a/debian/dist/Debian/rules +++ /dev/null @@ -1,285 +0,0 @@ -#!/usr/bin/make -f - -export DH_VERBOSE=1 -export DEB_BUILD_HARDENING=1 - -PACKAGE=mariadb-10.0 - -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) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -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 | sed '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 -endif - -USE_ASSEMBLER=--enable-assembler - -ifneq (,$(filter $(ARCH), amd64 i386 ia64 s390)) - TESTSUITE_FAIL_CMD=exit 1 -else - TESTSUITE_FAIL_CMD=true -endif - -BUILDDIR = builddir -builddir = $(BUILDDIR) - -# This causes seg11 crashes if LDAP is used for groups in /etc/nsswitch.conf -# so it is disabled by default although, according to MySQL, it brings >10% -# performance gain if enabled. See #299382. -ifeq ($(STATIC_MYSQLD), 1) - USE_STATIC_MYSQLD=--with-mysqld-ldflags=-all-static -endif - -configure: patch configure-stamp -configure-stamp: - @echo "RULES.$@" - dh_testdir - -ifneq ($(ARCH_OS),hurd) - if [ ! -d /proc/self ]; then echo "/proc IS NEEDED" 1>&2; exit 1; fi -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 $$(case `lsb_release -sc` in (lenny) echo -DWORKAROUND_GCC_4_3_2_BUG ;; esac)"} \ - 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=debian' - - touch $@ - -build: build-stamp - -build-stamp: configure - @echo "RULES.$@" - dh_testdir - - cd $(builddir) && $(MAKE) $(MAKE_J) $(AM_EXTRA_MAKEFLAGS) - -ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),) - if [ ! -f testsuite-stamp ] ; then \ - cd $(builddir) && $(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ; \ - fi -endif - - touch testsuite-stamp - - touch build-stamp - -clean: clean-patched unpatch - rm -rf debian/patched -clean-patched: - @echo "RULES.clean-patched" - dh_testdir - dh_testroot - rm -f configure-stamp* - rm -f build-stamp* - rm -f testsuite-stamp - # - [ ! -f Makefile ] || $(MAKE) clean - [ ! -d mysql-test/var ] || rm -rf mysql-test/var - # - rm -rf $(BUILDDIR) - - debconf-updatepo - dh_clean -v - - -install: build - @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.0/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.0/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.0/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.0/INFO_SRC - install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-server-10.0/INFO_BIN - - # mariadb-test - mv $(TMP)/usr/mysql-test $(TMP)/usr/share/mysql - - # lintian overrides - mkdir -p $(TMP)/usr/share/lintian/overrides/ - cp debian/mysql-common.lintian-overrides $(TMP)/usr/share/lintian/overrides/mysql-common - cp debian/mariadb-server-10.0.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-server-10.0 - cp debian/mariadb-client-10.0.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-client-10.0 - - # For 5.0 -> 10.0 transition - d=$(TMP)/usr/share/mysql-common/internal-use-only/; \ - mkdir -p $$d; \ - cp debian/mariadb-server-10.0.mysql.init $$d/_etc_init.d_mysql; \ - cp debian/mariadb-server-10.0.mysql-server.logrotate $$d/_etc_logrotate.d_mysql-server; \ - cp debian/additions/debian-start $$d/_etc_mysql_debian-start; - - 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 - - dh_installdebconf -a - dh_installdocs -a - dh_installexamples -a - dh_installmenu -a - dh_installlogrotate -a --name mysql-server - # 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 - 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 - -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 - -# vim: ts=8 diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control deleted file mode 100644 index 7133074b..0000000 --- a/debian/dist/Ubuntu/control +++ /dev/null @@ -1,287 +0,0 @@ -Source: mariadb-10.0 -Section: misc -Priority: optional -Maintainer: MariaDB Developers -XSBC-Original-Maintainer: Maria Developers -Uploaders: MariaDB Developers -Build-Depends: procps | hurd, debhelper, libncurses5-dev (>= 5.0-6), - perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), - zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, - libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, - dpatch, gawk, bison, lsb-release, hardening-wrapper, - ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0) -Standards-Version: 3.8.2 -Homepage: http://mariadb.org/ -Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/10.0/files -Vcs-Bzr: bzr://lp:maria - -Package: libmariadbclient18 -Section: libs -Architecture: any -Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} -Conflicts: mariadb-server-10.0 (<< 10.0.5), mariadb-galera-server-10.0 (<< 10.0.5), - mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33), - mariadb-server-5.1, - mariadb-server-5.2, - mariadb-server-5.3 -Description: MariaDB database client library - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes the client library. - -Package: libmysqlclient18 -Section: libs -Architecture: any -Depends: libmariadbclient18 (= ${source:Version}) -Replaces: libmysqlclient18 (<< ${source:Version}) -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. - -Package: libmariadbd-dev -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 - 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. - -Package: libmariadbclient-dev -Architecture: any -Section: libdevel -Depends: libmariadbclient18 (>= ${source:Version}), zlib1g-dev, , ${shlibs:Depends}, ${misc:Depends} -Replaces: libmariadbclient16-dev, libmysqlclient16-dev -Conflicts: libmysqlclient-dev, libmariadbclient16-dev, libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev, libmysqlclient15-dev, libmysqlclient16-dev -Provides: 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 - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes development libraries and header files. - -Package: mysql-common -Section: database -Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: MariaDB database common files (e.g. /etc/mysql/my.cnf) - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes files needed by all versions of the client library - (e.g. /etc/mysql/my.cnf). - -Package: mariadb-common -Section: database -Architecture: all -Depends: mysql-common, ${shlibs:Depends}, ${misc:Depends} -Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf) - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - 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.0 -Architecture: any -Depends: mariadb-common, libmariadbclient18 (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} -Provides: mysql-client-core, mysql-client-core-5.1, mysql-client-core-5.5 -Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, - mysql-client-5.1 (<< ${source:Version}), mysql-client-5.5 (<< ${source:Version}), - mysql-client-core-5.1, mysql-client-core-5.5, - mariadb-client-5.1, mariadb-client-core-5.1, - mariadb-client-5.2, mariadb-client-core-5.2, - mariadb-client-5.3, mariadb-client-core-5.3, - mariadb-client-5.5, mariadb-client-core-5.5 -Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, - mysql-client-5.1, mysql-client-5.5, - mysql-client-core-5.1, mysql-client-core-5.5, - mariadb-client-5.1, mariadb-client-core-5.1, - mariadb-client-5.2, mariadb-client-core-5.2, - mariadb-client-5.3, mariadb-client-core-5.3, - mariadb-client-5.5, mariadb-client-core-5.5 -Description: MariaDB database core 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 - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes the core client files, as used by Akonadi. - -Package: mariadb-client-10.0 -Architecture: any -Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), - mariadb-common, libmariadbclient18 (>= ${source:Version}), - mariadb-client-core-10.0 (>= ${source:Version}), ${perl:Depends}, - ${shlibs:Depends}, ${misc:Depends} -Suggests: libterm-readkey-perl -Provides: virtual-mysql-client, mysql-client, - mysql-client-4.1, mysql-client-5.1, mysql-client-5.5 -Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, - mariadb-client (<< ${source:Version}), - mariadb-client-5.1, - mariadb-client-5.2, - mariadb-client-5.3, - mariadb-client-5.5, mysql-client-5.5 -Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, - mariadb-client (<< ${source:Version}), - mariadb-client-5.1, - mariadb-client-5.2, - mariadb-client-5.3, - mariadb-client-5.5, mysql-client-5.5 -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 - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes the client binaries and the additional tools - innotop and mysqlreport. - -Package: mariadb-server-core-10.0 -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version}) -Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5 -Conflicts: mysql-server-5.0, mysql-server-core-5.0, - mariadb-server-core-5.1, mysql-server-core-5.1, - mariadb-server-core-5.2, - mariadb-server-core-5.3, - mariadb-server-core-5.5, mysql-server-core-5.5 -Replaces: mysql-server-5.0, mysql-server-core-5.0, - mariadb-server-core-5.1, mysql-server-core-5.1, - mariadb-server-core-5.2, - mariadb-server-core-5.3, - mariadb-server-core-5.5, mysql-server-core-5.5 -Description: MariaDB database core server 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 core server files, as used by Akonadi. - -Package: mariadb-test-10.0 -Section: database -Architecture: any -Depends: mariadb-server-10.0 (= ${source:Version}), mariadb-client-10.0 (= ${source:Version}) -Suggests: patch -Conflicts: mariadb-test (<< ${source:Version}), - mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3, - mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33) -Replaces: mariadb-test (<< ${source:Version}), - mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3 -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.0 -Architecture: any -Suggests: tinyca, mailx, mariadb-test -Recommends: libhtml-template-perl -Pre-Depends: mariadb-common, adduser (>= 3.40), debconf -Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, - perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, - passwd, lsb-base (>= 3.0-10), bsdutils, - mariadb-server-core-10.0 (>= ${binary:Version}) -Provides: mariadb-server, mysql-server, virtual-mysql-server -Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), - mysql-server-4.1, mysql-server-5.0, - mariadb-server-5.1, mysql-server-5.1, - mariadb-server-5.2, - mariadb-server-5.3, - mariadb-server-5.5, mysql-server-5.5, - mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0 -Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), - mysql-server-4.1, mysql-server-5.0, - mariadb-server-5.1, mysql-server-5.1, - mariadb-server-5.2, - mariadb-server-5.3, - mariadb-server-5.5, mysql-server-5.5, - libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0), - mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0 -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 - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes the server binaries. - -Package: mariadb-server -Section: database -Architecture: all -Depends: mariadb-server-10.0 (= ${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.0), 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. - . - 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. - -Package: mariadb-client -Section: database -Architecture: all -Depends: mariadb-client-10.0 (= ${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.0), as determined by the MariaDB - maintainers. Install this package if in doubt about which MariaDB version - you want, as this is the one we consider to be in the best shape. - -Package: mariadb-test -Section: database -Architecture: all -Depends: mariadb-test-10.0 (= ${source:Version}) -Description: MariaDB database regression test suite (metapackage depending on the latest version) - This is an empty package that depends on the current "best" version of - mariadb-test (currently mariadb-test-10.0), as determined by the MariaDB - maintainers. - -Package: mariadb-connect-engine-10.0 -Section: database -Architecture: any -Depends: mariadb-server-10.0|mariadb-galera-server-10.0, unixODBC, libxml2 -Build-depends: mariadb-server-10.0|mariadb-galera-server-10.0, unixODBC-dev, libxml2-dev -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. - -Package: mariadb-oqgraph-engine-10.0 -Section: database -Architecture: any -Depends: mariadb-server-10.0|mariadb-galera-server-10.0, libjudydebian1 -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. - diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.README.Debian b/debian/dist/Ubuntu/mariadb-server-10.0.README.Debian deleted file mode 100644 index 741243f..0000000 --- a/debian/dist/Ubuntu/mariadb-server-10.0.README.Debian +++ /dev/null @@ -1,109 +0,0 @@ -* MYSQL WON'T START OR STOP?: -============================= -You may never ever delete the special mysql user "debian-sys-maint". This -user together with the credentials in /etc/mysql/debian.cnf are used by the -init scripts to stop the server as they would require knowledge of the mysql -root users password else. -So in most of the times you can fix the situation by making sure that the -debian.cnf file contains the right password, e.g. by setting a new one -(remember to do a "flush privileges" then). - -* WHAT TO DO AFTER UPGRADES: -============================ -The privilege tables are automatically updated so all there is left is read -the changelogs on dev.mysql.com to see if any changes affect custom apps. - -* WHAT TO DO AFTER INSTALLATION: -================================ -The MySQL manual describes certain steps to do at this stage in a separate -chapter. They are not necessary as the Debian packages does them -automatically. - -The only thing that is left over for the admin is - - setting the passwords - - creating new users and databases - - read the rest of this text - -* DOWNGRADING TO 4.0 or 4.1: -============================ -Unsupported. Period. -But if you do and get problems or make interesting experiences, mail me, it -might help others. -Ok, if you really want, I would recommend to "mysqldump --opt" all tables, -then purge 4.1, delete /var/lib/mysql, install 4.0 and insert the dumps. Be -carefully, though, with the "mysql" table, you might not simply overwrite that -one as the password for the mysql "debian-sys-maint" user is stored in -/etc/mysql/debian.cnf and needed by /etc/init.d/ to start mysql and check if -it's alive. - -* SOME APPLICATION CAN NO LONGER CONNECT: -========================================= -This application is probably linked against libmysqlclient12 or below and -somebody has created a mysql user with new-style passwords. -The old_passwords=1 option in /etc/mysql/my.cnf might help. If not the -application that inserted the user has to be changed or the application that -tries to connect updated to libmysqlclient14 or -15. - -* NETWORKING: -============= -For security reasons, the Debian package has enabled networking only on the -loop-back device using "bind-address" in /etc/mysql/my.cnf. Check with -"netstat -tlnp" where it is listening. If your connection is aborted -immediately see if "mysqld: all" or similar is in /etc/hosts.allow and read -hosts_access(5). - -* WHERE IS THE DOCUMENTATION?: -============================== -Unfortunately due to licensing restrictions, debian currently not able -to provide the mysql-doc package in any format. For the most up to date -documentation, please go to http://dev.mysql.com/doc. - -* PASSWORDS: -============ -It is strongly recommended to set a password for the mysql root user (which - /usr/bin/mysql -u root -D mysql -e "update user set password=password('new-password') where user='root'" - /usr/bin/mysql -u root -e "flush privileges" -If you already had a password set add "-p" before "-u" to the lines above. - - -If you are tired to type the password in every time or want to automate your -scripts you can store it in the file $HOME/.my.cnf. It should be chmod 0600 -(-rw------- username username .my.cnf) to ensure that nobody else can read -it. Every other configuration parameter can be stored there, too. You will -find an example below and more information in the MySQL manual in -/usr/share/doc/mysql-doc or www.mysql.com. - -ATTENTION: It is necessary, that a .my.cnf from root always contains a "user" -line wherever there is a "password" line, else, the Debian maintenance -scripts, that use /etc/mysql/debian.cnf, will use the username -"debian-sys-maint" but the password that is in root's .my.cnf. Also note, -that every change you make in the /root/.my.cnf will affect the mysql cron -script, too. - - # an example of $HOME/.my.cnf - [client] - user = your-mysql-username - password = enter-your-good-new-password-here - -* BIG_ROWS FOR EVEN MORE ROWS IN A TABLE: -========================================= -If you ever run out of rows in a table there is the possibility of building -the package with "-DBIG_ROWS" which, according to a MySQL employee on -packagers@lists.mysql.com should lead to a 64bit row index (I guess > 2^32 -rows) but also to an approx. 5% performance loss. - -* BerkeleyDB Storage Engine -=========================== -Support for BerkeleyDB has been removed in 5.1, and consequently both the -have-bdb and skip-bdb configuration options will cause the server to fail. -Removing the options from /etc/mysql/my.cnf will fix this problem. - -* FURTHER NOTES ON REPLICATION -=============================== -If the MySQL server is acting as a replication slave, you should not -set --tmpdir to point to a directory on a memory-based filesystem or to -a directory that is cleared when the server host restarts. A replication -slave needs some of its temporary files to survive a machine restart so -that it can replicate temporary tables or LOAD DATA INFILE operations. If -files in the temporary file directory are lost when the server restarts, -replication fails. diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.dirs b/debian/dist/Ubuntu/mariadb-server-10.0.dirs deleted file mode 100644 index 320299b..0000000 --- a/debian/dist/Ubuntu/mariadb-server-10.0.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.0 -var/run/mysqld -var/lib/mysql-upgrade diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.files.in b/debian/dist/Ubuntu/mariadb-server-10.0.files.in deleted file mode 100644 index 849a763..0000000 --- a/debian/dist/Ubuntu/mariadb-server-10.0.files.in +++ /dev/null @@ -1,84 +0,0 @@ -usr/lib/mysql/plugin/auth_pam.so -usr/lib/mysql/plugin/auth_socket.so -usr/lib/mysql/plugin/ha_mroonga.so -usr/lib/mysql/plugin/ha_sequence.so -usr/lib/mysql/plugin/ha_sphinx.so -usr/lib/mysql/plugin/ha_innodb.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/sql_errlog.so -usr/lib/mysql/plugin/server_audit.so -usr/lib/libhsclient.so.* -etc/apparmor.d/usr.sbin.mysqld -usr/share/apport/package-hooks/source_mariadb-10.0.py -etc/mysql/debian-start -etc/mysql/conf.d/mysqld_safe_syslog.cnf -usr/bin/msql2mysql -usr/bin/my_print_defaults -usr/bin/myisamchk -usr/bin/myisam_ftdump -usr/bin/myisamlog -usr/bin/myisampack -usr/bin/aria_pack -usr/bin/aria_read_log -usr/bin/aria_ftdump -usr/bin/aria_chk -usr/bin/aria_dump_log -usr/bin/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 -usr/bin/mysqlhotcopy -usr/bin/perror -usr/bin/replace -usr/bin/resolve_stack_dump -usr/bin/resolveip -usr/share/doc/mariadb-server-10.0/mysqld.sym.gz -usr/share/doc/mariadb-server-10.0/INFO_SRC -usr/share/doc/mariadb-server-10.0/INFO_BIN -usr/share/lintian/overrides/mariadb-server-10.0 -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/share/mysql/errmsg-utf8.txt -usr/share/mysql/fill_help_tables.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_test_data_timezone.sql -@CASSANDRA_DEB_FILES@ -@SPIDER_DEB_FILES@ -@TOKUDB_DEB_FILES@ diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.postinst b/debian/dist/Ubuntu/mariadb-server-10.0.postinst deleted file mode 100644 index 1acfbc8..0000000 --- a/debian/dist/Ubuntu/mariadb-server-10.0.postinst +++ /dev/null @@ -1,285 +0,0 @@ -#!/bin/bash -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 } - -export PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin - -# This command can be used as pipe to syslog. With "-s" it also logs to stderr. -ERR_LOGGER="logger -p daemon.err -t mysqld_safe -i" -# This will make an error in a logged command immediately apparent by aborting -# the install, rather than failing silently and leaving a broken install. -set -o pipefail - -invoke() { - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d mysql $1 - else - /etc/init.d/mysql $1 - fi -} - -MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --disable-log-bin --skip-grant-tables --default-storage-engine=myisam" - -test_mysql_access() { - mysql --no-defaults -u root -h localhost /dev/null 2>&1 -} - -# call with $1 = "online" to connect to the server, otherwise it bootstraps -set_mysql_rootpw() { - # forget we ever saw the password. don't use reset to keep the seen status - db_set mysql-server/root_password "" - db_set mysql-server/root_password_again "" - - tfile=`mktemp` - if [ ! -f "$tfile" ]; then - return 1 - fi - - # this avoids us having to call "test" or "[" on $rootpw - cat << EOF > $tfile -USE mysql; -SET sql_log_bin=0; -UPDATE user SET password=PASSWORD("$rootpw") WHERE user='root'; -FLUSH PRIVILEGES; -EOF - if grep -q 'PASSWORD("")' $tfile; then - retval=0 - elif [ "$1" = "online" ]; then - mysql --no-defaults -u root -h localhost <$tfile >/dev/null - retval=$? - else - $MYSQL_BOOTSTRAP <$tfile - retval=$? - fi - rm -f $tfile - 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 - 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. - 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 -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 -/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, -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 - done - - # Ensure the existence and right permissions for the database and - # log files. - if [ ! -d "$mysql_statedir" -a ! -L "$mysql_statedir" ]; then mkdir "$mysql_statedir"; fi - if [ ! -d "$mysql_statedir/mysql" -a ! -L "$mysql_statedir/mysql" ]; then mkdir "$mysql_statedir/mysql"; fi - if [ ! -d "$mysql_newlogdir" -a ! -L "$mysql_newlogdir" ]; then mkdir "$mysql_newlogdir"; 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 - # 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 - 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 - - # To avoid downgrades. - touch $mysql_statedir/debian-10.0.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 - /bin/bash /usr/bin/mysql_install_db --rpm --user=mysql --disable-log-bin 2>&1 | $ERR_LOGGER - set -e - - ## On every reconfiguration the maintenance user is recreated. - # - # - It is easier to regenerate the password every time but as people - # use fancy rsync scripts and file alteration monitors, the existing - # password is used and existing files not touched. - # - The mysqld statement is like that in mysql_install_db because the - # server is not already running. This has some implications: - # - The amount of newlines and semicolons in the query is important! - # - GRANT is not possible with --skip-grant-tables and "INSERT - # (user,host..) VALUES" is not --ansi compliant - # - The echo is just for readability. ash's buildin has no "-e" so use /bin/echo. - # - The Super_priv, Show_db_priv, Create_tmp_table_priv and Lock_tables_priv - # may not be present as old Woody 3.23 databases did not have it and the - # admin might not already have run mysql_upgrade which adds them. - # As the binlog cron scripts to need at least the Super_priv, I do first - # 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; - if [ -e "$dc" -a -n "`fgrep mysql_upgrade $dc 2>/dev/null`" ]; then - pass="`sed -n 's/^[ ]*password *= *// p' $dc | head -n 1`" - else - pass=`perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..16)'`; - if [ ! -d "$mysql_cfgdir" ]; then install -o 0 -g 0 -m 0755 -d $mysql_cfgdir; fi - cat /dev/null > $dc - echo "# Automatically generated for Debian scripts. DO NOT TOUCH!" >>$dc - echo "[client]" >>$dc - echo "host = localhost" >>$dc - echo "user = debian-sys-maint" >>$dc - echo "password = $pass" >>$dc - echo "socket = $mysql_rundir/mysqld.sock" >>$dc - echo "[mysql_upgrade]" >>$dc - echo "host = localhost" >>$dc - echo "user = debian-sys-maint" >>$dc - echo "password = $pass" >>$dc - echo "socket = $mysql_rundir/mysqld.sock" >>$dc - echo "basedir = /usr" >>$dc - fi - # If this dir chmod go+w then the admin did it. But this file should not. - chown 0:0 $dc - chmod 0600 $dc - - # update privilege tables - password_column_fix_query=`/bin/echo -e \ - "USE mysql;\n" \ - "ALTER TABLE user CHANGE Password Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL;"` - replace_query=`/bin/echo -e \ - "USE mysql;\n" \ - "SET sql_mode='';\n" \ - "REPLACE INTO user SET " \ - " host='localhost', user='debian-sys-maint', password=password('$pass'), " \ - " Select_priv='Y', Insert_priv='Y', Update_priv='Y', Delete_priv='Y', " \ - " Create_priv='Y', Drop_priv='Y', Reload_priv='Y', Shutdown_priv='Y', " \ - " Process_priv='Y', File_priv='Y', Grant_priv='Y', References_priv='Y', " \ - " Index_priv='Y', Alter_priv='Y', Super_priv='Y', Show_db_priv='Y', "\ - " Create_tmp_table_priv='Y', Lock_tables_priv='Y', Execute_priv='Y', "\ - " Repl_slave_priv='Y', Repl_client_priv='Y', Create_view_priv='Y', "\ - " Show_view_priv='Y', Create_routine_priv='Y', Alter_routine_priv='Y', "\ - " Create_user_priv='Y', Event_priv='Y', Trigger_priv='Y',"\ - " ssl_cipher='', x509_issuer='', x509_subject='';"`; - # Engines supported by etch should be installed per default. The query sequence is supposed - # to be aborted if the CREATE TABLE fails due to an already existent table in which case the - # admin might already have chosen to remove one or more plugins. Newlines are necessary. - install_plugins=`/bin/echo -e \ - "USE mysql;\n" \ - "CREATE TABLE IF NOT EXISTS plugin (name char(64) COLLATE utf8_bin NOT NULL DEFAULT '', " \ - " dl char(128) COLLATE utf8_bin NOT NULL DEFAULT '', " \ - " PRIMARY KEY (name)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='MySQL plugins';" ` - - # Upgrade password column format before the root password gets set. - echo "$password_column_fix_query" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER - - db_get mysql-server/root_password && rootpw="$RET" - if ! set_mysql_rootpw; then - password_error="yes" - fi - - set +e - echo "$replace_query" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER - echo "$install_plugins" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER - set -e - - # If there is a real AppArmor profile, we reload it. - # If the default empty profile is installed, then we remove any old - # profile that may be loaded. - # This allows upgrade from old versions (that have an apparmor profile - # on by default) to work both to disable a default profile, and to keep - # any profile installed and maintained by users themselves. - profile="/etc/apparmor.d/usr.sbin.mysqld" - if [ -f "$profile" ] && aa-status --enabled 2>/dev/null; then - if grep -q /usr/sbin/mysqld "$profile" 2>/dev/null ; then - apparmor_parser -r "$profile" || true - else - echo "/usr/sbin/mysqld { }" | apparmor_parser --remove 2>/dev/null || true - fi - fi - ;; - - abort-upgrade|abort-remove|abort-configure) - ;; - - *) - echo "postinst called with unknown argument '$1'" 1>&2 - exit 1 - ;; -esac - -# here we check to see if we can connect as root without a password -# this should catch upgrades from previous versions where the root -# password wasn't set. if there is a password, or if the connection -# fails for any other reason, nothing happens. -if [ "$1" = "configure" ]; then - if test_mysql_access; then - db_input medium mysql-server/root_password || true - db_go - db_get mysql-server/root_password && rootpw="$RET" - - if ! set_mysql_rootpw "online"; then - password_error="yes" - fi - fi - - if [ "$password_error" = "yes" ]; then - db_input high mysql-server/error_setting_password || true - db_go - fi - -fi - -db_stop # in case invoke failes - -#DEBHELPER# - -exit 0 diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.postrm b/debian/dist/Ubuntu/mariadb-server-10.0.postrm deleted file mode 100644 index 7cee515..0000000 --- a/debian/dist/Ubuntu/mariadb-server-10.0.postrm +++ /dev/null @@ -1,86 +0,0 @@ -#!/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 - -if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi -${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 } - -MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf" - -# 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! -stop_server() { - set +e - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d mysql stop - else - /etc/init.d/mysql stop - fi - errno=$? - set -e - - if [ "$?" != 0 ]; then - echo "Trying to stop the MySQL server resulted in exitcode $?." 1>&2 - echo "Stop it yourself and try again!" 1>&2 - exit 1 - fi -} - -case "$1" in - purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - if [ -n "`$MYADMIN ping 2>/dev/null`" ]; then - stop_server - sleep 2 - fi - ;; - *) - echo "postrm called with unknown argument '$1'" 1>&2 - exit 1 - ;; -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_go || true - db_get mysql-server-5.1/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 - 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 - -exit 0 diff --git a/debian/dist/Ubuntu/rules b/debian/dist/Ubuntu/rules deleted file mode 100755 index 8d99312..0000000 --- a/debian/dist/Ubuntu/rules +++ /dev/null @@ -1,290 +0,0 @@ -#!/usr/bin/make -f - -export DH_VERBOSE=1 -export DEB_BUILD_HARDENING=1 - -PACKAGE=mariadb-10.0 - -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) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -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 -endif - -USE_ASSEMBLER=--enable-assembler - -ifneq (,$(filter $(ARCH), amd64 i386 ia64 s390)) - TESTSUITE_FAIL_CMD=exit 1 -else - TESTSUITE_FAIL_CMD=true -endif - -BUILDDIR = builddir -builddir = $(BUILDDIR) - -# This causes seg11 crashes if LDAP is used for groups in /etc/nsswitch.conf -# so it is disabled by default although, according to MySQL, it brings >10% -# performance gain if enabled. See #299382. -ifeq ($(STATIC_MYSQLD), 1) - USE_STATIC_MYSQLD=--with-mysqld-ldflags=-all-static -endif - -configure: patch configure-stamp -configure-stamp: - @echo "RULES.$@" - dh_testdir - -ifneq ($(ARCH_OS),hurd) - if [ ! -d /proc/self ]; then echo "/proc IS NEEDED" 1>&2; exit 1; fi -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' - - touch $@ - -build: build-stamp - -build-stamp: configure - @echo "RULES.$@" - dh_testdir - - cd $(builddir) && $(MAKE) $(MAKE_J) $(AM_EXTRA_MAKEFLAGS) - -ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),) - if [ ! -f testsuite-stamp ] ; then \ - cd $(builddir) && $(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ; \ - fi -endif - - touch testsuite-stamp - - touch build-stamp - -clean: clean-patched unpatch - rm -rf debian/patched -clean-patched: - @echo "RULES.clean-patched" - dh_testdir - dh_testroot - rm -f configure-stamp* - rm -f build-stamp* - rm -f testsuite-stamp - # - [ ! -f Makefile ] || $(MAKE) clean - [ ! -d mysql-test/var ] || rm -rf mysql-test/var - # - rm -rf $(BUILDDIR) - - debconf-updatepo - dh_clean -v - - -install: build - @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.0/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.0/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.0/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.0/INFO_SRC - install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-server-10.0/INFO_BIN - - # mariadb-test - mv $(TMP)/usr/mysql-test $(TMP)/usr/share/mysql - - # lintian overrides - mkdir -p $(TMP)/usr/share/lintian/overrides/ - cp debian/mysql-common.lintian-overrides $(TMP)/usr/share/lintian/overrides/mysql-common - cp debian/mariadb-server-10.0.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-server-10.0 - cp debian/mariadb-client-10.0.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-client-10.0 - - # For 5.0 -> 10.0 transition - d=$(TMP)/usr/share/mysql-common/internal-use-only/; \ - mkdir -p $$d; \ - cp debian/mariadb-server-10.0.mysql.init $$d/_etc_init.d_mysql; \ - cp debian/mariadb-server-10.0.mysql-server.logrotate $$d/_etc_logrotate.d_mysql-server; \ - cp debian/additions/debian-start $$d/_etc_mysql_debian-start; - - # 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.0.py $(TMP)/usr/share/apport/package-hooks/source_mariadb-10.0.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 - - dh_installdebconf -a - dh_installdocs -a - dh_installexamples -a - dh_installmenu -a - dh_installlogrotate -a --name mysql-server - # 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 - 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 - -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 - -# vim: ts=8 diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..bd69fd3 --- /dev/null +++ b/debian/gbp.conf # ##=> not merged upstream # @@ -0,0 +1,3 @@ +[DEFAULT] +debian-branch = master +pristine-tar = True diff --git a/debian/libmariadbclient-dev.README.Maintainer b/debian/libmariadbclient-dev.README.Maintainer deleted file mode 100644 index f24cdcd..0000000 --- a/debian/libmariadbclient-dev.README.Maintainer +++ /dev/null @@ -1,4 +0,0 @@ -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.dirs b/debian/libmariadbclient-dev.dirs deleted file mode 100644 index f6ad287..0000000 --- a/debian/libmariadbclient-dev.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/include/ -usr/lib/ diff --git a/debian/libmariadbclient-dev.examples b/debian/libmariadbclient-dev.examples deleted file mode 100644 index f1649c3..0000000 --- a/debian/libmariadbclient-dev.examples +++ /dev/null @@ -1 +0,0 @@ -sql/udf_example.c diff --git a/debian/libmariadbclient-dev.files b/debian/libmariadbclient-dev.files deleted file mode 100644 index 8f56a30..0000000 --- a/debian/libmariadbclient-dev.files +++ /dev/null @@ -1,7 +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/man/man1/mysql_config.1 diff --git a/debian/libmariadbclient-dev.links b/debian/libmariadbclient-dev.links deleted file mode 100644 index 0076791..0000000 --- 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 2964de6..0000000 --- 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 75020ec..0000000 --- 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.postinst b/debian/libmariadbclient18.postinst deleted file mode 100644 index 29d3b86..0000000 # # I suppose all libmysql/libmariadb files need to be restored # --- a/debian/libmariadbclient18.postinst +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -e - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - -# vim: ts=4 - - diff --git a/debian/libmariadbd-dev.files b/debian/libmariadbd-dev.files deleted file mode 100644 index 26cb8d0..0000000 --- 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 0000000..18b16d9 --- /dev/null +++ b/debian/libmariadbd-dev.install @@ -0,0 +1,2 @@ +usr/lib/*/libmysqld.a +usr/lib/*/libmysqld.so* # # libmysqld.so.* in the -dev package??? ##=> should be fixed # diff --git a/debian/libmariadbd-dev.lintian-overrides b/debian/libmariadbd-dev.lintian-overrides new file mode 100644 index 0000000..b2b7a2b --- /dev/null +++ b/debian/libmariadbd-dev.lintian-overrides @@ -0,0 +1,9 @@ +# These are OK for -dev package +libmariadbd-dev: package-name-doesnt-match-sonames libmysqld18 # # we can remove that and rename the package to match the soname # +# OK, embedded has same source +libmariadbd-dev: embedded-library usr/lib/x86_64-linux-gnu/libmysqld.so.18: libmysqlclient +libmariadbd-dev: embedded-library usr/lib/i386-linux-gnu/libmysqld.so.18: libmysqlclient # # I think this can be fixed # +# OK, this is in fact a dev package +# but for soname libmysqlclient +# (due to upstream reasons) +libmariadbd-dev: non-dev-pkg-with-shlib-symlink usr/lib/x86_64-linux-gnu/libmysqld.so.18 usr/lib/x86_64-linux-gnu/libmysqld.so # # what? it *is* a -dev package # diff --git a/debian/license-reconcile.yml b/debian/license-reconcile.yml new file mode 100644 index 0000000..9e9d015 --- /dev/null +++ b/debian/license-reconcile.yml # ##=> skipped, just as copyright file # @@ -0,0 +1,245 @@ +Rules: + rules: + - + Glob: storage/maria/ma_commit.c storage/maria/trnman.h storage/maria/trnman_public.h storage/maria/unittest/trnman-t.c include/waiting_threads.h unittest/mysys/waiting_threads-t.c mysys/waiting_threads.c storage/maria/trnman.c include/maria.h + Copyright: + - MySQL AB, + - 2008-2009 Sun Microsystems, Inc + - + Glob: storage/tokudb/ft-index/third_party/xz-4.999.9beta/build-aux/install-sh + License: MIT/X11 + - + Glob: storage/connect/* + Copyright: 1993-2014 Olivier Bertrand + - + Glob: client/async_example.c include/my_context.h mysys/my_context.c storage/connect/inihandl.c \ + storage/tokudb/ft-index/third_party/xz-4.999.9beta/lib/getopt.c storage/tokudb/ft-index/third_party/xz-4.999.9beta/lib/getopt.in.h \ + storage/tokudb/ft-index/third_party/xz-4.999.9beta/lib/getopt1.c storage/connect/inihandl.c \ + tests/nonblock-wrappers.h tests/async_queries.c sql-common/mysql_async.c + License: LGPL-2.1+ + - + Glob: mysys/my_port.c + License: LGPL-2 + - + Glob: debian/additions/innotop/* + License: GPL-2 or Artistic + - + Glob: storage/innobase/include/pars0grm.h storage/innobase/pars/pars0grm.cc \ + storage/xtradb/include/pars0grm.h storage/xtradb/pars/pars0grm.cc + License: GPL-2+-with-bison-exception + - + Glob: storage/innobase/fts/fts0pars.cc sql/sql_yacc.cc sql/sql_yacc.h storage/innobase/include/fts0pars.h \ + storage/xtradb/fts/fts0pars.cc storage/xtradb/include/fts0pars.h + License: GPL-3+-with-bison-exception + - + Glob: storage/connect/inihandl.c + VerifyLicense: LGPL-2.1+ + - + Glob: storage/tokudb/ft-index/third_party/xz-4.999.9beta/m4/acx_pthread.m4 + License: GPL-3+ + - + Glob: plugin/auth_pam/testing/pam_mariadb_mtr.c + License: public-domain + - + Glob: plugin/locale_info/locale_info.cc plugin/qc_info/qc_info.cc + License: BSD-3-clause + - + Glob: mysys/waiting_threads.c + Copyright: + - 2011, 2013, Monty Program Ab, + - 2008 MySQL AB, + - 2008-2009 Sun Microsystems, Inc + - + Glob: storage/innobase/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc + License: GPL-2 and BSD-2-clause + - + Glob: storage/oqgraph/graphcore-graph.h storage/oqgraph/graphcore.h storage/oqgraph/graphcore-graph.cc \ + storage/oqgraph/graphcore-types.h storage/oqgraph/graphcore-config.h storage/oqgraph/graphcore.cc \ + storage/oqgraph/oqgraph_judy.* storage/oqgraph/oqgraph_shim.* storage/oqgraph/oqgraph_thunk.* + License: GPL-2+ + - + Glob: include/maria.h include/myisamchk.h + License: GPL-2+ + - + Glob: storage/maria/ma_rt_index.c storage/maria/ma_rt_mbr.c storage/maria/ma_sp_defs.h storage/maria/ma_rt_index.h storage/maria/ma_rt_mbr.h + Copyright: MySQL AB, Ramil Kalimullin, MySQL Finland AB + - + Glob: extra/yassl*COPYING + Contains: Everyone is permitted to copy and distribute verbatim copies + CopyrightExtract: &extract Copyright\s+\([Cc]\)\s(\Y+[\w\s,]+)\. + License: GPL-verbatim + - + Glob: storage/connect/CMakeLists.txt + VerifyLicense: GPL-2 + - + Glob: storage/innobase/COPYING.* + CopyrightExtract: *extract + - + Glob: scripts/mysqlaccess.conf + MaxVersion: 5.6 + License: GPL-2 + Copyright: 1997 Yves.Carlier@rug.ac.be + - + Glob: mysys/sha1.c + MaxVersion: 5.6 + Copyright: + - 2002, 2004, 2006 MySQL AB + - 2001 The Internet Society + - + Glob: regex/regexp.c + MaxVersion: 5.6 + CopyrightExtract: *extract + VerifyLicense: UNKNOWN + License: BSD-like + - + Glob: libmysqld/lib_sql.cc + MaxVersion: 5.6 + CopyrightExtract: \s*\*\s*Copyright\s*\(c\)\s+(\Y+\s*\*\s+SWsoft\s+company) + License: SWsoft + - + Glob: debian/additions/mysqlreport* + MaxVersion: 5.6 + Copyright: Daniel Nichter + - + Glob: include/mysql_version.h.in + MaxVersion: 5.6 + Copyright: 1996, 1999, 2001 MySQL AB + License: public-domain + - + Glob: cmd-line-utils/readline/COPYING extra/yassl/taocrypt/COPYING + Copyright: 1989, 1991 Free Software Foundation, Inc. + - + Glob: s*.h + VerifyLicense: BSD (3 clause) GPL (v2) + License: BSD-3-clause or GPL-2 + - + Glob: cmd-line-utils/readline* sql/* s*.sh + VerifyLicense: GPL (v2 or later) + License: GPL-2+ + CopyrightExtract: &CE (?:(?:Copyright\s+\(C\)\s+(\Y+Google\s+Inc)\.\s*\R+)|(?:Copyright\s+\([Cc]\)\s+(\Y+(?:\s*\R\Y+)?\s*Free\s+Software\s+Foundation,\s+Inc)\.\s*\R+)|(?:Copyright\s+\(c\)\s+(\Y+Oracle\s+and/or\s+its\s+affiliates)\.\s+All\s+rights\s+reserved\.\s+\&\s+(tommy\@valley\.ne\.jp)\.\s*\R+)|(?:Copyright\s+\(c\)\s+(\Y+Sun\s+Microsystems,\s+Inc)\.\s*\R+)|(?:Copyright\s+\(c\)\s+(\Y+Innobase\s+Oy)\.\s+All\s+Rights\s+Reserved\.\s+\R+)|(?:/\*\ Copyright\ \(C\)\ (\Y+MySQL\ AB)\s*\R+)|(?:/\*\ Copyright\ \(C\)\ (\Y+MySQL\ AB)\ \&\ ([\w\ ]+)\s*\R+)|(?:(?:/\*|\#)?\s*Copyright\s+(?:\(c\)\s+)?(\Y+MySQL\s+AB),\s+(\Y+Sun\s+Microsystems,\s+Inc)\.\s*\R+)|(?:Copyright\s+\(c\)\s+(\Y+Oracle\s+and/or\s+its\s+affiliates)\.\s+All\s+rights\s+reserved\.\s*\R+)|(?:\s*This\s+program\s+is\s+free\s+software[\w\s;/\.,-]{620,680}\*/\s*/\*\s+Written\s+by\s+([\s\w\.]+),\s+who\s+has\s+a\s+shared\s+copyright\s+to\s+this\s+code))+ + - + Glob: scripts/*.pl + VerifyLicense: BSD (3 clause) + License: BSD-3-clause + CopyrightExtract: *CE + - + Glob: cmd-line-utils/* + MMagic: text/plain + VerifyLicense: BSD + Matches: \s*[\#\*]\s+Copyright\s+\(c\)\s+(?:1989,\s+)?(?:1990,\s+)?(?:1992,\s+)?1993\s+[\#\*]\s+The\s+Regents\s+of\s+the\s+University\s+of\s+California + Copyright: 1989-1990, 1992-1993, The Regents of the University of California + - + Glob: zlib* storage/archive/azlib.h + MMagic: text/plain + CopyrightExtract: (?:(?:\s+Copyright\s+\(C\)\s+(\Y+Jean-loup\s+Gailly)\s+and\s+(Mark\s+Adler)\s*\R+)|(?:\s+\*\s+Copyright\s+\(C\)\s+(\Y+Jean-loup\s+Gailly)\.\s*\R+)|(?:\s+\*\s+Copyright\s+\(C\)\s+(\Y+Mark\s+Adler)\s*\R+))+ + - + Glob: sql/* storage/* mysys/* + MMagic: text/plain + VerifyLicense: Public domain GPL (v2) + License: GPL-2 + CopyrightExtract: *CE + - + Glob: s* plugin/* mysql-test/*.p[lm] tests/* mysys/* unittest/* include/* extra/* dbug/*.pl cmd-line-utils/readline* + VerifyLicense: GPL (v2) + CopyrightExtract: *CE + - + Glob: extra/* + MMagic: text/plain + VerifyLicense: UNKNOWN + CopyrightExtract: *CE + Matches: \s+This\s+file\s+is\s+free\s+documentation;\s+the\s+Free\s+Software\s+Foundation\s+gives\s+unlimited\s+permission\s+to\s+copy,\s+distribute\s+and\s+modify\s+it. + License: unlimited-free-doc + - + Glob: storage/ndb/src/common/util/md5_hash.cpp + MaxVersion: 5.6 + MMagic: text/plain + Contains: | + /* + * This code implements the MD5 message-digest algorithm. + * The algorithm is due to Ron Rivest. This code was + * written by Colin Plumb in 1993, no copyright is claimed. + * This code is in the public domain; do with it what you wish. + * + * Equivalent code is available from RSA Data Security, Inc. + * This code has been tested against that, and is equivalent, + * except that you don't need to include two pages of legalese + * with every copy. + * + * The code has been modified by Mikael Ronstroem to handle + * calculating a hash value of a key that is always a multiple + * of 4 bytes long. Word 0 of the calculated 4-word hash value + * is returned as the hash value. + */ + Matches: the\s+Free\s+Software\s+Foundation;\s+version\s+2\s+of\s+the\s+License. + License: GPL-2 + Copyright: Copyright (C) 2003 MySQL AB + Justification: Seems to have been taken out of public domain by Oracle. + - + Glob: mysys/md5.c + MaxVersion: 5.6 + MMagic: text/plain + Contains: | + /* Copyright (C) 2000 MySQL 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; version 2 of the License. + + 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + + /* + * This code implements the MD5 message-digest algorithm. + * The algorithm is due to Ron Rivest. This code was + * written by Colin Plumb in 1993, no copyright is claimed. + * This code is in the public domain; do with it what you wish. + * + * Equivalent code is available from RSA Data Security, Inc. + * This code has been tested against that, and is equivalent, + * except that you don't need to include two pages of legalese + * with every copy. + * + * To compute the message digest of a chunk of bytes, declare an + * MD5Context structure, pass it to MD5Init, call MD5Update as + * needed on buffers full of bytes, and then call MD5Final, which + * will fill a supplied 16-byte array with the digest. + */ + + /* This code was modified in 1997 by Jim Kingdon of Cyclic Software to + not require an integer type which is exactly 32 bits. This work + draws on the changes for the same purpose by Tatu Ylonen + as part of SSH, but since I didn't actually use + that code, there is no copyright issue. I hereby disclaim + copyright in any changes I have made; this code remains in the + public domain. */ + License: GPL-2 + Copyright: Copyright (C) 2000 MySQL AB + Justification: Seems to have been taken out of public domain by Oracle. + - + Glob: storage/ndb/test/include/getarg.h + MaxVersion: 5.5.30 + Copyright: | + 2003 MySQL AB + 1997-1999 Kungliga Tekniska Högskolan + License: BSD (3 clause) or GPL-2 + Justification: Check the actual file but this looks like a dual-license to me + - + Glob: dbug/* + Matches: Copyright\s+Abandoned,\s+1987,\s+Fred\s+Fish\s+\*\s+\*\s+\*\s+\*\s+\*\s+\*\s+This\s+previously\s+copyrighted\s+work\s+has\s+been\s+placed\s+into\s+the\s+public\s+\*\s+\*\s+domain\s+by\s+the\s+author\s+and\s+may\s+be\s+freely\s+used\s+for\s+any\s+purpose,\s+\*\s+\*\s+private\s+or\s+commercial\. + Copyright: 1987 Abandoned Fred Fish + License: public-domain +Std: +ChangeLog: + license: GPL-2+ +Default: + rules: + - + Copyright: 2000, 2012, Oracle and/or its affiliates. All rights reserved. + License: GPL-2 + Justification: This is taken from the README file. diff --git a/debian/mariadb-client-10.0.dirs b/debian/mariadb-client-10.0.dirs deleted file mode 100644 index ceda592..0000000 --- a/debian/mariadb-client-10.0.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin/ -usr/share/man/man1/ -usr/share/perl5/ diff --git a/debian/mariadb-client-10.0.docs b/debian/mariadb-client-10.0.docs index 2144685..e845566 100644 --- a/debian/mariadb-client-10.0.docs +++ b/debian/mariadb-client-10.0.docs @@ -1,2 +1 @@ -debian/additions/innotop/changelog.innotop README diff --git a/debian/mariadb-client-10.0.files b/debian/mariadb-client-10.0.files deleted file mode 100644 index a8a0095..0000000 --- a/debian/mariadb-client-10.0.files +++ /dev/null @@ -1,28 +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/lintian/overrides/mariadb-client-10.0 -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.0.install b/debian/mariadb-client-10.0.install new file mode 100644 index 0000000..3798c27 --- /dev/null +++ b/debian/mariadb-client-10.0.install @@ -0,0 +1,13 @@ +debian/additions/innotop/innotop usr/bin/ # # should be part of the source, not packaging # +debian/additions/mysqlreport usr/bin/ # # same. or removed. # +usr/bin/mysql_find_rows +usr/bin/mysql_fix_extensions +usr/bin/mysql_waitpid +usr/bin/mysqlaccess +usr/bin/mysqladmin +usr/bin/mysqlbug +usr/bin/mysqldump +usr/bin/mysqldumpslow +usr/bin/mysqlimport +usr/bin/mysqlshow +usr/bin/mysqlslap diff --git a/debian/mariadb-client-10.0.lintian-overrides b/debian/mariadb-client-10.0.lintian-overrides index d4dc1a7..8cee964 100644 --- a/debian/mariadb-client-10.0.lintian-overrides +++ b/debian/mariadb-client-10.0.lintian-overrides @@ -1,3 +1,6 @@ -mariadb-client-5.3: package-has-a-duplicate-relation -mariadb-client-5.3: wrong-name-for-upstream-changelog usr/share/doc/mariadb-client-5.3/changelog.innotop.gz -mariadb-client-5.3: pkg-not-in-package-test innotop +# OK, embedded has same source +mariadb-client-10.0: embedded-library usr/bin/mysqladmin: libmysqlclient +mariadb-client-10.0: embedded-library usr/bin/mysqldump: libmysqlclient +mariadb-client-10.0: embedded-library usr/bin/mysqlimport: libmysqlclient +mariadb-client-10.0: embedded-library usr/bin/mysqlshow: libmysqlclient +mariadb-client-10.0: embedded-library usr/bin/mysqlslap: libmysqlclient # # I think we can fix that: MDEV-290 # diff --git a/debian/mariadb-client-10.0.manpages b/debian/mariadb-client-10.0.manpages new file mode 100644 index 0000000..5342137 --- /dev/null +++ b/debian/mariadb-client-10.0.manpages @@ -0,0 +1,13 @@ +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/mysqlbug.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.0.menu b/debian/mariadb-client-10.0.menu index 1378555..85ecbcb 100644 --- a/debian/mariadb-client-10.0.menu +++ b/debian/mariadb-client-10.0.menu @@ -1,3 +1,3 @@ # According to /usr/share/menu/ policy 1.4, not /usr/share/doc/debian-policy/ -?package(innotop):needs="text" section="Applications/Data Management"\ - title="innotop" command="/usr/bin/innotop" +?package(mariadb-client-10.0):needs="text" section="Applications/Data Management"\ + title="Innotop" command="/usr/bin/innotop" diff --git a/debian/mariadb-client-core-10.0.files b/debian/mariadb-client-core-10.0.files deleted file mode 100644 index a278130..0000000 --- a/debian/mariadb-client-core-10.0.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.0.install b/debian/mariadb-client-core-10.0.install new file mode 100644 index 0000000..6308d76 --- /dev/null +++ b/debian/mariadb-client-core-10.0.install @@ -0,0 +1,2 @@ +usr/bin/mysql +usr/bin/mysqlcheck diff --git a/debian/mariadb-client-core-10.0.manpages b/debian/mariadb-client-core-10.0.manpages new file mode 100644 index 0000000..2be91d8 --- /dev/null +++ b/debian/mariadb-client-core-10.0.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.files b/debian/mariadb-common.files deleted file mode 100644 index f37e46c..0000000 --- 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 0000000..dfd4fd3 --- /dev/null +++ b/debian/mariadb-common.install @@ -0,0 +1,2 @@ +debian/additions/mariadb.cnf etc/mysql/ +debian/additions/mariadb.conf.d etc/mysql/ diff --git a/debian/mariadb-common.postinst b/debian/mariadb-common.postinst new file mode 100644 index 0000000..717a804 --- /dev/null +++ b/debian/mariadb-common.postinst @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +case "$1" in + configure) + /usr/share/mysql-common/configure-symlinks install mariadb "/etc/mysql/mariadb.cnf" # # What is that? # + ;; +esac + +#DEBHELPER# diff --git a/debian/mariadb-common.postrm b/debian/mariadb-common.postrm index 027592f..9b9e2e7 100644 --- a/debian/mariadb-common.postrm +++ b/debian/mariadb-common.postrm @@ -1,8 +1,14 @@ -#!/bin/bash -e +#!/bin/sh -if [ "$1" = "purge" ]; then - rmdir /etc/mysql/conf.d 2>/dev/null || true - rmdir /etc/mysql 2>/dev/null || true -fi +set -e + +case "$1" in + remove|disappear) + if [ -f /usr/share/mysql-common/configure-symlinks ] + then + /usr/share/mysql-common/configure-symlinks remove mariadb "/etc/mysql/mariadb.cnf" + fi + ;; +esac #DEBHELPER# diff --git a/debian/mariadb-common.preinst b/debian/mariadb-common.preinst new file mode 100644 index 0000000..84dfeee --- /dev/null +++ b/debian/mariadb-common.preinst @@ -0,0 +1,20 @@ +#!/bin/sh +set -e + +if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then + if dpkg --compare-versions "$2" lt-nl "10.0.20-3~" ; then # # Is it for *downgrades* from 10.0.20 ? # It yes - I wouldn't bother. # + + # revert fallback my.cnf symlink setup performed by mariadb-common + # from 10.0.17-1~exp2 upto 10.0.20-2 + if [ -L /etc/mysql/my.cnf ] && [ -f /etc/mysql/my.cnf.old ]; then + if [ "$(readlink /etc/mysql/my.cnf)" = "mariadb.cnf" ]; then + echo "Reverting my.cnf -> mariadb.cnf symlink setup by mariadb-common" + rm /etc/mysql/my.cnf + mv /etc/mysql/my.cnf.old /etc/mysql/my.cnf + fi + fi + + fi +fi + +#DEBHELPER# diff --git a/debian/mariadb-connect-engine-10.0.files b/debian/mariadb-connect-engine-10.0.install similarity index 100% rename from debian/mariadb-connect-engine-10.0.files rename to debian/mariadb-connect-engine-10.0.install index 0b04260..8a7aee4 100644 --- a/debian/mariadb-connect-engine-10.0.files +++ b/debian/mariadb-connect-engine-10.0.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-oqgraph-engine-10.0.files b/debian/mariadb-oqgraph-engine-10.0.install similarity index 100% rename from debian/mariadb-oqgraph-engine-10.0.files rename to debian/mariadb-oqgraph-engine-10.0.install diff --git a/debian/mariadb-server-10.0.NEWS b/debian/mariadb-server-10.0.NEWS deleted file mode 100644 index a3042dc..0000000 --- a/debian/mariadb-server-10.0.NEWS +++ /dev/null @@ -1,34 +0,0 @@ -mysql-dfsg-5.1 (5.1.38-1) unstable; urgency=low - - * Please read http://dev.mysql.com/doc/refman/5.1/en/upgrading-from-5-0.html - * Make sure to do a REPAIR TABLE on all tables that use UTF-8 and have a - FULLTEXT index. - - -- Christian Hammers Sat, 4 Jul 2009 02:31:21 +0200 - -mysql-dfsg-5.0 (5.1.14beta-2) unstable; urgency=low - - * The BerkeleyDB Storage Engine is no longer supported. If the options - have-bdb or skip-bdb are found, MySQL will not start. If you have BDB - tables, you should change them to use another storage engine before - upgrading to 5.1. - - -- Monty Taylor Thu, 18 Jan 2007 12:28:21 -0800 - -mysql-dfsg-5.0 (5.0.45-2) unstable; urgency=low - - * Binary logging is now disabled by default. If you really need it (e.g. on - a replication master), remove the comment from the log_bin line in my.cnf. - - -- Norbert Tretkowski Sat, 10 Nov 2007 16:26:35 +0100 - -mysql-dfsg-5.0 (5.0.18-9) unstable; urgency=low - - * Rotation of the binary logs is now configured in /etc/mysql/my.cnf with - "expire-logs-days" which defaults to 20 days. The old file - /etc/mysql/debian-log-rotate.conf should be removed together with - /etc/cron.daily/mysql-server after this value has been adjusted. Note that - the old variable defined the number of files whereas the new one defines - a time span in days. - - -- Christian Hammers Tue, 24 Jan 2006 22:18:21 +0100 diff --git a/debian/mariadb-server-10.0.README.Debian b/debian/mariadb-server-10.0.README.Debian new file mode 100644 index 0000000..be2e33d --- /dev/null +++ b/debian/mariadb-server-10.0.README.Debian @@ -0,0 +1,106 @@ +* MYSQL WON'T START OR STOP?: +============================= +You may never ever delete the mysql user "root". Although it has no password +is set, the unix_auth plugin ensure that it can only be run locally as the root +user. The credentials in /etc/mysql/debian.cnf specify the user are used by the +init scripts to stop the server and perform logrotation. So in most of the +time you can fix the situation by making sure that the /etc/mysql/debian.cnf +file specifies the root user and no password. + +This used to be the debian-sys-maint user which is no longer used. + +* WHAT TO DO AFTER UPGRADES: +============================ +The privilege tables are automatically updated so all there is left is read +the release notes on https://mariadb.com/kb/en/release-notes/ to see if any +changes affect custom apps. + +* WHAT TO DO AFTER INSTALLATION: +================================ +The MySQL manual describes certain steps to do at this stage in a separate +chapter. They are not necessary as the Debian packages does them +automatically. + +The only thing that is left over for the admin is + - setting the passwords + - creating new users and databases + - read the rest of this text + +* NETWORKING: +============= +For security reasons, the Debian package has enabled networking only on the +loop-back device using "bind-address" in /etc/mysql/my.cnf. Check with +"netstat -tlnp" where it is listening. If your connection is aborted +immediately check your firewall rules or network routes. + +* WHERE IS THE DOCUMENTATION?: +============================== +https://mariadb.com/kb + +* PASSWORDS: +============ +It is strongly recommended you create an admin users for your database +adminstration needs. + +If your your local unix account is the one you want to have local super user +access on your database with you can create the following account that will +only work for the local unix user connecting to the database locally. + + sudo /usr/bin/mysql -e "GRANT ALL ON *.* TO '$USER'@'localhost' IDENTIFIED VIA unix_socket WITH GRANT OPTION" + +To create a local machine account username=USERNAME with a password: + + sudo /usr/bin/mysql -e "GRANT ALL ON *.* TO 'USERNAME'@'localhost' IDENTIFIED BY 'password' WITH GRANT OPTION" + +To create a USERNAME user with password 'password' admin user that can access +the DB server over the network: + + sudo /usr/bin/mysql -e "GRANT ALL ON *.* TO 'USERNAME'@'%' IDENTIFIED BY 'password' WITH GRANT OPTION" + +Scripts should run as a user have have the required grants and be identified via unix_socket. + +If you are too tired to type the password in every time and unix_socket auth +doesn't suit your needs, you can store it in the file $HOME/.my.cnf. It should +be chmod 0600 (-rw------- username username .my.cnf) to ensure that nobody else +can read it. Every other configuration parameter can be stored there, too. + +For more information in the MariaDB manual in/usr/share/doc/mariadb-doc or +https://mariadb.com/kb/en/configuring-mariadb-with-mycnf/. + +ATTENTION: It is necessary, that a ~/.my.cnf from root always contains a "user" +line wherever there is a "password" line, else, the Debian maintenance +scripts, that use /etc/mysql/debian.cnf, will use the username +"root" but the password that is in root's .my.cnf. Also note, +that every change you make in the /root/.my.cnf will affect the mysql cron +script, too. + + # an example of $HOME/.my.cnf + [client] + user = your-mysql-username + password = enter-your-good-new-password-here + +* FURTHER NOTES ON REPLICATION +=============================== +If the MySQL server is acting as a replication slave, you should not +set --tmpdir to point to a directory on a memory-based filesystem or to +a directory that is cleared when the server host restarts. A replication +slave needs some of its temporary files to survive a machine restart so +that it can replicate temporary tables or LOAD DATA INFILE operations. If +files in the temporary file directory are lost when the server restarts, +replication fails. + +* DOWNGRADING +============================ +Unsupported. Period. + +You might get lucky downgrading a few minor versions without issued. Take a +backup first. If you break it you get to keep both pieces. Do a restore from +backup or upgrade to the previous version. + +If doing a major version downgrade, take a mysqldump/mydumpber consistent +backup using the current version and reload after downgrading and purging +existing databases. + +* BACKUPS +============================ +Backups save jobs. Don't get caught without one. diff --git a/debian/mariadb-server-10.0.config b/debian/mariadb-server-10.0.config index 162017c..1929c37 100644 --- a/debian/mariadb-server-10.0.config +++ b/debian/mariadb-server-10.0.config @@ -1,46 +1,14 @@ -#!/bin/bash -e +#!/bin/bash # # why? # + +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 -# postinst script when the tools are available for us to use. -if [ "$1" = "configure" ] && ([ -z "$2" ] && [ ! -e "/var/lib/mysql/debian-5.0.flag" ] ) || [ "$1" = "reconfigure" ]; then - while :; do - RET="" - db_input high mysql-server/root_password || true - db_go - db_get mysql-server/root_password - # if password isn't empty we ask for password verification - if [ -z "$RET" ]; then - db_fset mysql-server/root_password seen false - db_fset mysql-server/root_password_again seen false - break - fi - ROOT_PW="$RET" - db_input high mysql-server/root_password_again || true - db_go - db_get mysql-server/root_password_again - if [ "$RET" == "$ROOT_PW" ]; then - ROOT_PW='' - break - fi - db_fset mysql-server/password_mismatch seen false - db_input critical mysql-server/password_mismatch - db_set mysql-server/root_password "" - db_set mysql-server/root_password_again "" - db_go - done fi diff --git a/debian/mariadb-server-10.0.dirs b/debian/mariadb-server-10.0.dirs new file mode 100644 index 0000000..5057fe8 --- /dev/null +++ b/debian/mariadb-server-10.0.dirs @@ -0,0 +1 @@ +var/lib/mysql-upgrade # # This doesn't seem to be used anymore. See below. # diff --git a/debian/mariadb-server-10.0.docs b/debian/mariadb-server-10.0.docs new file mode 100644 index 0000000..07a89a2 --- /dev/null +++ b/debian/mariadb-server-10.0.docs @@ -0,0 +1 @@ +Docs/INFO_SRC # # Nah, we don't build these files anymore. # diff --git a/debian/dist/Debian/mariadb-server-10.0.files.in b/debian/mariadb-server-10.0.install similarity index 56% rename from debian/dist/Debian/mariadb-server-10.0.files.in rename to debian/mariadb-server-10.0.install index 88516bb..bf998d1 100644 --- a/debian/dist/Debian/mariadb-server-10.0.files.in +++ b/debian/mariadb-server-10.0.install @@ -1,32 +1,18 @@ -usr/lib/mysql/plugin/auth_pam.so -usr/lib/mysql/plugin/auth_socket.so -usr/lib/mysql/plugin/ha_mroonga.so -usr/lib/mysql/plugin/ha_sequence.so -usr/lib/mysql/plugin/ha_sphinx.so -usr/lib/mysql/plugin/ha_innodb.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/sql_errlog.so -usr/lib/mysql/plugin/server_audit.so -usr/lib/libhsclient.so.* -etc/mysql/debian-start -etc/mysql/conf.d/mysqld_safe_syslog.cnf +debian/additions/debian-start etc/mysql +debian/additions/debian-start.inc.sh usr/share/mysql +debian/additions/echo_stderr usr/share/mysql +etc/apparmor.d/usr.sbin.mysqld +usr/bin/aria_chk +usr/bin/aria_dump_log +usr/bin/aria_ftdump +usr/bin/aria_pack +usr/bin/aria_read_log usr/bin/msql2mysql usr/bin/my_print_defaults -usr/bin/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 @@ -43,40 +29,27 @@ usr/bin/perror usr/bin/replace usr/bin/resolve_stack_dump usr/bin/resolveip -usr/share/doc/mariadb-server-10.0/mysqld.sym.gz -usr/share/doc/mariadb-server-10.0/INFO_SRC +usr/lib/mysql/plugin/auth_pam.so +usr/lib/mysql/plugin/auth_socket.so +usr/lib/mysql/plugin/ha_innodb.so +usr/lib/mysql/plugin/ha_sequence.so +usr/lib/mysql/plugin/ha_sphinx.so +usr/lib/mysql/plugin/ha_spider.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/sql_errlog.so usr/share/doc/mariadb-server-10.0/INFO_BIN -usr/share/lintian/overrides/mariadb-server-10.0 -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/share/doc/mariadb-server-10.0/mysqld.sym.gz usr/share/mysql/errmsg-utf8.txt usr/share/mysql/fill_help_tables.sql -usr/share/mysql/mysql_system_tables_data.sql -usr/share/mysql/mysql_system_tables.sql +usr/share/mysql/install_spider.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 -@CASSANDRA_DEB_FILES@ -@SPIDER_DEB_FILES@ -@TOKUDB_DEB_FILES@ # # +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 # # because in 10.1 they're built dynamically # diff --git a/debian/mariadb-server-10.0.lintian-overrides b/debian/mariadb-server-10.0.lintian-overrides index ea67ed9..4ed31b2 100644 --- a/debian/mariadb-server-10.0.lintian-overrides +++ b/debian/mariadb-server-10.0.lintian-overrides @@ -1,5 +1,13 @@ -mariadb-server-10.0: command-with-path-in-maintainer-script postinst -mariadb-server-10.0: possible-bashism-in-maintainer-script postinst:81 'p{("a".."z","A".."Z",0..9)[int(rand(62))]}' -mariadb-server-10.0: possible-bashism-in-maintainer-script preinst:33 '${cmd/ */}' -mariadb-server-10.0: statically-linked-binary ./usr/bin/mysql_tzinfo_to_sql -mariadb-server-10.0: statically-linked-binary ./usr/sbin/mysqld +# OK, embedded has same source +mariadb-server-10.0: embedded-library usr/bin/mysqlbinlog: libmysqlclient # # MDEV-290 # +# ash's buildin has no "-e" so use /bin/echo +mariadb-server-10.0: command-with-path-in-maintainer-script postinst:156 /bin/echo +mariadb-server-10.0: command-with-path-in-maintainer-script postinst:166 /bin/echo +mariadb-server-10.0: command-with-path-in-maintainer-script postinst:179 /bin/echo # # better not use echo -e and remove overrides # +# OK, path /usr/sbin/invoke-rc.d is only used in check, executes are run without the path +mariadb-server-10.0: command-with-path-in-maintainer-script postinst:17 /usr/sbin/invoke-rc.d +mariadb-server-10.0: command-with-path-in-maintainer-script postrm:15 /usr/sbin/invoke-rc.d +mariadb-server-10.0: command-with-path-in-maintainer-script preinst:28 /usr/sbin/invoke-rc.d # # the page https://lintian.debian.org/tags/command-with-path-in-maintainer-script.html # says "If the path is required to test a program for existence, one of the # suggested workarounds in the developer's reference can be used. See # particularly the function pathfind() in devref." # +# False positive: unfortified calls have already been fully validated at compile-time +# See full research at https://mariadb.atlassian.net/browse/MDEV-8377 +mariadb-server-10.0: hardening-no-fortify-functions usr/lib/mysql/plugin/auth_pam.so diff --git a/debian/mariadb-server-10.0.manpages b/debian/mariadb-server-10.0.manpages new file mode 100644 index 0000000..ae9ebac --- /dev/null +++ b/debian/mariadb-server-10.0.manpages @@ -0,0 +1,27 @@ +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/mysql_upgrade.1 +debian/tmp/usr/share/man/man1/mysql_zap.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.0.mysql-server.logrotate b/debian/mariadb-server-10.0.mysql-server.logrotate index 0f0de51..4d4914d 100644 --- a/debian/mariadb-server-10.0.mysql-server.logrotate +++ b/debian/mariadb-server-10.0.mysql-server.logrotate @@ -2,7 +2,7 @@ # 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/mysql-slow.log { +/var/log/mysql/mysql.log /var/log/mysql/mysql-slow.log /var/log/mysql/error.log { daily rotate 7 missingok @@ -15,7 +15,7 @@ # If this fails, check debian.conf! MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf" if [ -z "`$MYADMIN ping 2>/dev/null`" ]; then - # Really no mysqld or rather a missing debian-sys-maint user? + # Really no mysqld or in incorrect authentication in /etc/mysql/debian.cnf user? # If this occurs and is not a error please report a bug. if ps cax | grep -q mysqld; then exit 1 diff --git a/debian/mariadb-server-10.0.mysql.init b/debian/mariadb-server-10.0.mysql.init index 46911aa..750613b 100644 --- a/debian/mariadb-server-10.0.mysql.init +++ b/debian/mariadb-server-10.0.mysql.init @@ -22,7 +22,7 @@ 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 overriden and "-s" adds output to stderr @@ -94,6 +94,7 @@ mysqld_status () { # case "${1:-''}" in + 'start') sanity_checks; # Start daemon @@ -106,9 +107,8 @@ case "${1:-''}" in 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 & + /usr/bin/mysqld_safe "${@:2}" 2>&1 >/dev/null | $ERR_LOGGER & - # 6s was reported in #352070 to be too few when using ndbcluster for i in $(seq 1 "${MYSQLD_STARTUP_TIMEOUT:-30}"); do sleep 1 if mysqld_status check_alive nowarn ; then break; fi @@ -118,7 +118,9 @@ case "${1:-''}" in log_end_msg 0 # Now start mysqlcheck or whatever the admin wants. output=$(/etc/mysql/debian-start) - [ -n "$output" ] && log_action_msg "$output" + if [ -n "$output" ]; then + log_action_msg "$output" + fi else log_end_msg 1 log_failure_msg "Please take a look at the syslog" @@ -161,7 +163,8 @@ case "${1:-''}" in 'restart') set +e; $SELF stop; set -e - $SELF start + shift + $SELF start "${@}" ;; 'reload'|'force-reload') @@ -184,4 +187,3 @@ case "${1:-''}" in exit 1 ;; esac - diff --git a/debian/mariadb-server-10.0.postinst b/debian/mariadb-server-10.0.postinst new file mode 100755 index 0000000..3642dd1 --- /dev/null +++ b/debian/mariadb-server-10.0.postinst @@ -0,0 +1,226 @@ +#!/bin/bash -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 } + +export PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin + +# This command can be used as pipe to syslog. With "-s" it also logs to stderr. +ERR_LOGGER="logger -p daemon.err -t mysqld_safe -i" +# This will make an error in a logged command immediately apparent by aborting +# the install, rather than failing silently and leaving a broken install. +set -o pipefail + +invoke() { + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d mysql $1 + else + /etc/init.d/mysql $1 + fi +} + +MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --disable-log-bin --skip-grant-tables --default-storage-engine=myisam --plugin-load-add=auth_socket" + +# This function resets the root@localhost user password and enable the +# usage of the unix_socket plugin for it. +set_mysql_rootpw() { + + tfile="$(mktemp)" + if [ ! -f "$tfile" ]; then + return 1 + fi + + # - The mysqld statement is like that in mysql_install_db because the + # server is not already running. This has some implications: + # - GRANT is not possible with --skip-grant-tables and "INSERT + # (user,host..) VALUES" is not --ansi compliant but will have to do. + + # The reset_root statement is used to verify that the unix_socket plugin + # is active before resetting the root@localhost password ; if the plugin + # is not active, it will fail with "ERROR 1065 (42000): Query was empty" + + # purge off the root@127.0.0.1 / root@::1 entries created by + # mysql_install_db and double check they have no authention + + # This avoids us having to call "test" or "[" on $rootpw + cat << EOF > $tfile +SET sql_log_bin=0; +SET @reset_root=IF( (SELECT 1 FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME='unix_socket' AND PLUGIN_STATUS='ACTIVE' AND PLUGIN_TYPE='AUTHENTICATION' AND PLUGIN_LIBRARY LIKE CONCAT('auth_socket','%') )=1, "UPDATE mysql.user SET Password='', Plugin='unix_socket' WHERE User='root' AND Host='localhost'", ''); +PREPARE reset_root FROM @reset_root; +EXECUTE reset_root; +DELETE FROM mysql.user WHERE User='root' AND Host!='localhost' AND Password='' AND Plugin=''; +EOF + $MYSQL_BOOTSTRAP <$tfile + retval=$? + rm -f "$tfile" + 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_statedir=/usr/share/mysql + mysql_datadir=/var/lib/mysql + mysql_logdir=/var/log/mysql + mysql_rundir=/var/run/mysqld + mysql_cfgdir=/etc/mysql + mysql_upgradedir=/var/lib/mysql-upgrade # # mysql_upgradedir doesn't seem to be used, so it can be removed # together with /var/lib/mysql-upgrade # + + # Ensure the existence and right permissions for the database and + # log files. + 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_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_statedir + chown -R mysql $mysql_datadir + chown -R mysql:adm $mysql_logdir + chmod 2750 $mysql_logdir + set -e + + # This is important to avoid dataloss when there is a removed + # mysql-server version from Woody lying around which used the same + # data directory and then somewhen gets purged by the admin. + db_set 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.0.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 + + + # recreate the credentials file if not present or with debian-sys-maint + # still there + dc=$mysql_cfgdir/debian.cnf; + set +e + grep -sq "^\s*user\s*=\s*debian-sys-maint\s*$" "$dc" # # for the sake of speed, I'll skip all unix_socket/debian-sys-maint # changes in this file. I'll do it separately, later. # + ret=$? + set -e + if [ $ret -ne 1 ]; then + if [ ! -d "$mysql_cfgdir" ]; then + install -o 0 -g 0 -m 0755 -d $mysql_cfgdir + fi + if [ -e "$dc" ]; then + oldconf=`mktemp --tmpdir=$mysql_cfgdir -t debian_old_config.XXXXXX` + cp $dc $oldconf + else + oldconf='' + fi + umask 066 + cat /dev/null > $dc + umask 022 + echo "# Automatically generated for Debian scripts. DO NOT TOUCH!" >>$dc + echo "[client]" >>$dc + echo "host = localhost" >>$dc + echo "user = root" >>$dc + echo "password = " >>$dc + echo "socket = $mysql_rundir/mysqld.sock" >>$dc + echo "[mysql_upgrade]" >>$dc + echo "host = localhost" >>$dc + echo "user = root" >>$dc + echo "password = " >>$dc + echo "socket = $mysql_rundir/mysqld.sock" >>$dc + echo "basedir = /usr" >>$dc + else + oldconf='' + fi + # If this dir chmod go+w then the admin did it. But this file should not. + chown 0:0 $dc + chmod 0600 $dc + + # Update privilege tables + password_column_fix_query=`/bin/echo -e \ + "USE mysql;\n" \ + "SET sql_log_bin=0;\n" \ + "ALTER TABLE user CHANGE Password Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL;"` + + # Upgrade password column format before the root password gets set. + # NOTE: Lines like this apparently really need to be formatted this way + # for mysqld to process the correclty (;-delimiter, newlines etc) + echo "$password_column_fix_query" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER + + # Replace old maintenance user with auth_socket usage if migrating + replace_query=`/bin/echo -e \ + "SET sql_mode='', sql_log_bin=0;\n" \ + "DELETE FROM mysql.user WHERE user='debian-sys-maint' AND host='localhost';"` + # WARNING: This line might yield "The MariaDB server is running with + # the --skip-grant-tables option so it cannot execute this statement" + + # Some plugins should installed per default. The query sequence is supposed + # to be aborted if the CREATE TABLE fails due to an already existent table in which case the + # admin might already have chosen to remove one or more plugins. Newlines are necessary. + install_plugins=`/bin/echo -e \ + "USE mysql;\n" \ + "SET sql_log_bin=0;\n" \ + "CREATE TABLE IF NOT EXISTS plugin (name char(64) COLLATE utf8_bin NOT NULL DEFAULT '', " \ + " dl char(128) COLLATE utf8_bin NOT NULL DEFAULT '', " \ + " PRIMARY KEY (name)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='MySQL plugins';\n" \ + "INSTALL PLUGIN unix_socket SONAME 'auth_socket';\n"` + + # Install plugins and ignore if already there + set +e + echo "$install_plugins" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER + set -e + + if [ ! set_mysql_rootpw ]; then + password_error="yes" + # restore old config file if exists + # run only if $oldconf is set and is not empty + if [ ! -z $oldconf ]; then mv $oldconf $dc; fi + else + if [ ! -z $oldconf ]; then rm -f $oldconf; fi + # purge debian-sys-maint user + set +e + echo "$replace_query" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER + set -e + fi + ;; + + abort-upgrade|abort-remove|abort-configure) + ;; + + *) + echo "postinst called with unknown argument '$1'" 1>&2 + exit 1 + ;; +esac + +# here we check to see if we can connect as root without a password +# this should catch upgrades from previous versions where the root +# password wasn't set. if there is a password, or if the connection +# fails for any other reason, nothing happens. +if [ "$1" = "configure" ]; then + + if [ "$password_error" = "yes" ]; then + db_input high mariadb-server/error_setting_password || true + db_go + fi + +fi + +db_stop # in case invoke failes + +#DEBHELPER# + +exit 0 diff --git a/debian/dist/Debian/mariadb-server-10.0.postrm b/debian/mariadb-server-10.0.postrm similarity index 67% rename from debian/dist/Debian/mariadb-server-10.0.postrm rename to debian/mariadb-server-10.0.postrm index 469b162..1f7034c 100644 --- a/debian/dist/Debian/mariadb-server-10.0.postrm +++ b/debian/mariadb-server-10.0.postrm @@ -1,9 +1,6 @@ #!/bin/bash -e -# It is possible that Debconf has already been removed, too. # # oh, so it is *not* possible, after all? # -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 } @@ -52,32 +49,20 @@ if [ "$1" = "purge" -a ! \( -x /usr/sbin/mysqld -o -L /usr/sbin/mysqld \) ]; the rm -f /var/log/mysql.{log,err}{,.0,.[1234567].gz} rm -rf /var/log/mysql - db_input high mysql-server-5.1/postrm_remove_databases || true + db_input high mariadb-server-10.0/postrm_remove_databases || true db_go || true - db_get mysql-server-5.1/postrm_remove_databases || true + db_get mariadb-server-10.0/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 + 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 -# 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.0.preinst b/debian/mariadb-server-10.0.preinst index 7ad46c6..4f3aabd 100644 --- a/debian/mariadb-server-10.0.preinst +++ b/debian/mariadb-server-10.0.preinst @@ -48,17 +48,24 @@ stop_server() { this_version=10.0 -# Abort if an NDB cluster is in use. -if egrep -qi -r '^[^#]*ndb.connectstring|^[[:space:]]*\[[[:space:]]*ndb_mgmd' /etc/mysql/; then - db_fset mysql-server/no_upgrade_when_using_ndb seen false || true - db_input high mysql-server/no_upgrade_when_using_ndb || true +# Show upgrade warning if old data exists +# Designed for scenarios where users upgrade form MySQL 5.5 or 5.6 or MariaDB 5.5 +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 + db_fset mariadb-server/oneway_migration seen false || true + db_input high mariadb-server/oneway_migration || true db_go + db_get mariadb-server/oneway_migration || true + if [ "$RET" = "false" ]; then + echo "Aborting MariaDB installation." 1>&2 # # Hmm. So this debian-xx.flag is not a debian thing, but # something manually coded into the pre/post inst scripts? # db_stop exit 1 -fi - -# Abort if skip-bdb option is enabled, required for 5.0 -> 5.1 upgrades. -#TODO + fi + fi +done +# Notice the uses of "|| true" to prevent the script from dying +# For details see man page debconf-devel(7) # Safe the user from stupidities. show_downgrade_warning=0 @@ -71,12 +78,11 @@ for i in `ls $DATADIR/debian-*.flag 2>/dev/null`; do 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_input critical 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 @@ -98,7 +104,7 @@ fi # # Now we have to ensure the following state: -# /etc/passwd: mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false +# /etc/passwd: mysql:x:100:101:MySQL Server:/nonexistent:/bin/false # /etc/group: mysql:x:101: # # Sadly there could any state be present on the system so we have to @@ -119,7 +125,8 @@ if ! getent passwd mysql >/dev/null; then --system \ --disabled-login \ --ingroup mysql \ - --home $DATADIR \ + --no-create-home \ + --home /nonexistent \ --gecos "MySQL Server" \ --shell /bin/false \ mysql >/dev/null @@ -134,7 +141,7 @@ for dir in DATADIR LOGDIR; do checkdir=`eval echo "$"$dir` if [ -L "$checkdir" ]; then mkdir -p "$UPGRADEDIR" - cp -d "$checkdir" "$UPGRADEDIR/$dir.link" + cp -dT "$checkdir" "$UPGRADEDIR/$dir.link" fi done @@ -163,17 +170,6 @@ 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 < ''' +from __future__ import print_function, unicode_literals # # where all changes in this file come from? # import os, os.path from apport.hookutils import * @@ -29,24 +30,25 @@ def add_info(report): report[key] += line + '\n' except IndexError: continue - key = 'Logs' + path_to_key('/var/log/kern.log') + if os.path.exists('/var/log/mysql/error.log'): + key = 'Logs' + path_to_key('/var/log/mysql/error.log') report[key] = "" - for line in read_file('/var/log/kern.log').split('\n'): - try: - if '/usr/sbin/mysqld' in string.join(line.split()[4:]): + for line in read_file('/var/log/mysql/error.log').split('\n'): report[key] += line + '\n' - except IndexError: - continue - _add_my_conf_files(report, '/etc/mysql/my.cnf') + attach_mac_events(report, '/usr/sbin/mysqld') + attach_file(report,'/etc/apparmor.d/usr.sbin.mysqld') + _add_my_conf_files(report, '/etc/mysql/mariadb.cnf') for f in os.listdir('/etc/mysql/conf.d'): _add_my_conf_files(report, os.path.join('/etc/mysql/conf.d', f)) + for f in os.listdir('/etc/mysql/mariadb.conf.d'): + _add_my_conf_files(report, os.path.join('/etc/mysql/mariadb.conf.d', f)) try: - report['MySQLVarLibDirListing'] = unicode(os.listdir('/var/lib/mysql')) + report['MySQLVarLibDirListing'] = str(os.listdir('/var/lib/mysql')) except OSError: - report['MySQLVarLibDirListing'] = unicode(False) + report['MySQLVarLibDirListing'] = str(False) if __name__ == '__main__': report = {} add_info(report) for key in report: - print '%s: %s' % (key, report[key].split('\n', 1)[0]) + print('%s: %s' % (key, report[key].split('\n', 1)[0])) diff --git a/debian/mariadb-server-10.0.templates b/debian/mariadb-server-10.0.templates index 13943da..5b3eca2 100644 --- a/debian/mariadb-server-10.0.templates +++ b/debian/mariadb-server-10.0.templates @@ -19,7 +19,7 @@ _Description: Really proceed with downgrade? There is no guarantee that the version you're currently installing will be able to use the current databases. -Template: mysql-server-5.1/nis_warning +Template: mariadb-server-10.0/nis_warning # # can we rename these templates not to have a version number in them? # it's kind of a annoying to rename them all in every major version # 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.0/postrm_remove_databases Type: boolean Default: false _Description: Remove all MariaDB databases? @@ -44,26 +44,7 @@ _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: - While not mandatory, it is highly recommended that you set a password - for the MariaDB administrative "root" user. - . - If this field is left blank, the password will not be changed. - -Template: mysql-server/root_password_again -Type: password -_Description: Repeat password for the MariaDB "root" user: - -Template: mysql-server/error_setting_password +Template: mariadb-server/error_setting_password Type: error _Description: Unable to set password for the MariaDB "root" user An error occurred while setting the password for the MariaDB @@ -76,14 +57,13 @@ _Description: Unable to set password for the MariaDB "root" user Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for more information. -Template: mysql-server/password_mismatch -Type: error -_Description: Password input error - The two passwords you entered were not the same. Please try again. - -Template: mysql-server/no_upgrade_when_using_ndb -Type: error -_Description: NDB Cluster seems to be in use - MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new - mysql-cluster package and remove all lines starting with "ndb" from - all config files below /etc/mysql/. +Template: mariadb-server/oneway_migration +Type: boolean +Default: true +_Description: Really migrate to MariaDB? + MariaDB is a drop-in replacement for MySQL. It will use your current + configuration file (my.cnf) and current databases. + . + Note that MariaDB has some enhanced features, which do not exist in MySQL + and thus migration back to MySQL might not always work, at least not as + automatically as migrating from MySQL to MariaDB. diff --git a/debian/mariadb-server-core-10.0.files b/debian/mariadb-server-core-10.0.install similarity index 95% rename from debian/mariadb-server-core-10.0.files rename to debian/mariadb-server-core-10.0.install index 5c60ca5..d718bd9 100644 --- a/debian/mariadb-server-core-10.0.files +++ b/debian/mariadb-server-core-10.0.install @@ -1,5 +1,5 @@ +usr/bin/innochecksum # # should be part of the source, not packaging # usr/sbin/mysqld -usr/share/man/man8/mysqld.8 usr/share/mysql/charsets usr/share/mysql/czech usr/share/mysql/danish diff --git a/debian/mariadb-server-core-10.0.lintian-overrides b/debian/mariadb-server-core-10.0.lintian-overrides new file mode 100644 index 0000000..8494aa0 --- /dev/null +++ b/debian/mariadb-server-core-10.0.lintian-overrides @@ -0,0 +1,2 @@ +# OK, embedded has same source +mariadb-server-core-10.0: embedded-library usr/sbin/mysqld: libmysqlclient diff --git a/debian/mariadb-server-core-10.0.manpages b/debian/mariadb-server-core-10.0.manpages new file mode 100644 index 0000000..3a5b9a1 --- /dev/null +++ b/debian/mariadb-server-core-10.0.manpages @@ -0,0 +1,2 @@ +debian/tmp/usr/share/man/man8/mysqld.8 +debian/tmp/usr/share/man/man1/innochecksum.1 diff --git a/debian/mariadb-test-10.0.dirs b/debian/mariadb-test-10.0.dirs deleted file mode 100644 index f45bf43..0000000 --- a/debian/mariadb-test-10.0.dirs +++ /dev/null @@ -1,95 +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/rpl_ndb -usr/share/mysql/mysql-test/suite/rpl_ndb/t -usr/share/mysql/mysql-test/suite/rpl_ndb/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/ndb -usr/share/mysql/mysql-test/suite/ndb/t -usr/share/mysql/mysql-test/suite/ndb/r -usr/share/mysql/mysql-test/suite/maria -usr/share/mysql/mysql-test/suite/maria/t -usr/share/mysql/mysql-test/suite/maria/r -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/ndb_team -usr/share/mysql/mysql-test/suite/ndb_team/t -usr/share/mysql/mysql-test/suite/ndb_team/r -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/ndb_backup50 -usr/share/mysql/mysql-test/std_data/parts -usr/share/mysql/mysql-test/std_data/ndb_backup51_data_le -usr/share/mysql/mysql-test/std_data/ndb_backup51_data_be -usr/share/mysql/mysql-test/std_data/ndb_backup51 -usr/share/mysql/mysql-test/std_data/funcs_1 diff --git a/debian/mariadb-test-10.0.files b/debian/mariadb-test-10.0.install similarity index 79% rename from debian/mariadb-test-10.0.files rename to debian/mariadb-test-10.0.install index 767f040..d91257e 100644 --- a/debian/mariadb-test-10.0.files +++ b/debian/mariadb-test-10.0.install @@ -1,21 +1,17 @@ usr/bin/mysql_client_test usr/bin/mysql_client_test_embedded usr/bin/mysqltest -usr/bin/mysqltest_embedded +usr/bin/mysqltest_embedded -usr/lib/mysql/plugin/adt_null.so +usr/lib/mysql/plugin/adt_null.so -usr/lib/mysql/plugin/auth_0x0100.so +usr/lib/mysql/plugin/auth_0x0100.so -usr/lib/mysql/plugin/auth_test_plugin.so +usr/lib/mysql/plugin/auth_test_plugin.so -usr/lib/mysql/plugin/daemon_example.ini +usr/lib/mysql/plugin/daemon_example.ini -usr/lib/mysql/plugin/dialog_examples.so +usr/lib/mysql/plugin/dialog_examples.so -usr/lib/mysql/plugin/ha_example.so +usr/lib/mysql/plugin/ha_example.so -usr/lib/mysql/plugin/ha_test_sql_discovery.so +usr/lib/mysql/plugin/ha_test_sql_discovery.so -usr/lib/mysql/plugin/libdaemon_example.so +usr/lib/mysql/plugin/libdaemon_example.so -usr/lib/mysql/plugin/mypluglib.so +usr/lib/mysql/plugin/mypluglib.so -usr/lib/mysql/plugin/qa_auth_client.so +usr/lib/mysql/plugin/qa_auth_client.so -usr/lib/mysql/plugin/qa_auth_interface.so +usr/lib/mysql/plugin/qa_auth_interface.so -usr/lib/mysql/plugin/qa_auth_server.so +usr/lib/mysql/plugin/qa_auth_server.so -usr/share/man/man1/mysql_client_test.1 -usr/share/man/man1/mysql_client_test_embedded.1 -usr/share/man/man1/mysqltest.1 -usr/share/man/man1/mysqltest_embedded.1 usr/share/mysql/mysql-test diff --git a/debian/mariadb-test-10.0.lintian-overrides b/debian/mariadb-test-10.0.lintian-overrides new file mode 100644 index 0000000..ce27cc8 --- /dev/null +++ b/debian/mariadb-test-10.0.lintian-overrides @@ -0,0 +1,22 @@ +# OK, this file is part of test suite and only used for a test +mariadb-test-10.0: arch-dependent-file-in-usr-share usr/share/mysql/mysql-test/lib/My/SafeProcess/my_safe_process +# OK, this file is part of test suite and only used for a test +mariadb-test-10.0: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_myisam.result +mariadb-test-10.0: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_10.result +mariadb-test-10.0: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_7_innodb.result +mariadb-test-10.0: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_innodb.result +mariadb-test-10.0: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_6.result +mariadb-test-10.0: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_3.result +mariadb-test-10.0: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa.result +mariadb-test-10.0: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_myisam_innodb.result +mariadb-test-10.0: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_11.result +mariadb-test-10.0: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_5_innodb.result +mariadb-test-10.0: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_4_myisam.result +mariadb-test-10.0: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_7_myisam.result +mariadb-test-10.0: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_14.result +mariadb-test-10.0: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_8_myisam.result +mariadb-test-10.0: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_8_innodb.result +mariadb-test-10.0: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_5_myisam.result +mariadb-test-10.0: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_4_innodb.result +mariadb-test-10.0: executable-not-elf-or-script usr/share/mysql/mysql-test/plugin/oqgraph/oqgraph/maintainer-general-record.sh +mariadb-test-10.0: executable-not-elf-or-script usr/share/mysql/mysql-test/lib/generate-ssl-certs.sh # # no need to override, better to fix file privileges instead # and add #!/bin/sh to shell scripts # diff --git a/debian/mariadb-test-10.0.manpages b/debian/mariadb-test-10.0.manpages new file mode 100644 index 0000000..33ce871 --- /dev/null +++ b/debian/mariadb-test-10.0.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.dirs b/debian/mysql-common.dirs deleted file mode 100644 index a5a88ed..0000000 --- a/debian/mysql-common.dirs +++ /dev/null @@ -1 +0,0 @@ -etc/mysql/conf.d/ diff --git a/debian/mysql-common.files b/debian/mysql-common.files deleted file mode 100644 index d167569..0000000 --- a/debian/mysql-common.files +++ /dev/null @@ -1,3 +0,0 @@ -etc/mysql/my.cnf -usr/share/mysql-common/internal-use-only -usr/share/lintian/overrides/mysql-common diff --git a/debian/mysql-common.lintian-overrides b/debian/mysql-common.lintian-overrides deleted file mode 100644 index c6c60cc..0000000 --- a/debian/mysql-common.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -script-not-executable ./usr/share/mysql-common/internal-use-only/_etc_init.d_mysql -script-not-executable ./usr/share/mysql-common/internal-use-only/_etc_mysql_debian-start diff --git a/debian/mysql-common.postrm b/debian/mysql-common.postrm deleted file mode 100644 index 0d3f8ae..0000000 --- a/debian/mysql-common.postrm +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -e - -if [ "$1" = "purge" ]; then - rmdir /etc/mysql 2>/dev/null || true -fi - -#DEBHELPER# diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index 77c159a..0000000 --- a/debian/patches/00list +++ /dev/null # # is this file not needed at all? # @@ -1,11 +0,0 @@ -# 01_MAKEFILES__Docs_Images_Makefile.in.dpatch -# 01_MAKEFILES__Docs_Makefile.in.dpatch -# 02_no_builtin_ndbcluster_plugin.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 ca138af..0000000 --- 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 -## -## 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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 6440697..0000000 --- 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 -## -## 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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/02_no_builtin_ndbcluster_plugin.dpatch b/debian/patches/02_no_builtin_ndbcluster_plugin.dpatch deleted file mode 100644 index dc881cc..0000000 --- a/debian/patches/02_no_builtin_ndbcluster_plugin.dpatch +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_no_builtin_ndbcluster_plugin.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: As we completely disabled ndbcluster - -@DPATCH@ - ---- old/sql/sql_builtin.cc -+++ new/sql/sql_builtin.cc -@@ -22,6 +22,6 @@ - - struct st_mysql_plugin *mysqld_builtins[]= - { -- builtin_binlog_plugin, builtin_partition_plugin, builtin_csv_plugin, builtin_heap_plugin, builtin_myisam_plugin, builtin_myisammrg_plugin, builtin_ndbcluster_plugin,(struct st_mysql_plugin *)0 -+ builtin_binlog_plugin, builtin_partition_plugin, builtin_csv_plugin, builtin_heap_plugin, builtin_myisam_plugin, builtin_myisammrg_plugin, (struct st_mysql_plugin *)0 - }; - diff --git a/debian/patches/21_init__openquery_configtest.dpatch b/debian/patches/21_init__openquery_configtest.dpatch deleted file mode 100644 index c76e98d..0000000 --- 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 -## -## 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/60_zlib_innodb_workaround.dpatch b/debian/patches/60_zlib_innodb_workaround.dpatch deleted file mode 100644 index e8a496a..0000000 --- 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 -## -## 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/patches/build_reproducibly.patch b/debian/patches/build_reproducibly.patch new file mode 100644 index 0000000..0b6ca48 --- /dev/null +++ b/debian/patches/build_reproducibly.patch @@ -0,0 +1,21 @@ +Description: Remove variable output from INFO_BIN to satisfy Debian reproducible builds requirements. For details see https://reproducible.debian.net/dbd/unstable/amd64/mariadb-10.0_10.0.19-1.debbindiff.html # # just don't install INFO_BIN at all # +Author: Otto Kekäläinen +Last-Update: 2015-06-21 + +--- a/cmake/info_macros.cmake.in ++++ b/cmake/info_macros.cmake.in +@@ -118,13 +118,12 @@ MACRO(CREATE_INFO_BIN) + SET(TMP_DATE "(no date command known for this platform)") + ENDIF() + SITE_NAME(HOSTNAME) +- FILE(APPEND ${INFO_BIN} "Build was run at ${TMP_DATE} on host '${HOSTNAME}'\n\n") + + # According to the cmake docs, these variables should always be set. + # However, they are empty in my tests, using cmake 2.6.4 on Linux, various Unix, and Windows. + # Still, include this code, so we will profit if a build environment does provide that info. + IF(CMAKE_HOST_SYSTEM) +- FILE(APPEND ${INFO_BIN} "Build was done on ${CMAKE_HOST_SYSTEM} using ${CMAKE_HOST_SYSTEM_PROCESSOR}\n") ++ FILE(APPEND ${INFO_BIN} "Build was using ${CMAKE_HOST_SYSTEM_PROCESSOR}\n") + ENDIF() + IF(CMAKE_CROSSCOMPILING) + FILE(APPEND ${INFO_BIN} "Build was done for ${CMAKE_SYSTEM} using ${CMAKE_SYSTEM_PROCESSOR}\n") diff --git a/debian/po/ar.po b/debian/po/ar.po index 1507fcc..6efbb93 100644 --- a/debian/po/ar.po +++ b/debian/po/ar.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: templates\n" "Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"POT-Creation-Date: 2015-01-31 14:00+0200\n" "PO-Revision-Date: 2007-05-01 13:04+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" @@ -111,63 +111,15 @@ msgstr "" "إن كنت تقوم بإزالة حزمة MariaDB كي تقوم لاحقاً بتثبيت نسخة أحدث أو إن كانت " "حزمة mariadb-server مختلفة تستخدمها، فيجب إبقاء البيانات." -#. Type: boolean -#. Description -#: ../mariadb-server-10.0.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "تشغيل خادم MariaDB عند الإقلاع؟" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.0.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.0.templates:6001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "كلمة المرور الجديدة لمستخد \"root\" الخاص بـMariaDB:" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"مع أنه ليس إجبارياً، ولكن من المستحسن أن تقوم بتعيين كلمة مرور خاصة بمستخدم " -"MariaDB الإداري \"root\"." - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -#, fuzzy -#| msgid "If that field is left blank, the password will not be changed." -msgid "If this field is left blank, the password will not be changed." -msgstr "إن ترك الحقل فارغاً، فلن يتم تغيير كلمة المرور." - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:7001 -#, fuzzy -#| msgid "New password for the MariaDB \"root\" user:" -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "كلمة المرور الجديدة لمستخد \"root\" الخاص بـMariaDB:" - #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "تعذر تعيين كلمة مرور للمستخدم \"root\" الخاص بـMariaDB." #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 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 +131,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 #, fuzzy #| msgid "" #| "You should check the account's password after tha package installation." @@ -188,7 +140,7 @@ msgstr "يجب عليك التحقق من كلمة مرور الحساب عقب #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 #, fuzzy #| msgid "" #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " @@ -197,56 +149,48 @@ msgid "" "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " "more information." msgstr "" -"الرجاء قراءة الملف /usr/share/doc/mariadb-server-10.0/README.Debian للمزيد من " -"المعلومات." +"الرجاء قراءة الملف /usr/share/doc/mariadb-server-10.0/README.Debian للمزيد " +"من المعلومات." -#. Type: error -#. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "Password input error" -msgstr "" - -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "The two passwords you entered were not the same. Please try again." +#: ../mariadb-server-10.0.templates:6001 +msgid "Really migrate to MariaDB?" msgstr "" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" +#: ../mariadb-server-10.0.templates:6001 +msgid "" +"MariaDB is a drop-in replacement for MySQL. It will use your current " +"configuration file (my.cnf) and current databases." msgstr "" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 +#: ../mariadb-server-10.0.templates:6001 msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." +"Note that MariaDB has some enhanced features, which do not exist in MySQL " +"and thus migration back to MySQL might not always work, at least not as " +"automatically as migrating from MySQL to MariaDB." msgstr "" -#~ msgid "" -#~ "To use MariaDB, the following entries for users and groups should be " -#~ "added to the system:" -#~ msgstr "" -#~ "كي تستخدم MariaDB، يجب إضافة المُدخلات التالية الخاصة بالمستخدمين " -#~ "والمجموعات إلى النظام:" +#~ msgid "New password for the MariaDB \"root\" user:" +#~ msgstr "كلمة المرور الجديدة لمستخد \"root\" الخاص بـMariaDB:" #~ msgid "" -#~ "Support MySQL connections from hosts running Debian \"sarge\" or older?" +#~ "While not mandatory, it is highly recommended that you set a password for " +#~ "the MariaDB administrative \"root\" user." #~ msgstr "" -#~ "هل تريد دعم اتصالات MySQL من الأجهزة التي تعمل على ديبيان \"sarge\" أو " -#~ "أقدم؟" +#~ "مع أنه ليس إجبارياً، ولكن من المستحسن أن تقوم بتعيين كلمة مرور خاصة " +#~ "بمستخدم MariaDB الإداري \"root\"." -#~ msgid "" -#~ "In old versions of MySQL clients on Debian, passwords were not stored " -#~ "securely. This has been improved since then, however clients (such as " -#~ "PHP) from hosts running Debian 3.1 Sarge will not be able to connect to " -#~ "recent accounts or accounts whose password have been changed." -#~ msgstr "" -#~ "في إصدارات عملاء MySQL القديمة من ديبيان، لم تكن كلمات المرور تحفظ بشكل " -#~ "آمن. ولقد حل هذه المشكلة بعدها، غير أن العملاء (مثل PHP) المتصلين من " -#~ "أجهزة تعمل على ديبيان Sarge 3.1 لن يكونوا قادرين على الاتصال باستخدام " -#~ "الحسابات الحديثة أو الحسابات التي تم تغيير كلمة مرورها." +#, fuzzy +#~| msgid "If that field is left blank, the password will not be changed." +#~ msgid "If this field is left blank, the password will not be changed." +#~ msgstr "إن ترك الحقل فارغاً، فلن يتم تغيير كلمة المرور." + +#, fuzzy +#~| msgid "New password for the MariaDB \"root\" user:" +#~ msgid "Repeat password for the MariaDB \"root\" user:" +#~ msgstr "كلمة المرور الجديدة لمستخد \"root\" الخاص بـMariaDB:" diff --git a/debian/po/ca.po b/debian/po/ca.po index 7ca3129..6515daf 100644 --- a/debian/po/ca.po +++ b/debian/po/ca.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-4.1\n" "Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"POT-Creation-Date: 2015-01-31 14:00+0200\n" "PO-Revision-Date: 2004-01-31 19:20GMT\n" "Last-Translator: Aleix Badia i Bosch \n" "Language-Team: Debian L10n Catalan \n" @@ -90,61 +90,15 @@ msgid "" "the data should be kept." msgstr "" -#. Type: boolean -#. Description -#: ../mariadb-server-10.0.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.0.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.0.templates:6001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -msgid "If this field is left blank, the password will not be changed." -msgstr "" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:7001 -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "" - #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 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,190 +107,37 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "You should check the account's password after the package installation." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "" "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " "more information." msgstr "" -#. Type: error -#. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "Password input error" -msgstr "" - -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "The two passwords you entered were not the same. Please try again." +#: ../mariadb-server-10.0.templates:6001 +msgid "Really migrate to MariaDB?" msgstr "" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" +#: ../mariadb-server-10.0.templates:6001 +msgid "" +"MariaDB is a drop-in replacement for MySQL. It will use your current " +"configuration file (my.cnf) and current databases." msgstr "" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 +#: ../mariadb-server-10.0.templates:6001 msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." +"Note that MariaDB has some enhanced features, which do not exist in MySQL " +"and thus migration back to MySQL might not always work, at least not as " +"automatically as migrating from MySQL to MariaDB." msgstr "" - -#, 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 " -#~ "permissions (the uid/gid may be different)." -#~ msgstr "" -#~ "Per utilitzar la base de dades de MySQL heu d'afegir un usuari i grup " -#~ "equivalent al segent i assegurar-vos que el directori /var/lib/mysql " -#~ "tingui els permisos correctes." - -#~ msgid "" -#~ "/etc/passwd: mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false" -#~ msgstr "" -#~ "/etc/passwd: mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false" - -#~ msgid "/etc/group: mysql:x:101:" -#~ msgstr "/etc/group: mysql:x:101:" - -#~ msgid "/var/lib/mysql: drwxr-xr-x mysql mysql" -#~ msgstr "/var/lib/mysql: drwxr-xr-x mysql mysql" - -#, fuzzy -#~ msgid "Please also read http://www.mysql.com/doc/en/Upgrade.html" -#~ msgstr "" -#~ "Feu una ullada al document: http://www.mysql.com/doc/en/Upgrade.html" - -#, fuzzy -#~ msgid "" -#~ "MySQL will only install if you have a non-numeric hostname that is " -#~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command " -#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 " -#~ "myhostname\"." -#~ msgstr "" -#~ "El MySQL noms s'installa en cas de tenir un nom d'ordinador central que " -#~ "no sigui numric i que es pugui resoldre a travs del fitxer /etc/hosts. " -#~ "Ex. si l'ordre \"hostname\" retorna \"myhostname\", llavors hi ha d'haver " -#~ "una lnia com la segent \"10.0.0.1 myhostname\"." - -#, fuzzy -#~ msgid "" -#~ "A new mysql user \"debian-sys-maint\" will be created. This mysql account " -#~ "is used in the start/stop and cron scripts. Don't delete." -#~ msgstr "" -#~ "Es crea un nou usuari de mysql \"debian-sys-maint\". S'utilitza per les " -#~ "seqncies d'inicialitzaci i aturada del cron, no el suprimiu." - -#, fuzzy -#~ msgid "" -#~ "Please remember to set a PASSWORD for the MySQL root user! If you use a /" -#~ "root/.my.cnf, always write the \"user\" and the \"password\" lines in " -#~ "there, never only the password!" -#~ msgstr "" -#~ "Recordeu posar una contrasenya al superusuari del MySQL. Si utilitzeu un " -#~ "fitxer /root/.my.cnf, escriviu sempre all les lnies \"user\" i " -#~ "\"password\".; mai noms la contrasenya. Per a ms informaci feu una " -#~ "ullada a /usr/share/doc/mysql-server/README.Debian." - -#, fuzzy -#~ msgid "" -#~ "Should I remove all databases below /var/lib/mysql as you are purging the " -#~ "mysql-server package?" -#~ msgstr "" -#~ "Voleu suprimir totes les bases de dades en purgar el paquet mysql-server ?" - -#~ msgid "" -#~ "Networking is disabled by default for security reasons. You can enable it " -#~ "by commenting out the skip-networking option in /etc/mysql/my.cnf." -#~ msgstr "" -#~ "La xarxa est inhabilitada per defecte per a raons de seguretat. La podeu " -#~ "habilitar descomentant l'opci de skip-networking del fitxer /etc/mysql/" -#~ "my.cnf." - -#~ msgid "security and update notice" -#~ msgstr "Avs de seguretat i actualitzaci" - -#~ msgid "Please run mysql_fix_privilege_tables !" -#~ msgstr "Executeu mysql_fix_privilege_tables" - -#~ msgid "" -#~ "I will ensure secure permissions of /var/lib/mysql by replacing GIDs " -#~ "other than root and mysql with mysql." -#~ msgstr "" -#~ "S'asseguren els permisos de seguretat de /var/lib/mysql canviant a mysql " -#~ "tots els GIDs diferents a root i mysql." - -#~ msgid "" -#~ "Instructions how to enable SSL support are in /usr/share/doc/mysql-server/" -#~ msgstr "" -#~ "Per habilitar el suport de SSL podeu seguir les instruccions de /usr/" -#~ "share/doc/mysql-server/" - -#~ msgid "mysql_fix_privileges_tables will be executed" -#~ msgstr "s'executa mysql_fix_privileges_tables" - -#~ msgid "" -#~ "The latest MySQL versions have an enhanced, more fine grained, privilege " -#~ "system. To make use of it, some new fields must be added to the tables " -#~ "in the \"mysql\" database. This is done by the " -#~ "mysql_fix_privilege_tables script during this upgrade regardless of if " -#~ "the server is currently running or not!" -#~ msgstr "" -#~ "Les ltimes versions de MySQL tenen un sistema de privilegis ms " -#~ "elaborat. Per utilitzar-lo cal afegir nous camps a les taules de la base " -#~ "de dades \"mysql\". Aquesta tasca la realitza la seqncia " -#~ "mysql_fix_privilege_tables durant l'actualitzaci independentment de si " -#~ "el servidor s'est executant o no!" - -#~ msgid "" -#~ "This script is not supposed to give any user more rights that he had " -#~ "before, if you encounter such a case, please contact me." -#~ msgstr "" -#~ "Aquesta seqncia no assigna privilegis d'usuari diferents als que ja " -#~ "tenia, en cas que us trobssiu en aquesta situaci, poseu-vos en contacte " -#~ "amb mi." - -#~ msgid "" -#~ "Should I remove everything below /var/lib/mysql when you purge the mysql-" -#~ "server package with the \"dpkg --purge mysql-server\" command (i.e. " -#~ "remove everything including the configuration) somewhen? (default is not)" -#~ msgstr "" -#~ "Voleu suprimir tots els continguts de /var/lib/mysql quan es purgui el " -#~ "paquet mysql-server amb l'ordre \"dpkg --purge mysql-server\". (ex. " -#~ "suprimir-ho tot incls la configuraci) ? (per defecte no)" - -#~ msgid "Make MySQL reachable via network?" -#~ msgstr "Voleu fer accessible el MySQL via xarxa ?" - -#~ msgid "" -#~ "Should MySQL listen on a network reachable TCP port? This is not " -#~ "necessary for use on a single computer and could be a security problem." -#~ msgstr "" -#~ "Voleu que el MySQL escolti a un port TCP accessible des de la xarxa ? " -#~ "Aquesta opci no s imprescindible en ordinadors allats i podria " -#~ "provocar un problema de seguretat." - -#~ msgid "Enable chroot mode?" -#~ msgstr "Permetre el mode chroot ?" - -#~ msgid "" -#~ "MySQL is able to jail itself into the /var/lib/mysql_jail directory so " -#~ "that users cannot modify any files outside this directory. This improves " -#~ "resistence against crackers, too, as they are not able to modify system " -#~ "files." -#~ msgstr "" -#~ "El MySQL es pot executar en una entorn tancat al directori /var/lib/" -#~ "mysql_jail perqu els usuaris no puguin modificar cap fitxer fora del " -#~ "directori.Aquesta opci tamb augmenta la seguretat envers els crackers, " -#~ "jaque no poden modificar els fitxers del sistema." diff --git a/debian/po/cs.po b/debian/po/cs.po index 453bf5f..9453776 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -13,10 +13,10 @@ # msgid "" msgstr "" -"Project-Id-Version: mysql-dfsg-5.1\n" +"Project-Id-Version: mariadb-10.0\n" "Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" -"PO-Revision-Date: 2007-05-01 13:01+0200\n" +"POT-Creation-Date: 2015-01-31 14:00+0200\n" +"PO-Revision-Date: 2014-09-29 08:58+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" "Language: cs\n" @@ -39,15 +39,11 @@ msgstr "V systému existuje soubor /var/lib/mysql/debian-*.flag." #. Type: boolean #. Description #: ../mariadb-server-10.0.templates:2001 -#, fuzzy -#| msgid "" -#| "Such file is an indication that a mariadb-server package with a higher " -#| "version has been installed earlier." msgid "" "Such a file is an indication that a mariadb-server package with a higher " "version has been installed previously." msgstr "" -"To znamená, že již byl nainstalován balík mariadb-server s vyšší verzí." +"To znamená, že již byl dříve nainstalován balík mariadb-server s vyšší verzí." #. Type: boolean #. Description @@ -72,14 +68,12 @@ msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" msgstr "" +"Používání MariaDB pod NIS/YP vyžaduje, aby byl účet mysql uživatele přidán " +"na lokálním systému příkazem:" #. Type: note #. Description #: ../mariadb-server-10.0.templates:3001 -#, fuzzy -#| msgid "" -#| "You should also check the permissions and the owner of the /var/lib/mysql " -#| "directory:" msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -114,63 +108,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.0.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "Spustit MariaDB server při startu systému?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.0.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.0.templates:6001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "Nové heslo MariaDB uživatele \"root\":" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Přestože to není nezbytné, je silně doporučeno nastavit heslo u " -"správcovského MariaDB účtu \"root\"." - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -#, fuzzy -#| msgid "If that field is left blank, the password will not be changed." -msgid "If this field is left blank, the password will not be changed." -msgstr "Ponecháte-li pole prázdné, heslo se nezmění." - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:7001 -#, fuzzy -#| msgid "New password for the MySQL \"root\" user:" -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Nové heslo MariaDB uživatele \"root\":" - #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "Unable to set password for the MariaDB \"root\" user" -msgstr "Nelze nastavit heslo MariaDB uživatele \"root\"" +msgstr "Nelze nastavit heslo MariaDB uživatele „root“" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 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,167 +128,65 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 -#, fuzzy -#| msgid "" -#| "You should check the account's password after tha package installation." +#: ../mariadb-server-10.0.templates:5001 msgid "You should check the account's password after the package installation." msgstr "Po instalaci balíku byste měli heslo ověřit." #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 -#, fuzzy -#| msgid "" -#| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " -#| "more information." +#: ../mariadb-server-10.0.templates:5001 msgid "" "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " "more information." msgstr "" "Více informací naleznete v /usr/share/doc/mariadb-server-10.0/README.Debian." -#. Type: error -#. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "Password input error" -msgstr "" - -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "" +#: ../mariadb-server-10.0.templates:6001 +msgid "Really migrate to MariaDB?" +msgstr "Opravdu migrovat na MariaDB?" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" +#: ../mariadb-server-10.0.templates:6001 +msgid "" +"MariaDB is a drop-in replacement for MySQL. It will use your current " +"configuration file (my.cnf) and current databases." msgstr "" +"MariaDB je přímá náhrada MySQL. Použije váš současný konfigurační soubor (my." +"cnf) a databáze." -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 +#: ../mariadb-server-10.0.templates:6001 msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." +"Note that MariaDB has some enhanced features, which do not exist in MySQL " +"and thus migration back to MySQL might not always work, at least not as " +"automatically as migrating from MySQL to MariaDB." msgstr "" +"MariaDB má některé pokročilé vlastnosti, které v MySQL neexistují a tudíž " +"návrat zpět k MySQL nemusí fungovat (alespoň ne tak autoamticky, jako " +"migrace z MySQL na MariaDB)." -#~ msgid "" -#~ "To use MariaDB, the following entries for users and groups should be " -#~ "added to the system:" -#~ msgstr "" -#~ "Abyste mohli MariaDB používat, musíte v systému založit následující " -#~ "uživatele a skupiny:" - -#~ msgid "Cannot upgrade if ISAM tables are present!" -#~ msgstr "Aktualizace nelze provést pokud jsou přítomny tabulky ISAM!" - -#~ msgid "" -#~ "Recent versions of MySQL can no longer use the old ISAM table format and " -#~ "it is necessary to convert your tables to e.g. MyISAM before upgrading by " -#~ "using \"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". " -#~ "The installation of mysql-server-5.1 will now abort. In case your old " -#~ "mysql-server-4.1 gets removed nevertheless just reinstall it to convert " -#~ "those tables." -#~ msgstr "" -#~ "Poslední verze MySQL již nemohou používat starý formát tabulek ISAM a " -#~ "před aktualizací je nutné převést tyto tabulky např. do formátu MyISAM " -#~ "pomocí \"mysql_convert_table_format\" nebo \"ALTER TABLE x ENGINE=MyISAM" -#~ "\". Instalace mysql-server-5.1 se nyní přeruší. V případě, že se mezitím " -#~ "odinstaloval původní mysql-server-4.1, jednoduše jej znovu nainstalujte a " -#~ "tabulky převeďte." - -#~ msgid "" -#~ "Support MySQL connections from hosts running Debian \"sarge\" or older?" -#~ msgstr "" -#~ "Podporovat MySQL připojení z počítačů používajících Debian Sarge nebo " -#~ "starší?" - -#~ msgid "" -#~ "In old versions of MySQL clients on Debian, passwords were not stored " -#~ "securely. This has been improved since then, however clients (such as " -#~ "PHP) from hosts running Debian 3.1 Sarge will not be able to connect to " -#~ "recent accounts or accounts whose password have been changed." -#~ msgstr "" -#~ "Způsob, jakým se dříve ukládala hesla, nebyl příliš bezpečný. To se nyní " -#~ "zlepšilo, ale nevýhodou je, že se klienti z Debianu 3.1 Sarge (např. PHP) " -#~ "nebudou moci připojit na nové účty, nebo na účty, u nichž se heslo " -#~ "změnilo." - -#~ 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 " -#~ "permissions (the uid/gid may be different)." -#~ msgstr "" -#~ "Abyste mohli mysql používat, musíte do následujících souborů přidat " -#~ "ekvivalentního uživatele a skupinu a zajistit, že /var/lib/mysql má " -#~ "správná práva (uid/gid se mohou lišit)." - -#~ msgid "Remove the databases used by all MySQL versions?" -#~ msgstr "Odstranit databáze používané všemi verzemi MySQL?" - -#~ msgid "" -#~ "If you do not provide a password no changes will be made to the account." -#~ msgstr "Nezadáte-li heslo, žádné změny se s účtem neprovedou." - -#~ msgid "" -#~ "When installation finishes, you should verify that the account is " -#~ "properly protected with a password (see README.Debian for more " -#~ "information)." -#~ msgstr "" -#~ "Po skončení instalace byste měli ověřit, že je účet chráněn heslem (více " -#~ "informací naleznete v souboru README.Debian)." - -#~ msgid "Update Hints" -#~ msgstr "Poznámky k aktualizaci" +#~ msgid "New password for the MariaDB \"root\" user:" +#~ msgstr "Nové heslo MariaDB uživatele „root“:" #~ msgid "" -#~ "You have to run \"mysql_upgrade\" after the upgrade, else tables can be " -#~ "corrupted! This script also enhances the privilege tables but is not " -#~ "supposed to give any user more rights that he had before," +#~ "While not mandatory, it is highly recommended that you set a password for " +#~ "the MariaDB administrative \"root\" user." #~ msgstr "" -#~ "Po aktualizaci ještě musíte spustit \"mysql_upgrade\", protože jinak by " -#~ "se tabulky mohly narušit! Tento skript také rozšiřuje tabulky privilegií, " -#~ "ovšem neměl by uživatelům přidat více práv, než měli dosud." +#~ "Přestože to není nezbytné, je silně doporučeno nastavit heslo u " +#~ "správcovského MariaDB účtu „root“." -#~ msgid "Please also read http://www.mysql.com/doc/en/Upgrade.html" -#~ msgstr "Také si přečtěte http://www.mysql.com/doc/en/Upgrade.html" +#~ msgid "If this field is left blank, the password will not be changed." +#~ msgstr "Ponecháte-li pole prázdné, heslo se nezmění." -#~ msgid "" -#~ "MySQL will only install if you have a non-numeric hostname that is " -#~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command " -#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 " -#~ "myhostname\"." -#~ msgstr "" -#~ "MySQL se nainstaluje pouze v případě, že používáte nenumerické jméno " -#~ "počítače, které se dá přeložit přes soubor /etc/hosts. Např. když příkaz " -#~ "\"hostname\" vrátí \"diamond\", tak v /etc/hosts musí existovat obdobný " -#~ "řádek jako \"10.0.0.1 diamond\"." +#~ msgid "Repeat password for the MariaDB \"root\" user:" +#~ msgstr "Zopakujte heslo MariaDB uživatele „root“:" -#~ msgid "" -#~ "A new mysql user \"debian-sys-maint\" will be created. This mysql account " -#~ "is used in the start/stop and cron scripts. Don't delete." -#~ msgstr "" -#~ "Bude vytvořen nový mysql uživatel \"debian-sys-maint\". Tento mysql účet " -#~ "se používá ve startovacích, ukončovacích a cronových skriptech. Nemažte " -#~ "jej." +#~ msgid "Password input error" +#~ msgstr "Chyba při zadávání hesla" -#~ msgid "" -#~ "Please remember to set a PASSWORD for the MySQL root user! If you use a /" -#~ "root/.my.cnf, always write the \"user\" and the \"password\" lines in " -#~ "there, never only the password!" -#~ msgstr "" -#~ "Nezapomeňte nastavit heslo pro účet administrátora MySQL! Používáte-li /" -#~ "root/.my.cnf, vždy zde zadejte jak řádek \"user\", tak řádek \"password" -#~ "\". Nikdy zde nezadávejte jenom heslo!" - -#~ msgid "" -#~ "Should I remove the complete /var/lib/mysql directory tree which is used " -#~ "by all MySQL versions, not necessarily only the one you are about to " -#~ "purge?" -#~ msgstr "" -#~ "Mám odstranit kompletní adresářový strom /var/lib/mysql, který se používá " -#~ "pro všechny verze MySQL, tedy ne nutně pouze pro verzi, kterou se " -#~ "chystáte vyčistit?" +#~ msgid "The two passwords you entered were not the same. Please try again." +#~ msgstr "Zadaná hesla nejsou stejná. Zkuste to prosím znovu." diff --git a/debian/po/da.po b/debian/po/da.po index e683611..0b4ee0f 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -1,56 +1,43 @@ +# Danish translation mariadb-10.0. +# Copyright (C) 2014 mariadb-10.0 og nedenstående oversættere. +# This file is distributed under the same license as the mariadb-10.0 package. +# Claus Hindsgaul , 2005, 2006, 2007. +# Joe Hansen , 2014. # -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans# -# Developers do not need to manually edit POT or PO files. -# -# Claus Hindsgaul , 2005, 2006. -# Claus Hindsgaul , 2006, 2007. msgid "" msgstr "" -"Project-Id-Version: mysql-dfsg-4.1\n" +"Project-Id-Version: mariadb-10.0\n" "Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" -"PO-Revision-Date: 2007-05-30 22:41+0200\n" -"Last-Translator: Claus Hindsgaul \n" -"Language-Team: Danish\n" -"Language: \n" +"POT-Creation-Date: 2015-01-31 14:00+0200\n" +"PO-Revision-Date: 2014-02-22 22:41+0200\n" +"Last-Translator: Joe Hansen \n" +"Language-Team: Danish \n" +"Language: da\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" #. Type: boolean #. Description #: ../mariadb-server-10.0.templates:2001 msgid "Really proceed with downgrade?" -msgstr "nsker du virkelig at fortstte nedgraderingen?" +msgstr "Ønsker du virkelig at fortsætte nedgraderingen?" #. Type: boolean #. Description #: ../mariadb-server-10.0.templates:2001 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." +msgstr "Der er en fil med navnet /var/lib/mysql/debian-*.flag på dette system." #. Type: boolean #. Description #: ../mariadb-server-10.0.templates:2001 -#, fuzzy -#| msgid "" -#| "Such file is an indication that a mariadb-server package with a higher " -#| "version has been installed earlier." msgid "" "Such a file is an indication that a mariadb-server package with a higher " "version has been installed previously." msgstr "" -"Sdan en fil tyder p at der tidligere har vret installeret en hjere " -"version af mariadb-server-pakken." +"Sådan en fil tyder på, at der tidligere har været installeret en højere " +"version af pakken mariadb-server." #. Type: boolean #. Description @@ -59,8 +46,8 @@ 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." +"Det kan ikke garanteres, at den version, du er ved at installere, kan " +"benytte data fra de eksisterende databaser." #. Type: note #. Description @@ -75,19 +62,18 @@ msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" msgstr "" +"Brug af MariaDB under NIS/YP kræver, at en mysql-brugerkonto tilføjes på det " +"lokale system med:" #. Type: note #. Description #: ../mariadb-server-10.0.templates:3001 -#, fuzzy -#| msgid "" -#| "You should also check the permissions and the owner of the /var/lib/mysql " -#| "directory:" msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" msgstr "" -"Du br ogs tjekke filrettighederne og ejerskabet af mappen /var/lib/mysql:" +"Du bør også kontrollere filrettighederne og ejerskabet af mappen /var/lib/" +"mysql:" #. Type: boolean #. Description @@ -114,269 +100,91 @@ msgid "" "the data should be kept." msgstr "" "Hvis du fjerner MariaDB-pakken for senere at installere en nyere version, " -"eller hvis en anden mariadb-server-pakke allerede benytter den, br dataene " +"eller hvis en anden mariadb-server-pakke allerede benytter den, bør dataene " "bevares." -#. Type: boolean -#. Description -#: ../mariadb-server-10.0.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "Start MariaDB-serveren under systemopstart?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.0.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.0.templates:6001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "Ny adgangskode for MariaDB's \"root\"-bruger:" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Selvom det ikke krves, anbefales det kraftigt, at du stter en adgangskode " -"for MariaDB's administrationsbruger \"root\"." - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -#, fuzzy -#| msgid "If that field is left blank, the password will not be changed." -msgid "If this field is left blank, the password will not be changed." -msgstr "Hvis du lader dette felt st tomt, vil adgangskoden ikke blive ndret." - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:7001 -#, fuzzy -#| msgid "New password for the MySQL \"root\" user:" -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Ny adgangskode for MariaDB's \"root\"-bruger:" - #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "Unable to set password for the MariaDB \"root\" user" -msgstr "Kunne ikke stte adgangskoden for MariaDB's \"root\"-bruger" +msgstr "Kunne ikke sætte adgangskoden for MariaDB's »root«-bruger" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " "because of a communication problem with the MariaDB server." msgstr "" "Der opstod en fejl, da adgangskoden for MariaDB's administrationsbruger blev " -"forsgt ndret. Dette kan vre sket, fordi brugeren allerede har en " +"forsøgt ændret. Dette kan være sket, fordi brugeren allerede har en " "adgangskode, eller fordi der var problemer med at kommunikere med MariaDB-" "serveren." #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "You should check the account's password after the package installation." -msgstr "Du br tjekke kontoens adgangskode efter pakkeinstallationen." +msgstr "Du bør kontrollere kontoens adgangskode efter pakkeinstallationen." #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 -#, fuzzy -#| msgid "" -#| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " -#| "more information." +#: ../mariadb-server-10.0.templates:5001 msgid "" "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " "more information." msgstr "" "Se filen /usr/share/doc/mariadb-server-10.0/README.Debian for yderligere " -"oplysninger." - -#. Type: error -#. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "Password input error" -msgstr "" +"information." -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "" +#: ../mariadb-server-10.0.templates:6001 +msgid "Really migrate to MariaDB?" +msgstr "Migrer til MariaDB?" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" +#: ../mariadb-server-10.0.templates:6001 +msgid "" +"MariaDB is a drop-in replacement for MySQL. It will use your current " +"configuration file (my.cnf) and current databases." msgstr "" +"MariaDB er en direkte erstatning for MySQL. Den vil bruge din nuværende " +"konfigurationsfil (my.cnf) og nuværende databaser." -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 +#: ../mariadb-server-10.0.templates:6001 msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." +"Note that MariaDB has some enhanced features, which do not exist in MySQL " +"and thus migration back to MySQL might not always work, at least not as " +"automatically as migrating from MySQL to MariaDB." msgstr "" +"Bemærk at MariaDB har nogle forbedrede funktioner, som ikke findes i MySQL " +"og migrering tilbage til MySQL vil derfor ikke altid fungere, i det mindste " +"ikke ligeså automatisk som at migrere fra MySQL til MariaDB." -#~ msgid "" -#~ "To use MariaDB, the following entries for users and groups should be " -#~ "added to the system:" -#~ msgstr "" -#~ "Nedenstende linjer for brugere og grupper skal tilfjes dette system for " -#~ "at benytte MariaDB:" - -#~ msgid "Cannot upgrade if ISAM tables are present!" -#~ msgstr "Kan ikke opgradere hvis der er ISAM-tabeller!" - -#~ msgid "" -#~ "Recent versions of MySQL can no longer use the old ISAM table format and " -#~ "it is necessary to convert your tables to e.g. MyISAM before upgrading by " -#~ "using \"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". " -#~ "The installation of mysql-server-5.1 will now abort. In case your old " -#~ "mysql-server-4.1 gets removed nevertheless just reinstall it to convert " -#~ "those tables." -#~ msgstr "" -#~ "Nyere versioner af MySQL kan ikke lngere benytte det gamle ISAM-" -#~ "tabelformat, og det er derfor ndvendigt at konvertere dine tabeller til " -#~ "f.eks. MyISAM forud for opgraderingen med \"mysql_convert_table_format\" " -#~ "eller \"ALTER TABLE x ENGINE=MyISAM\". Installationen af mysql-server-5.1 " -#~ "afbrydes nu. Skulle din gamle mysql-server-4.1 alligevel bliver " -#~ "afinstalleret, s geninstallr den blot og konverter tabellerne." - -#~ msgid "" -#~ "Support MySQL connections from hosts running Debian \"sarge\" or older?" -#~ msgstr "" -#~ "Understt MySQL-forbindelser fra maskiner, der krer Debian \"Sarge\" " -#~ "eller ldre?" - -#~ msgid "" -#~ "In old versions of MySQL clients on Debian, passwords were not stored " -#~ "securely. This has been improved since then, however clients (such as " -#~ "PHP) from hosts running Debian 3.1 Sarge will not be able to connect to " -#~ "recent accounts or accounts whose password have been changed." -#~ msgstr "" -#~ "Gamle udgaver af MySQL-klienter p Debian gemte ikke adgangskoderne " -#~ "sikkert. Dette er blevet forbedret siden da, men klienter (f.eks. PHP) " -#~ "fra maskiner, der krer Debian 3.1 Sarge vil ikke kunne forbinde til " -#~ "nyere konti eller konti, hvis adgangskode er blevet ndret." +#~ msgid "New password for the MariaDB \"root\" user:" +#~ msgstr "Ny adgangskode for MariaDB's »root«-bruger:" #~ 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 " -#~ "permissions (the uid/gid may be different)." +#~ "While not mandatory, it is highly recommended that you set a password for " +#~ "the MariaDB administrative \"root\" user." #~ msgstr "" -#~ "For at kunne bruge mysql skal du installere en bruger og en gruppe, der " -#~ "svarer til nedenstende, og sikre dig at /var/lib/mysql har de rigtige " -#~ "adgangsrettigheder (uid/gid kan afvige)." +#~ "Selvom det ikke kræves, anbefales det kraftigt, at du sætter en " +#~ "adgangskode for MariaDB's administrationsbruger »root«." -#~ msgid "" -#~ "/etc/passwd: mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false" +#~ msgid "If this field is left blank, the password will not be changed." #~ msgstr "" -#~ "etc/passwd: mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false" +#~ "Hvis du lader dette felt stå tomt, vil adgangskoden ikke blive ændret." -#~ msgid "/etc/group: mysql:x:101:" -#~ msgstr "/etc/group: mysql:x:101:" +#~ msgid "Repeat password for the MariaDB \"root\" user:" +#~ msgstr "Gentag adgangskode for MariaDB's »root«-bruger:" -#~ msgid "/var/lib/mysql: drwxr-xr-x mysql mysql" -#~ msgstr "/var/lib/mysql: drwxr-xr-x mysql mysql" - -#~ msgid "Remove the databases used by all MySQL versions?" -#~ msgstr "Fjern de databaser, der benyttes af samtlige MySQL-versioner?" - -#~ msgid "" -#~ "If you do not provide a password no changes will be made to the account." -#~ msgstr "Hvis du ikke angiver en adgangskode, vil kontoen ikke blive ndret." +#~ msgid "Password input error" +#~ msgstr "Indtastningsfejl for adgangskode" -#~ msgid "" -#~ "When installation finishes, you should verify that the account is " -#~ "properly protected with a password (see README.Debian for more " -#~ "information)." -#~ msgstr "" -#~ "Nr installationen afsluttes, br du tjekke at kontoen er ordentligt " -#~ "beskyttet med en adgangskode (se README.Debian for yderligere " -#~ "oplysninger)." - -#~ msgid "Update Hints" -#~ msgstr "Opdateringstips" - -#~ msgid "" -#~ "You have to run \"mysql_upgrade\" after the upgrade, else tables can be " -#~ "corrupted! This script also enhances the privilege tables but is not " -#~ "supposed to give any user more rights that he had before," -#~ msgstr "" -#~ "Du skal kre \"mysql_upgrade\" efter opgraderingen, da tabellerne eller " -#~ "kan blive delagt! Dette script forbedrer ogs rettighedstabellerne, men " -#~ "burde ikke give nogen bruger flere rettigheder, end han havde tidligere," - -#~ msgid "Please also read http://www.mysql.com/doc/en/Upgrade.html" -#~ msgstr "Ls ogs http://www.mysql.com/doc/en/Upgrade.html" - -#~ msgid "Install Hints" -#~ msgstr "Installationstips" - -#~ msgid "" -#~ "On upgrades from MySQL 3.23, as shipped with Debian Woody, symlinks in " -#~ "place of /var/lib/mysql or /var/log/mysql gets accidently removed and " -#~ "have manually be restored." -#~ msgstr "" -#~ "Ved opgraderinger fra MySQL 3.23, der fulgte med Debian Woody, kan de " -#~ "symbolske /var/lib/mysql or /var/log/mysql blive fjernet ved et uheld, og " -#~ "m genskabes manuelt." - -#~ msgid "" -#~ "MySQL will only install if you have a non-numeric hostname that is " -#~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command " -#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 " -#~ "myhostname\"." -#~ msgstr "" -#~ "MySQL vil kun blive installeret, hvis du har et ikke-numerisk vrtsnavn, " -#~ "som kan sls op i filen /ets/hosts. Hvis f.eks. kommandoen \"hostname\" " -#~ "svarer med \"mitvaertsnavn\", skal du have en linje a'la \"10.0.0.1 " -#~ "mitvaertsnavn\" i /etc/hosts." - -#~ msgid "" -#~ "A new mysql user \"debian-sys-maint\" will be created. This mysql account " -#~ "is used in the start/stop and cron scripts. Don't delete." -#~ msgstr "" -#~ "Det vil blive oprettet en ny mysql-bruger, \"debian-sys-maint\". Denne " -#~ "mysql-konto bruges i start/stop-cron-scripterne. Slet den ikke." - -#~ msgid "" -#~ "Please remember to set a PASSWORD for the MySQL root user! If you use a /" -#~ "root/.my.cnf, always write the \"user\" and the \"password\" lines in " -#~ "there, never only the password!" -#~ msgstr "" -#~ "Husk at stte en ADGANGSKODE for MySQLs root-bruger! Hvis du bruger en /" -#~ "etc/.my.cnf, s skriv altid \"user\"- og \"password\"-linjer ind her, " -#~ "ikke kun adgangskoden!" - -#~ msgid "" -#~ "Should I remove the complete /var/lib/mysql directory tree which is used " -#~ "by all MySQL versions, not necessarily only the one you are about to " -#~ "purge?" -#~ msgstr "" -#~ "Skal jeg fjerne hele mappetret /var/lib/mysql, som benyttes af alle " -#~ "MySQL-versioner, ikke kun den version, du er ved at slette?" - -#~ msgid "" -#~ "Rarely, e.g. on new major versions, the privilege system is improved. To " -#~ "make use of it mysql_fix_privilege_tables must be executed manually. The " -#~ "script is not supposed to give any user more rights that he had before," -#~ msgstr "" -#~ "En sjlden gang imellem, f.eks. ved nye hovedversioner, sker det at " -#~ "rettighedssystemet forbedres. For at gre brug af dette, skal " -#~ "mysql_fix_privilege_tables kres manuelt. Scriptet vil ikke give nogen " -#~ "bruger flere rettigheder, end vedkommende havde tidligere," +#~ msgid "The two passwords you entered were not the same. Please try again." +#~ msgstr "De to adgangskoder du indtastede var ikke ens. Prøv igen." diff --git a/debian/po/de.po b/debian/po/de.po index 3a36bf7..e70caa5 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -1,30 +1,20 @@ -# translation of mysql-dfsg-5.1_5.1.37-1_de.po to Deutsch -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans# -# Developers do not need to manually edit POT or PO files. -# +# German translation of mariadb-10.0 10.0.13-1 # Alwin Meschede , 2006, 2007. # Thomas Mueller , 2009. +# Chris Leick , 2014. +# msgid "" msgstr "" -"Project-Id-Version: mysql-dfsg-5.1_5.1.37-1_de\n" +"Project-Id-Version: mariadb 10.0.13-1\n" "Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" -"PO-Revision-Date: 2009-08-27 22:41+0200\n" -"Last-Translator: Thomas Mueller \n" +"POT-Creation-Date: 2015-01-31 14:00+0200\n" +"PO-Revision-Date: 2014-10-04 08:12+0100\n" +"Last-Translator: Chris Leick \n" "Language-Team: german \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Type: boolean @@ -39,7 +29,7 @@ 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" +"flag." #. Type: boolean #. Description @@ -49,7 +39,7 @@ msgid "" "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." +"einer höheren Version installiert wurde." #. Type: boolean #. Description @@ -59,7 +49,7 @@ msgid "" "able to use the current databases." msgstr "" "Es kann nicht garantiert werden, dass die gegenwärtig zu installierende " -"Version dessen Daten benutzen kann." +"Version dessen Datenbanken benutzen kann." #. Type: note #. Description @@ -74,8 +64,8 @@ msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" msgstr "" -"Falls MariaDB mit NIS/YP genutzt wird, ist ein »mysql«-Benutzerkonto auf dem " -"lokalen System notwendig:" +"Falls MariaDB mit NIS/YP genutzt wird, muss ein »mysql«-Benutzerkonto auf " +"dem lokalen System hinzugefügt werden mit:" #. Type: note #. Description @@ -111,76 +101,32 @@ msgid "" "recent version or if a different mariadb-server package is already using it, " "the data should be kept." msgstr "" -"Falls geplant ist, nur eine höhere Version von MariaDB zu installieren oder " -"ein anderes mariadb-server-Paket dieses bereits benutzt, sollten die Daten " -"behalten werden." - -#. Type: boolean -#. Description -#: ../mariadb-server-10.0.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "Soll der MariaDB-Server automatisch beim Booten starten?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.0.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.0.templates:6001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "Neues Passwort für den MariaDB »root«-Benutzer:" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Obwohl es nicht zwingend erforderlich ist, wird nachdrücklich empfohlen für " -"den administrativen MariaDB »root«-Benutzer ein Passwort zu setzen." - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -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.0.templates:7001 -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Wiederholen Sie das Passwort für den MariaDB-»root«-Benutzer:" +"Falls geplant ist, das MariaDB-Paket zu entfernen, um lediglich eine höhere " +"Version zu installieren oder ein anderes mariadb-server-Paket die Daten " +"benutzt, sollten diese beibehalten werden." #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "Unable to set password for the MariaDB \"root\" user" -msgstr "Konnte für den MariaDB-»root«-Benutzer kein Passwort setzen" +msgstr "Passwort für den MariaDB-»root«-Benutzer konnte nicht gesetzt werden" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " "because of a communication problem with the MariaDB server." msgstr "" -"Beim setzen des Passworts für den administrativen MariaDB-Benutzer ist ein " +"Beim Setzen des Passworts für den administrativen MariaDB-Benutzer ist ein " "Fehler aufgetreten. Dies könnte daran liegen, dass der Benutzer bereits ein " -"Passwort hat oder dass es ein Problem mit der Kommunikation mit dem MariaDB-" +"Passwort hat oder dass es ein Problem bei der Kommunikation mit dem MariaDB-" "Server gibt." #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "You should check the account's password after the package installation." msgstr "" "Sie sollten das Passwort des administrativen Benutzers nach der " @@ -188,47 +134,62 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 -#, fuzzy -#| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-5.1/README.Debian file for " -#| "more information." +#: ../mariadb-server-10.0.templates:5001 msgid "" "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " "more information." msgstr "" -"Für weitere Informationen lesen Sie /usr/share/doc/mariadb-server-5.1/README." -"Debian." +"Für weitere Informationen lesen Sie /usr/share/doc/mariadb-server-10.0/" +"README.Debian." -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "Password input error" -msgstr "Passwort-Eingabefehler" +#: ../mariadb-server-10.0.templates:6001 +msgid "Really migrate to MariaDB?" +msgstr "Möchten Sie wirklich auf MariaDB migrieren?" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "The two passwords you entered were not the same. Please try again." +#: ../mariadb-server-10.0.templates:6001 +msgid "" +"MariaDB is a drop-in replacement for MySQL. It will use your current " +"configuration file (my.cnf) and current databases." msgstr "" -"Die beiden von Ihnen eingegebenen Passwörter sind nicht identisch. Bitte " -"erneut versuchen." +"MariaDB ist ein einspielbarer Ersatz für MySQL. Es wird Ihre aktuelle " +"Konfigurationsdatei (my.cnf) und Ihre aktuellen Datenbanken verwenden." -#. Type: error -#. Description -#: ../mariadb-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "NDB-Cluster scheint gerade benutzt zu werden" - -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 +#: ../mariadb-server-10.0.templates:6001 msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." +"Note that MariaDB has some enhanced features, which do not exist in MySQL " +"and thus migration back to MySQL might not always work, at least not as " +"automatically as migrating from MySQL to MariaDB." msgstr "" -"MySQL-5.1 bietet keine NDB-Clusterunterstützung mehr. Bitte migrieren Sie " -"Ihr System zum neuen »mysql-cluster«-Paket und entfernen Sie alle Zeilen, " -"die mit »ndb« beginnen aus allen Konfigurationsdateien im Verzeichnis /etc/" -"mysql/." +"Beachten Sie, dass MariaDB über einige erweiterte Funktionalitäten verfügt, " +"die es in MySQL nicht gibt. Eine Rückmigration klappt daher nicht immer, " +"zumindest nicht automatisch wie das Migrieren von MySQL auf MariaDB." + +#~ msgid "New password for the MariaDB \"root\" user:" +#~ msgstr "Neues Passwort für den MariaDB-»root«-Benutzer:" + +#~ msgid "" +#~ "While not mandatory, it is highly recommended that you set a password for " +#~ "the MariaDB administrative \"root\" user." +#~ msgstr "" +#~ "Obwohl es nicht zwingend erforderlich ist, wird nachdrücklich empfohlen, " +#~ "für den administrativen MariaDB-»root«-Benutzer ein Passwort zu setzen." + +#~ msgid "If this field is left blank, the password will not be changed." +#~ msgstr "Wenn Sie dieses Feld leer lassen, wird das Passwort nicht geändert." + +#~ msgid "Repeat password for the MariaDB \"root\" user:" +#~ msgstr "Wiederholen Sie das Passwort für den MariaDB-»root«-Benutzer:" + +#~ msgid "Password input error" +#~ msgstr "Passwort-Eingabefehler" + +#~ 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." diff --git a/debian/po/es.po b/debian/po/es.po index f4e729b..3259837 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -6,7 +6,7 @@ # - Initial translation # Jesus Aneiros, 2006 # - Updated -# Javier Fernandez-Sanguino, 2006-2007 +# Javier Fernandez-Sanguino, 2006-2007, 2012 # - Revision # Nacho Barrientos Arias # Fernando Cerezal @@ -41,8 +41,8 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1_5.0.24-3\n" "Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" -"PO-Revision-Date: 2007-05-28 22:21+0200\n" +"POT-Creation-Date: 2015-01-31 14:00+0200\n" +"PO-Revision-Date: 2014-09-24 23:52+0200\n" "Last-Translator: Javier Fernández-Sanguino \n" "Language-Team: Debian l10 Spanish \n" "Language: \n" @@ -66,10 +66,6 @@ msgstr "" #. Type: boolean #. Description #: ../mariadb-server-10.0.templates:2001 -#, fuzzy -#| msgid "" -#| "Such file is an indication that a mariadb-server package with a higher " -#| "version has been installed earlier." msgid "" "Such a file is an indication that a mariadb-server package with a higher " "version has been installed previously." @@ -100,14 +96,12 @@ msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" msgstr "" +"Para utilizar MariaDB bajo NIS/YP es necesario añadir una cuenta de usuario " +"mysql en el sistema local con:" #. Type: note #. Description #: ../mariadb-server-10.0.templates:3001 -#, fuzzy -#| msgid "" -#| "You should also check the permissions and the owner of the /var/lib/mysql " -#| "directory:" msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -143,63 +137,15 @@ msgstr "" "MariaDB más reciente o si hay un paquete «mariadb-server» distinto que los " "está utilizando." -#. Type: boolean -#. Description -#: ../mariadb-server-10.0.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.0.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.0.templates:6001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "Nueva contraseña para el usuario «root» de MariaDB:" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Se recomienda que configure una contraseña para el usuario " -"«root» (administrador) de MariaDB, aunque no es obligatorio." - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -#, fuzzy -#| msgid "If that field is left blank, the password will not be changed." -msgid "If this field is left blank, the password will not be changed." -msgstr "No se modificará la contraseña si deja el espacio en blanco." - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:7001 -#, fuzzy -#| msgid "New password for the MySQL \"root\" user:" -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Nueva contraseña para el usuario «root» de MariaDB:" - #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 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.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 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 +158,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 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,11 +166,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 -#, fuzzy -#| msgid "" -#| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " -#| "more information." +#: ../mariadb-server-10.0.templates:5001 msgid "" "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " "more information." @@ -232,160 +174,53 @@ msgstr "" "Consulte /usr/share/doc/mariadb-server-10.0/README.Debian para más " "información." -#. Type: error -#. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "Password input error" -msgstr "" - -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "" +#: ../mariadb-server-10.0.templates:6001 +msgid "Really migrate to MariaDB?" +msgstr "¿Realmente desea migrar a MariaDB?" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" +#: ../mariadb-server-10.0.templates:6001 +msgid "" +"MariaDB is a drop-in replacement for MySQL. It will use your current " +"configuration file (my.cnf) and current databases." msgstr "" +"MariaDB es un reemplazo de MySQL. Utilizará su archivo de configuración " +"actual (my.cnf) y sus bases de datos actuales." -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 +#: ../mariadb-server-10.0.templates:6001 msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." +"Note that MariaDB has some enhanced features, which do not exist in MySQL " +"and thus migration back to MySQL might not always work, at least not as " +"automatically as migrating from MySQL to MariaDB." msgstr "" +"Tenga en cuenta que MariaDB tiene algunas funcionalidades avanzadas que no " +"existen en MySQL. Por ello, la marcha atrás a MySQL no siempre funcionará o, " +"al menos, no será tan automática como la migración de MySQL a MariaDB." -#~ msgid "" -#~ "To use MariaDB, the following entries for users and groups should be " -#~ "added to the system:" -#~ msgstr "" -#~ "Deben añadirse las siguientes entradas para usuarios y grupos en el " -#~ "sistema para poder utilizar MariaDB:" - -#~ msgid "Cannot upgrade if ISAM tables are present!" -#~ msgstr "¡No se puede actualizar si ya hay tablas ISAM!" - -#~ msgid "" -#~ "Recent versions of MySQL can no longer use the old ISAM table format and " -#~ "it is necessary to convert your tables to e.g. MyISAM before upgrading by " -#~ "using \"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". " -#~ "The installation of mysql-server-5.1 will now abort. In case your old " -#~ "mysql-server-4.1 gets removed nevertheless just reinstall it to convert " -#~ "those tables." -#~ msgstr "" -#~ "Las versiones recientes de MySQL ya no soportan el antiguo formato de " -#~ "tabla ISAM. Antes de realizar la actualización es necesario convertir sus " -#~ "tablas a por ejemplo, MyISAM, usando «mysql_convert_table_format» o " -#~ "«ALTER TABLE x ENGINE=MyISAM». Se va a interrumpir ahora la instalación " -#~ "de mysql-server-5.1. Si aún así su mysql-server-4.1 se elimina aún así, " -#~ "puede reinstalarlo para convertir ese tipo de tablas." - -#~ msgid "" -#~ "Support MySQL connections from hosts running Debian \"sarge\" or older?" -#~ msgstr "" -#~ "¿Soportar las conexiones MySQL establecidadas desde sistemas que ejecutan " -#~ "Debian Sarge o versiones anteriores?" - -#~ msgid "" -#~ "In old versions of MySQL clients on Debian, passwords were not stored " -#~ "securely. This has been improved since then, however clients (such as " -#~ "PHP) from hosts running Debian 3.1 Sarge will not be able to connect to " -#~ "recent accounts or accounts whose password have been changed." -#~ msgstr "" -#~ "No era muy segura la forma en la que se almacenaban las contraseñas en " -#~ "versiones anteriores del cliente de MySQL en Debian. Este problema se ha " -#~ "mejorado posteriormente con el inconveniente, sin embargo, de que " -#~ "clientes (por ejemplo, PHP) en sistemas que ejecutan Debian 3.1 «Sarge» " -#~ "no podrán conectarse a cuentas que son nuevas o a las que se le haya " -#~ "cambiado la contraseña." +#~ msgid "New password for the MariaDB \"root\" user:" +#~ msgstr "Nueva contraseña para el usuario «root» de MariaDB:" #~ 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 " -#~ "permissions (the uid/gid may be different)." +#~ "While not mandatory, it is highly recommended that you set a password for " +#~ "the MariaDB administrative \"root\" user." #~ msgstr "" -#~ "Para utilizar mysql debe instalar un usuario y grupo equivalente al " -#~ "siguiente y asegurarse de que /var/lib/mysql tiene los permisos correctos " -#~ "(los valores del «uid» y del «gid» pueden ser diferentes)." +#~ "Se recomienda que configure una contraseña para el usuario " +#~ "«root» (administrador) de MariaDB, aunque no es obligatorio." -#~ msgid "" -#~ "/etc/passwd: mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false" -#~ msgstr "" -#~ "/etc/passwd: mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false" +#~ msgid "If this field is left blank, the password will not be changed." +#~ msgstr "No se modificará la contraseña si deja este campo en blanco." -#~ msgid "/etc/group: mysql:x:101:" -#~ msgstr "/etc/group: mysql:x:101:" +#~ msgid "Repeat password for the MariaDB \"root\" user:" +#~ msgstr "Repita la contraseña para el usuario «root» de MariaDB:" -#~ msgid "/var/lib/mysql: drwxr-xr-x mysql mysql" -#~ msgstr "/var/lib/mysql: drwxr-xr-x mysql mysql" +#~ msgid "Password input error" +#~ msgstr "Error en la entrada de contraseña" -#~ msgid "Remove the databases used by all MySQL versions?" -#~ msgstr "" -#~ "¿Eliminar las bases de datos utilizadas por todas las versiones de MySQL?" - -#~ msgid "" -#~ "If you do not provide a password no changes will be made to the account." -#~ msgstr "" -#~ "No se hará ningún cambio en la cuenta si no introduce una contraseña." - -#~ msgid "" -#~ "When installation finishes, you should verify that the account is " -#~ "properly protected with a password (see README.Debian for more " -#~ "information)." -#~ msgstr "" -#~ "Debería confirmar que la contraseña está correctamente protegida con una " -#~ "contraseña cuando termine la instalación (consulte el fichero README." -#~ "Debian si desea más información)." - -#~ msgid "Install Hints" -#~ msgstr "Sugerencias para la instalación" - -#~ msgid "" -#~ "On upgrades from MySQL 3.23, as shipped with Debian Woody, symlinks in " -#~ "place of /var/lib/mysql or /var/log/mysql gets accidently removed and " -#~ "have manually be restored." -#~ msgstr "" -#~ "Al actualizar a la versión de MySQL 3.23, la vrsión proporcionada en " -#~ "Debian Woody, se eliminan de manera accidental, los enlaces simbólicos a " -#~ "«/var/lib/mysql» o «/var/log/mysql» y tienen que restaurarse manualmente." - -#~ msgid "" -#~ "MySQL will only install if you have a non-numeric hostname that is " -#~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command " -#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 " -#~ "myhostname\"." -#~ msgstr "" -#~ "Sólo se instalará MySQL si tiene un nombre de equipo que no sea una " -#~ "dirección IP y pueda resolverse a través del archivo /etc/hosts. Por " -#~ "ejemplo, si la orden «hostname» devuelve «MiNombreEquipo» entonces deberá " -#~ "existir una línea «10.0.0.1 MiNombreEquipo» en dicho archivo." - -#~ msgid "" -#~ "A new mysql user \"debian-sys-maint\" will be created. This mysql account " -#~ "is used in the start/stop and cron scripts. Don't delete." -#~ msgstr "" -#~ "Se creará un nuevo usuario «debian-sys-maint». Esta cuenta de mysql se " -#~ "utilizará en los scripts de inicio y parada y en los scripts «cron». No " -#~ "la elimine." - -#~ msgid "" -#~ "Please remember to set a PASSWORD for the MySQL root user! If you use a /" -#~ "root/.my.cnf, always write the \"user\" and the \"password\" lines in " -#~ "there, never only the password!" -#~ msgstr "" -#~ "¡Por favor, recuerde crear una CONTRASEÑA para el usuario «root» de " -#~ "MySQL! ¡Si utiliza /root/.my.cnf debe escribir las líneas «user» y " -#~ "«password» en dicho archivo, no incluya sólo la contraseña!" - -#~ msgid "" -#~ "Should I remove the complete /var/lib/mysql directory tree which is used " -#~ "by all MySQL versions, not necessarily only the one you are about to " -#~ "purge?" +#~ msgid "The two passwords you entered were not the same. Please try again." #~ msgstr "" -#~ "¿Debería eliminar el árbol de directorio /var/lib/mysql completo? Tenga " -#~ "en cuenta que lo utilizan todas las versiones de MySQL y no sólo la que " -#~ "está a punto de purgar." +#~ "Las contraseñas introducidas no coinciden. Por favor, inténtelo de nuevo." diff --git a/debian/po/eu.po b/debian/po/eu.po index e5643f1..f8ee896 100644 --- a/debian/po/eu.po +++ b/debian/po/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: eu\n" "Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"POT-Creation-Date: 2015-01-31 14:00+0200\n" "PO-Revision-Date: 2009-07-29 11:59+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" @@ -109,61 +109,15 @@ msgstr "" "bazara, edo beste mariadb-server pakete bat berau erabiltzen ari bada, " "datuak mantendu egin beharko lirateke." -#. Type: boolean -#. Description -#: ../mariadb-server-10.0.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "Abioan MariaDB zerbitzaria abiarazi?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.0.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.0.templates:6001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "MariaDB \"root\" erabiltzailearen pasahitz berria:" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Derrigorrezkoa ez denean, oso gomendagarria da MariaDB administratzaile " -"\"root\" erabiltzaileari pasahitz bat ezartzea." - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -#, fuzzy -#| msgid "If that field is left blank, the password will not be changed." -msgid "If this field is left blank, the password will not be changed." -msgstr "Eremua hau zurian utziaz gero ez da pasahitza aldatuko." - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:7001 -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Errepikatu MariaDB \"root\" erabiltzailearen pasahitza:" - #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "Ezin da MariaDB \"root\" erabiltzailearen pasahitza ezarri" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -175,14 +129,14 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 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.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 #, fuzzy #| msgid "" #| "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " @@ -194,44 +148,50 @@ msgstr "" "Mesedez irakurri /usr/share/doc/mariadb-server-10.0/README.Debian fitxategia " "xehetasun gehiagorako." -#. Type: error -#. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "Password input error" -msgstr "Pasahitz sarrera errorea" - -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "Idatzi dituzun bi pasahitzak ez dira berdina. Mesedez saiatu berriz." +#: ../mariadb-server-10.0.templates:6001 +msgid "Really migrate to MariaDB?" +msgstr "" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "Dirudienez NDB Cluster-a erabilia dago" +#: ../mariadb-server-10.0.templates:6001 +msgid "" +"MariaDB is a drop-in replacement for MySQL. It will use your current " +"configuration file (my.cnf) and current databases." +msgstr "" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 -#, fuzzy -#| msgid "" -#| "MySQL-5.1 has orphaned NDB Cluster support. Please migrate to the new " -#| "mysql-cluster package and remove all lines starting with \"ndb\" from all " -#| "config files below /etc/mysql/." +#: ../mariadb-server-10.0.templates:6001 msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." +"Note that MariaDB has some enhanced features, which do not exist in MySQL " +"and thus migration back to MySQL might not always work, at least not as " +"automatically as migrating from MySQL to MariaDB." msgstr "" -"MySQL-5.1-ek NDB cluster euskarri umezurtz bat behar du. Mesedez migratu " -"mysql-cluster pakete berrira eta /etc/mysql/ azpiko konfigurazio fitxategi " -"guztietan \"ndb\"-ez hasten diren lerro guztiak ezabatu." + +#~ msgid "New password for the MariaDB \"root\" user:" +#~ msgstr "MariaDB \"root\" erabiltzailearen pasahitz berria:" #~ msgid "" -#~ "To use MariaDB, the following entries for users and groups should be " -#~ "added to the system:" +#~ "While not mandatory, it is highly recommended that you set a password for " +#~ "the MariaDB administrative \"root\" user." +#~ msgstr "" +#~ "Derrigorrezkoa ez denean, oso gomendagarria da MariaDB administratzaile " +#~ "\"root\" erabiltzaileari pasahitz bat ezartzea." + +#, fuzzy +#~| msgid "If that field is left blank, the password will not be changed." +#~ msgid "If this field is left blank, the password will not be changed." +#~ msgstr "Eremua hau zurian utziaz gero ez da pasahitza aldatuko." + +#~ msgid "Repeat password for the MariaDB \"root\" user:" +#~ msgstr "Errepikatu MariaDB \"root\" erabiltzailearen pasahitza:" + +#~ msgid "Password input error" +#~ msgstr "Pasahitz sarrera errorea" + +#~ msgid "The two passwords you entered were not the same. Please try again." #~ msgstr "" -#~ "MariaDB erabili ahal izateko, hurrengo erabiltzaile eta taldeak gehitu " -#~ "behar dira sisteman:" +#~ "Idatzi dituzun bi pasahitzak ez dira berdina. Mesedez saiatu berriz." diff --git a/debian/po/fr.po b/debian/po/fr.po index da74e64..b84a871 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -3,13 +3,13 @@ # This file is distributed under the same license as the mysql-dfsg-* packages. # # Translators: -# Christian Perrier , 2004, 2006, 2007, 2009. +# Christian Perrier , 2004, 2006, 2007, 2009, 2013. msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" -"PO-Revision-Date: 2009-08-08 14:56+0200\n" +"POT-Creation-Date: 2015-01-31 14:00+0200\n" +"PO-Revision-Date: 2013-12-25 12:47+0100\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" "Language: fr\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "debian.org>\n" -"X-Generator: Lokalize 0.3\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n" #. Type: boolean @@ -48,7 +48,9 @@ msgstr "" 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." +msgstr "" +"Il n'est pas garanti que cette version puisse en utiliser les bases de " +"données." #. Type: note #. Description @@ -100,63 +102,20 @@ msgid "" "recent version or if a different mariadb-server package is already using it, " "the data should be kept." 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.0.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "Faut-il lancer MariaDB au démarrage ?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.0.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.0.templates:6001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "Nouveau mot de passe du superutilisateur de MariaDB :" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Il est très fortement recommandé d'établir un mot de passe pour le compte " -"d'administration de MariaDB (« root »)." - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -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.0.templates:7001 -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Confirmation du mot de passe du superutilisateur de MariaDB :" +"Si vous retirez le paquet MariaDB en vue d'en installer une version plus " +"récente ou si un autre paquet mariadb-server les utilise déjà, vous devriez " +"les conserver." #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 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.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 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 +127,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 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,71 +135,63 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 -#, fuzzy -#| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " -#| "more information." +#: ../mariadb-server-10.0.templates:5001 msgid "" "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " "more information." msgstr "" -"Veuillez consulter le fichier /usr/share/doc/mysql-server-10.0/README.Debian " -"pour plus d'informations." +"Veuillez consulter le fichier /usr/share/doc/mariadb-server-10.0/README." +"Debian pour plus d'informations." -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "Password input error" -msgstr "Erreur de saisie du mot de passe" +#: ../mariadb-server-10.0.templates:6001 +msgid "Really migrate to MariaDB?" +msgstr "Souhaitez-vous migrer vers MariaDB ?" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "The two passwords you entered were not the same. Please try again." +#: ../mariadb-server-10.0.templates:6001 +msgid "" +"MariaDB is a drop-in replacement for MySQL. It will use your current " +"configuration file (my.cnf) and current databases." msgstr "" -"Le mot de passe et sa confirmation ne sont pas identiques. Veuillez " -"recommencer." +"MariaDB remplace à l'identique MySQL. Le fichier de configuration actuel (my." +"cnf) ainsi que les bases de données existantes seront utilisés." -#. Type: error -#. Description -#: ../mariadb-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "Abandon de la gestion de NDB" - -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 +#: ../mariadb-server-10.0.templates:6001 msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." +"Note that MariaDB has some enhanced features, which do not exist in MySQL " +"and thus migration back to MySQL might not always work, at least not as " +"automatically as migrating from MySQL to MariaDB." msgstr "" -"La version 5.1 de MySQL ne gère plus les grappes NDB. Vous devriez utiliser " -"le paquet mysql-cluster et supprimer toutes les lignes commençant par " -"« ndb » des fichiers de configuration situés dans /etc/mysql." +"Veuillez noter que MariaDB fournit des fonctionnalités améliorées qui " +"n'existent pas dans MySQL ce qui peut interdire un retour ultérieur à MySQL, " +"tout au moins de manière moins automatique que la migration de MySQL vers " +"MariaDB." -#~ msgid "" -#~ "To use MySQL, the following entries for users and groups should be added " -#~ "to the system:" -#~ msgstr "" -#~ "Pour pouvoir utiliser MySQL, les utilisateurs et les groupes suivants " -#~ "doivent être ajoutés au système :" +#~ msgid "New password for the MariaDB \"root\" user:" +#~ msgstr "Nouveau mot de passe du superutilisateur de MariaDB :" #~ msgid "" -#~ "Support MySQL connections from hosts running Debian \"sarge\" or older?" +#~ "While not mandatory, it is highly recommended that you set a password for " +#~ "the MariaDB administrative \"root\" user." #~ msgstr "" -#~ "Gérer les connexions d'hôtes qui utilisent les versions Debian « sarge » " -#~ "ou antérieures  ?" +#~ "Il est très fortement recommandé d'établir un mot de passe pour le compte " +#~ "d'administration de MariaDB (« root »)." -#~ msgid "" -#~ "In old versions of MySQL clients on Debian, passwords were not stored " -#~ "securely. This has been improved since then, however clients (such as " -#~ "PHP) from hosts running Debian 3.1 Sarge will not be able to connect to " -#~ "recent accounts or accounts whose password have been changed." +#~ 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é." + +#~ msgid "Repeat password for the MariaDB \"root\" user:" +#~ msgstr "Confirmation du mot de passe du superutilisateur de MariaDB :" + +#~ msgid "Password input error" +#~ msgstr "Erreur de saisie du mot de passe" + +#~ msgid "The two passwords you entered were not the same. Please try again." #~ msgstr "" -#~ "La méthode de stockage des mots de passe n'était pas très sûre dans les " -#~ "version précédentes de ce paquet. Cette méthode a été améliorée mais les " -#~ "modifications empêchent la connexion avec de nouveaux comptes ou des " -#~ "comptes dont le mot de passe a été modifié, pour les clients (p. ex. PHP) " -#~ "depuis des hôtes qui utilisent Debian 3.1 « sarge »." +#~ "Le mot de passe et sa confirmation ne sont pas identiques. Veuillez " +#~ "recommencer." diff --git a/debian/po/gl.po b/debian/po/gl.po index 30e5854..29bdb08 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1\n" "Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"POT-Creation-Date: 2015-01-31 14:00+0200\n" "PO-Revision-Date: 2007-04-20 09:44+0200\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" @@ -107,63 +107,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.0.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "¿Iniciar o servidor MariaDB co ordenador?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.0.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.0.templates:6001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "Novo contrasinal para o usuario \"root\" de MariaDB:" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Aínda que non é obrigatorio, recoméndase encarecidamente que estableza un " -"contrasinal para o usuario administrativo \"root\" de MariaDB." - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -#, fuzzy -#| msgid "If that field is left blank, the password will not be changed." -msgid "If this field is left blank, the password will not be changed." -msgstr "Se deixa o campo en branco, non se ha cambiar o contrasinal." - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:7001 -#, fuzzy -#| msgid "New password for the MySQL \"root\" user:" -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Novo contrasinal para o usuario \"root\" de MariaDB:" - #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 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.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 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 +127,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 #, fuzzy #| msgid "" #| "You should check the account's password after tha package installation." @@ -184,7 +136,7 @@ msgstr "Debería comprobar o contrasinal da conta trala instalación do paquete. #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 #, fuzzy #| msgid "" #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " @@ -196,54 +148,45 @@ msgstr "" "Consulte o ficheiro /usr/share/doc/mariadb-server-10.0/README.Debian para " "máis información." -#. Type: error -#. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "Password input error" -msgstr "" - -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "The two passwords you entered were not the same. Please try again." +#: ../mariadb-server-10.0.templates:6001 +msgid "Really migrate to MariaDB?" msgstr "" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" +#: ../mariadb-server-10.0.templates:6001 +msgid "" +"MariaDB is a drop-in replacement for MySQL. It will use your current " +"configuration file (my.cnf) and current databases." msgstr "" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 +#: ../mariadb-server-10.0.templates:6001 msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." +"Note that MariaDB has some enhanced features, which do not exist in MySQL " +"and thus migration back to MySQL might not always work, at least not as " +"automatically as migrating from MySQL to MariaDB." msgstr "" -#~ msgid "" -#~ "To use MariaDB, the following entries for users and groups should be " -#~ "added to the system:" -#~ msgstr "" -#~ "Para empregar MariaDB deberían engadirse ao sistema as seguintes entradas " -#~ "de usuarios e grupos:" +#~ msgid "New password for the MariaDB \"root\" user:" +#~ msgstr "Novo contrasinal para o usuario \"root\" de MariaDB:" #~ msgid "" -#~ "Support MySQL connections from hosts running Debian \"sarge\" or older?" +#~ "While not mandatory, it is highly recommended that you set a password for " +#~ "the MariaDB administrative \"root\" user." #~ msgstr "" -#~ "¿Soportar as conexións a MySQL de máquinas que empreguen Debian \"sarge\" " -#~ "ou anterior?" +#~ "Aínda que non é obrigatorio, recoméndase encarecidamente que estableza un " +#~ "contrasinal para o usuario administrativo \"root\" de MariaDB." -#~ msgid "" -#~ "In old versions of MySQL clients on Debian, passwords were not stored " -#~ "securely. This has been improved since then, however clients (such as " -#~ "PHP) from hosts running Debian 3.1 Sarge will not be able to connect to " -#~ "recent accounts or accounts whose password have been changed." -#~ msgstr "" -#~ "Nas versións antigas dos clientes MySQL de Debian, os contrasinais non se " -#~ "armacenaban de xeito seguro. Isto mellorouse desde aquela; nembargantes, " -#~ "os clientes (tales coma PHP) das máquinas que executen Debian 3.1 Sarge " -#~ "non se han poder conectar a contas recentes ou a contas nas que se " -#~ "cambiara o contrasinal." +#, fuzzy +#~| msgid "If that field is left blank, the password will not be changed." +#~ msgid "If this field is left blank, the password will not be changed." +#~ msgstr "Se deixa o campo en branco, non se ha cambiar o contrasinal." + +#, fuzzy +#~| msgid "New password for the MySQL \"root\" user:" +#~ msgid "Repeat password for the MariaDB \"root\" user:" +#~ msgstr "Novo contrasinal para o usuario \"root\" de MariaDB:" diff --git a/debian/po/it.po b/debian/po/it.po index bd39afe..1b22dbc 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -1,14 +1,13 @@ -# Italian (it) translation of debconf templates for mysql-dfsg-5.1 -# 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 , 2006 - 2009. +# Italian (it) translation of debconf templates for mariadb-10.0 +# This file is distributed under the same license as the mariadb-10.0 package. +# Luca Monducci , 2006-2014. # msgid "" msgstr "" -"Project-Id-Version: mysql-dfsg-5.1 5.1.37 italian debconf templates\n" +"Project-Id-Version: mariadb-10.0 10.0.13 italian debconf templates\n" "Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" -"PO-Revision-Date: 2009-08-08 11:03+0200\n" +"POT-Creation-Date: 2015-01-31 14:00+0200\n" +"PO-Revision-Date: 2014-08-30 18:35+0200\n" "Last-Translator: Luca Monducci \n" "Language-Team: Italian \n" "Language: it\n" @@ -46,8 +45,8 @@ 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." +"Non è garantito che la versione che sta per essere installata sia in grado " +"di usare i database presenti." #. Type: note #. Description @@ -62,8 +61,8 @@ msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" msgstr "" -"Per usare MariaDB con NIS/YP è necessario aggiungere al sistema locale un " -"account utente per mysql con:" +"Per usare MariaDB con NIS/YP è necessario aggiungere al sistema un account " +"utente locale con nome mysql con:" #. Type: note #. Description @@ -72,8 +71,8 @@ msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" msgstr "" -"Inoltre si devono verificare i permessi e la proprietà della directory /var/" -"lib/mysql:" +"Inoltre è opportuno verificare i permessi e la proprietà della directory /" +"var/lib/mysql:" #. Type: boolean #. Description @@ -88,8 +87,8 @@ msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." msgstr "" -"La directory /var/lib/mysql contenente i database di MariaDB sta per essere " -"eliminata." +"La directory /var/lib/mysql che contiene i database di MariaDB sta per " +"essere eliminata." #. Type: boolean #. Description @@ -103,59 +102,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.0.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "Lanciare il server MariaDB all'avvio?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.0.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.0.templates:6001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "Nuova password per l'utente «root» di MariaDB:" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Sebbene non sia obbligatoria, si raccomanda d'impostare una password per " -"l'utente d'amministrazione «root» di MariaDB." - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -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.0.templates:7001 -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Ripetere la password per l'utente «root» di MariaDB:" - #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 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.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 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,51 +123,67 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 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.0.templates:8001 -#, fuzzy -#| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " -#| "more information." +#: ../mariadb-server-10.0.templates:5001 msgid "" "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " "more information." msgstr "" -"Per maggiori informazioni si consulti il file /usr/share/doc/mariadb-" +"Per maggiori informazioni consultare il file /usr/share/doc/mariadb-" "server-10.0/README.Debian." -#. Type: error -#. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "Password input error" -msgstr "Errore di inserimento della password" - -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "Le due password inserite sono diverse. Riprovare." +#: ../mariadb-server-10.0.templates:6001 +msgid "Really migrate to MariaDB?" +msgstr "Migrare a MariaDB?" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "È in uso un cluster NDB" +#: ../mariadb-server-10.0.templates:6001 +msgid "" +"MariaDB is a drop-in replacement for MySQL. It will use your current " +"configuration file (my.cnf) and current databases." +msgstr "" +"MariaDB è un perfetto sostituto per MySQL. Utilizzerà l'attuale file di " +"configurazione (my.cnf) e i database presenti." -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 +#: ../mariadb-server-10.0.templates:6001 msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." +"Note that MariaDB has some enhanced features, which do not exist in MySQL " +"and thus migration back to MySQL might not always work, at least not as " +"automatically as migrating from MySQL to MariaDB." msgstr "" -"MySQL-5.1 non fornisce più il supporto per i cluster NDB. Si dovrebbe " -"migrare al nuovo pacchetto mysql-cluster e rimuovere tutte le righe che " -"iniziano per \"ndb\" da tutti i file di configurazione sotto /etc/mysql/." +"Notare che MariaDB dispone di alcune funzionalità avanzate che non esistono " +"in MySQL, di conseguenza non sempre funziona la migrazione all'indietro " +"verso MySQL, o almeno non è automatica come la migrazione da MySQL a MariaDB." + +#~ msgid "New password for the MariaDB \"root\" user:" +#~ msgstr "Nuova password per l'utente «root» di MariaDB:" + +#~ msgid "" +#~ "While not mandatory, it is highly recommended that you set a password for " +#~ "the MariaDB administrative \"root\" user." +#~ msgstr "" +#~ "Anche se non è obbligatorio, si raccomanda d'impostare una password per " +#~ "l'utente d'amministrazione «root» di MariaDB." + +#~ msgid "If this field is left blank, the password will not be changed." +#~ msgstr "Se questo campo è lasciato vuoto, la password non viene cambiata." + +#~ msgid "Repeat password for the MariaDB \"root\" user:" +#~ msgstr "Ripetere la password per l'utente «root» di MariaDB:" + +#~ msgid "Password input error" +#~ msgstr "Errore di inserimento della password" + +#~ msgid "The two passwords you entered were not the same. Please try again." +#~ msgstr "Le due password inserite sono diverse. Riprovare." diff --git a/debian/po/ja.po b/debian/po/ja.po index 4cc1904..76bdaff 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -14,10 +14,10 @@ # msgid "" msgstr "" -"Project-Id-Version: mysql-dfsg-5.1 5.1.37-1\n" +"Project-Id-Version: mariadb-10.0 10.0.32-1\n" "Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" -"PO-Revision-Date: 2009-09-01 08:25+0900\n" +"POT-Creation-Date: 2015-01-31 14:00+0200\n" +"PO-Revision-Date: 2013-09-09 18:48+0900\n" "Last-Translator: Hideki Yamane (Debian-JP) \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -111,59 +111,15 @@ msgstr "" "ケージを削除しようとしている、あるいは別の mariadb-server パッケージを既に" "使っている場合、データは保持する必要があります。" -#. Type: boolean -#. Description -#: ../mariadb-server-10.0.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "MariaDB をシステム起動時に開始しますか?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.0.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.0.templates:6001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "MariaDB の \"root\" ユーザに対する新しいパスワード:" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"強制ではありませんが、MariaDB を管理する \"root\" ユーザのパスワードを設定す" -"ることを強くお勧めします。" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -msgid "If this field is left blank, the password will not be changed." -msgstr "この値を空のままにしておいた場合は、パスワードは変更されません。" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:7001 -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "MariaDB の \"root\" ユーザに対する新しいパスワード:" - #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "MariaDB の \"root\" ユーザのパスワードを設定できません" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 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,50 +131,66 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "You should check the account's password after the package installation." msgstr "" "パッケージのインストール後、アカウントのパスワードを確認する必要があります。" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 -#, fuzzy -#| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " -#| "more information." +#: ../mariadb-server-10.0.templates:5001 msgid "" "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " "more information." msgstr "" "詳細は /usr/share/doc/mariadb-server-10.0/README.Debian を参照してください。" -#. Type: error -#. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "Password input error" -msgstr "パスワード入力エラー" - -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "入力された二つのパスワードが一致しません。再入力してください。" +#: ../mariadb-server-10.0.templates:6001 +msgid "Really migrate to MariaDB?" +msgstr "本当に MariaDB に移行しますか?" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "NDB クラスタが利用されているようです" +#: ../mariadb-server-10.0.templates:6001 +msgid "" +"MariaDB is a drop-in replacement for MySQL. It will use your current " +"configuration file (my.cnf) and current databases." +msgstr "" +"MariaDB は MySQL をそのまま置き換えられる代替です。現在の設定ファイル (my." +"cnf) と現在のデータベースを利用します。" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 +#: ../mariadb-server-10.0.templates:6001 msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." +"Note that MariaDB has some enhanced features, which do not exist in MySQL " +"and thus migration back to MySQL might not always work, at least not as " +"automatically as migrating from MySQL to MariaDB." msgstr "" -"MySQL-5.1 では NDB クラスタのサポートを提供しなくなっています。新たな mysql-" -"cluster パッケージに移行して、/etc/mysql 以下の設定ファイルすべてから「ndb」" -"で始まる行を削除してください。" +"MariaDB には MySQL に存在していない機能の拡張がいくらか存在し、そのため " +"MySQL に再び移行する場合は、MySQL から MariaDB への移行のような自動での移行が" +"常にできるとは限りません。" + +#~ msgid "New password for the MariaDB \"root\" user:" +#~ msgstr "MariaDB の \"root\" ユーザに対する新しいパスワード:" + +#~ msgid "" +#~ "While not mandatory, it is highly recommended that you set a password for " +#~ "the MariaDB administrative \"root\" user." +#~ msgstr "" +#~ "強制ではありませんが、MariaDB を管理する \"root\" ユーザのパスワードを設定" +#~ "することを強くお勧めします。" + +#~ msgid "If this field is left blank, the password will not be changed." +#~ msgstr "この値を空のままにしておいた場合は、パスワードは変更されません。" + +#~ msgid "Repeat password for the MariaDB \"root\" user:" +#~ msgstr "MariaDB の \"root\" ユーザに対する新しいパスワード:" + +#~ msgid "Password input error" +#~ msgstr "パスワード入力エラー" + +#~ msgid "The two passwords you entered were not the same. Please try again." +#~ msgstr "入力された二つのパスワードが一致しません。再入力してください。" diff --git a/debian/po/nb.po b/debian/po/nb.po index ed02ca1..e1087e0 100644 --- a/debian/po/nb.po +++ b/debian/po/nb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql_nb\n" "Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"POT-Creation-Date: 2015-01-31 14:00+0200\n" "PO-Revision-Date: 2007-02-18 12:13+0100\n" "Last-Translator: Bjørn Steensrud \n" "Language-Team: Norwegian Bokmål \n" @@ -111,67 +111,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.0.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.0.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.0.templates:6001 -#, fuzzy -#| msgid "New password for MySQL \"root\" user:" -msgid "New password for the MariaDB \"root\" user:" -msgstr "Nytt passord for MariaDBs «root»-bruker:" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -#, fuzzy -#| msgid "" -#| "It is highly recommended that you set a password for the MySQL " -#| "administrative \"root\" user." -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Det anbefales sterkt at du oppgir et passord for den administrative «root»-" -"brukeren i MariaDB." - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -msgid "If this field is left blank, the password will not be changed." -msgstr "" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:7001 -#, fuzzy -#| msgid "New password for MySQL \"root\" user:" -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Nytt passord for MariaDBs «root»-bruker:" - #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 #, fuzzy #| msgid "Unable to set password for MySQL \"root\" user" msgid "Unable to set password for the MariaDB \"root\" user" @@ -179,7 +121,7 @@ msgstr "Klarer ikke angi passord for MariaDBs «root»-bruker" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 #, fuzzy #| msgid "" #| "It seems an error occurred while setting the password for the MySQL " @@ -198,102 +140,58 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "You should check the account's password after the package installation." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "" "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " "more information." msgstr "" -#. Type: error -#. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "Password input error" -msgstr "" - -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "The two passwords you entered were not the same. Please try again." +#: ../mariadb-server-10.0.templates:6001 +msgid "Really migrate to MariaDB?" msgstr "" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" +#: ../mariadb-server-10.0.templates:6001 +msgid "" +"MariaDB is a drop-in replacement for MySQL. It will use your current " +"configuration file (my.cnf) and current databases." msgstr "" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 +#: ../mariadb-server-10.0.templates:6001 msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." +"Note that MariaDB has some enhanced features, which do not exist in MySQL " +"and thus migration back to MySQL might not always work, at least not as " +"automatically as migrating from MySQL to MariaDB." msgstr "" -#~ msgid "" -#~ "Support MySQL connections from hosts running Debian \"sarge\" or older?" -#~ msgstr "" -#~ "Skal MySQL-tilkoblinger støttes fra vertsmaskiner som kjører Debian " -#~ "«sarge» eller eldre?" +#, fuzzy +#~| msgid "New password for MySQL \"root\" user:" +#~ msgid "New password for the MariaDB \"root\" user:" +#~ msgstr "Nytt passord for MariaDBs «root»-bruker:" #, fuzzy #~| msgid "" -#~| "The way passwords were stored was not very secure. This has been " -#~| "improved with the drawback that clients (e.g. PHP) from hosts running " -#~| "Debian 3.1 Sarge will not be able to connect to account which are new or " -#~| "whose password have been changed. See /usr/share/doc/mysql-server-5.1/" -#~| "README.Debian." -#~ msgid "" -#~ "In old versions of MySQL clients on Debian, passwords were not stored " -#~ "securely. This has been improved since then, however clients (such as " -#~ "PHP) from hosts running Debian 3.1 Sarge will not be able to connect to " -#~ "recent accounts or accounts whose password have been changed." -#~ msgstr "" -#~ "Passord ble tidligere lagret på en lite sikker måte. Dette er nå " -#~ "forbedret, med den ulempen at klienter (f.eks. PHP) fra verter som kjører " -#~ "Debian 3.1 Sarge ikke vil kunne koble til en konto som er ny eller har " -#~ "fått endret passordet. Se /usr/share/doc/mysql-server-5.1/README.Debian." - -#~ 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 " -#~ "permissions (the uid/gid may be different)." -#~ msgstr "" -#~ "For å bruke MySQL må du installere en bruker og gruppe tilsvarende den " -#~ "nedenfor og se til at /var/lib/mysql har riktige rettigheter (uid/gid kan " -#~ "være forskjellig)." - -#~ msgid "" -#~ "/etc/passwd: mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false" -#~ msgstr "" -#~ "/etc/passwd: mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false" - -#~ msgid "/etc/group: mysql:x:101:" -#~ msgstr "/etc/group: mysql:x:101:" - -#~ msgid "/var/lib/mysql: drwxr-xr-x mysql mysql" -#~ msgstr "/var/lib/mysql: drwxr-xr-x mysql mysql" - -#~ msgid "Remove the databases used by all MySQL versions?" -#~ msgstr "Skal databasene brukt av alle MySQL-versjoner fjernes?" - +#~| "It is highly recommended that you set a password for the MySQL " +#~| "administrative \"root\" user." #~ msgid "" -#~ "If you do not provide a password no changes will be made to the account." +#~ "While not mandatory, it is highly recommended that you set a password for " +#~ "the MariaDB administrative \"root\" user." #~ msgstr "" -#~ "Hvis du ikke oppgir et passord blir det ikke gjort noen endringer med " -#~ "kontoen." +#~ "Det anbefales sterkt at du oppgir et passord for den administrative " +#~ "«root»-brukeren i MariaDB." -#~ msgid "" -#~ "When installation finishes, you should verify that the account is " -#~ "properly protected with a password (see README.Debian for more " -#~ "information)." -#~ msgstr "" -#~ "Når installasjonen er ferdig bør det sjekkes at kontoen er ordentlig " -#~ "beskyttet med et passord (mer informasjon finnes i README.Debian)." +#, fuzzy +#~| msgid "New password for MySQL \"root\" user:" +#~ msgid "Repeat password for the MariaDB \"root\" user:" +#~ msgstr "Nytt passord for MariaDBs «root»-bruker:" diff --git a/debian/po/nl.po b/debian/po/nl.po index a3694f6..c733ef0 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -1,26 +1,26 @@ -# Dutch mysql-dfsg-5.1 po-debconf translation, +# Dutch mariadb-10.0 po-debconf translation, # Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the mysql-dfsg-5.1 package. +# This file is distributed under the same license as the mariadb-10.0 package. # Vincent Zweije , 2006. +# Frans Spiesschaert , 2014. # msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1 5.0.30-1\n" "Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" -"PO-Revision-Date: 2006-02-19 10:20+0100\n" -"Last-Translator: Thijs Kinkhorst \n" -"Language-Team: Debian-Dutch \n" -"Language: \n" +"POT-Creation-Date: 2015-01-31 14:00+0200\n" +"PO-Revision-Date: 2014-09-28 22:51+0200\n" +"Last-Translator: Frans Spiesschaert \n" +"Language-Team: Debian Dutch l10n Team \n" +"Language: nl\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Type: boolean #. Description #: ../mariadb-server-10.0.templates:2001 -#, fuzzy -#| msgid "Do you really want to downgrade?" msgid "Really proceed with downgrade?" msgstr "Wilt u echt een oude versie herstellen?" @@ -29,24 +29,17 @@ msgstr "Wilt u echt een oude versie herstellen?" #: ../mariadb-server-10.0.templates:2001 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgstr "" +"Er bestaat een bestand genaamd /var/lib/mysql/debian-*.flag op dit systeem." #. Type: boolean #. Description #: ../mariadb-server-10.0.templates:2001 -#, fuzzy -#| msgid "" -#| "WARNING: The file /var/lib/mysql/debian-*.flag exists. This indicates " -#| "that a mysql-server package with a higher version has been installed " -#| "before. It can not be guaranteed that this version can use its data." msgid "" "Such a file is an indication that a mariadb-server package with a higher " "version has been installed previously." msgstr "" -"Waarschuwing: waarschijnlijk is een hogere versie van het mariadb-server " -"pakket geïnstalleerd geweest (het bestand /var/lib/mysql/debian-*.flag " -"bestaat). Er is geen garantie dat de gegevensbestanden, bewerkt met die " -"hogere versie, kunnen worden gebruikt met de versie van mysql die u nu " -"installeert." +"Zulk een bestand geeft aan dat er eerder een pakket mariadb-server met een " +"hogere versie is geĩnstalleerd." #. Type: boolean #. Description @@ -55,14 +48,14 @@ msgid "" "There is no guarantee that the version you're currently installing will be " "able to use the current databases." msgstr "" +"Er is geen garantie dat de versie die u op dit moment installeert de huidige " +"databases kan gebruiken." #. Type: note #. Description #: ../mariadb-server-10.0.templates:3001 -#, fuzzy -#| msgid "Important note for NIS/YP users!" msgid "Important note for NIS/YP users" -msgstr "Belangrijke opmerking voor gebruikers van NIS/YP!" +msgstr "Belangrijke opmerking voor gebruikers van NIS/YP" #. Type: note #. Description @@ -71,6 +64,8 @@ msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" msgstr "" +"Het gebruik van MariaDB onder NIS/YP vereist dat een mysql gebruikersaccount " +"wordt toegevoegd aan het lokale systeem met:" #. Type: note #. Description @@ -79,12 +74,14 @@ msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" msgstr "" +"U moet ook controleren wie eigenaar is en wat de gebruikersrechten zijn van " +"de map /var/lib/mysql:" #. Type: boolean #. Description #: ../mariadb-server-10.0.templates:4001 msgid "Remove all MariaDB databases?" -msgstr "" +msgstr "Wilt u alle MariaDB-databases verwijderen?" #. Type: boolean #. Description @@ -93,210 +90,106 @@ msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." msgstr "" +"De map /var/lib/mysql die de MariaDB-databases bevat staat op het punt om " +"verwijderd te worden." #. Type: boolean #. Description #: ../mariadb-server-10.0.templates:4001 -#, fuzzy -#| msgid "" -#| "The script is about to remove the data directory /var/lib/mysql. If it is " -#| "planned to just install a higher MySQL version or if a different mysql-" -#| "server package is already using it, the data should be kept." 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 "" -"Het script staat op het punt de datamap /var/lib/mysql te verwijderen. Als " -"het plan alleen maar is om een hogere MariaDB versie te installeren, of als " -"een ander mariadb-serverpakket de datamap al gebruikt, dan zou de data " -"moeten worden behouden." - -#. Type: boolean -#. Description -#: ../mariadb-server-10.0.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.0.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.0.templates:6001 -#, fuzzy -#| msgid "New password for MySQL \"root\" user:" -msgid "New password for the MariaDB \"root\" user:" -msgstr "Nieuw wachtwoord voor de MariaDB \"root\"-gebruiker:" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -#, fuzzy -#| msgid "" -#| "It is highly recommended that you set a password for the MySQL " -#| "administrative \"root\" user." -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Het wordt sterk aangeraden een wachtwoord in te stellen voor de " -"administratieve MariaDB \"root\"-gebruiker." - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -msgid "If this field is left blank, the password will not be changed." -msgstr "" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:7001 -#, fuzzy -#| msgid "New password for MySQL \"root\" user:" -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Nieuw wachtwoord voor de MariaDB \"root\"-gebruiker:" +"Als u het MariaDB-pakket verwijdert om later een meer recente versie te " +"installeren of als een ander mariadb-serverpakket het al gebruikt, zou de " +"data behouden moeten worden." #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 -#, fuzzy -#| msgid "Unable to set password for MySQL \"root\" user" +#: ../mariadb-server-10.0.templates:5001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "Kan het wachtwoord voor de MariaDB \"root\"-gebruiker niet instellen" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 -#, fuzzy -#| msgid "" -#| "It seems an error occurred while setting the password for the MySQL " -#| "administrative user. This may have happened because the user already has " -#| "a password, or because there was a problem communicating with the MySQL " -#| "server." +#: ../mariadb-server-10.0.templates:5001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " "because of a communication problem with the MariaDB server." msgstr "" -"Er lijkt een fout te zijn opgetreden bij het instellen van het wachtwoord " -"van de MariaDB administratieve gebruiker. Dat kan komen doordat de gebruiker " -"al een wachtwoord heeft, of omdat er een probleem was bij het communiceren " -"met de MariaDB server." +"Er is een fout opgetreden bij het instellen van het wachtwoord voor de " +"MariaDB-beheerder. Dat kan komen doordat het account al een wachtwoord " +"heeft, of omdat er een probleem was bij het communiceren met de MariaDB-" +"server." #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "You should check the account's password after the package installation." msgstr "" +"U zou het wachtwoord van het account moeten controleren nadat het pakket is " +"geĩnstalleerd." #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "" "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " "more information." msgstr "" +"Raadpleeg voor bijkomende informatie het bestand /usr/share/doc/mariadb-" +"server-10.0/README.Debian." -#. Type: error -#. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "Password input error" -msgstr "" - -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "" +#: ../mariadb-server-10.0.templates:6001 +msgid "Really migrate to MariaDB?" +msgstr "Wilt u echt overschakelen op MariaDB?" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" +#: ../mariadb-server-10.0.templates:6001 +msgid "" +"MariaDB is a drop-in replacement for MySQL. It will use your current " +"configuration file (my.cnf) and current databases." msgstr "" +"MariaDB is een volwaardige vervanger voor MySQL. Het zal de bestaande " +"configuratiebestanden (my.cnf) en de bestaande databases gebruiken." -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 +#: ../mariadb-server-10.0.templates:6001 msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." +"Note that MariaDB has some enhanced features, which do not exist in MySQL " +"and thus migration back to MySQL might not always work, at least not as " +"automatically as migrating from MySQL to MariaDB." msgstr "" +"Merk op dat MariaDB een aantal uitbreidingen heeft die niet bestaan in " +"MySQL. Daardoor zal terug overschakelen op MySQL niet altijd lukken, of " +"althans niet even automatisch als overschakelen van MySQL op MariaDB." -#~ msgid "" -#~ "Support MySQL connections from hosts running Debian \"sarge\" or older?" -#~ msgstr "" -#~ "Moet u MySQL-verbindingen accepteren van computers die Debian \"sarge\" " -#~ "of ouder draaien?" +#~ msgid "New password for the MariaDB \"root\" user:" +#~ msgstr "Nieuw wachtwoord voor de MariaDB \"root\"-gebruiker:" -#, fuzzy -#~| msgid "" -#~| "The way passwords were stored was not very secure. This has been " -#~| "improved with the drawback that clients (e.g. PHP) from hosts running " -#~| "Debian 3.1 Sarge will not be able to connect to account which are new or " -#~| "whose password have been changed. See /usr/share/doc/mysql-server-5.1/" -#~| "README.Debian." #~ msgid "" -#~ "In old versions of MySQL clients on Debian, passwords were not stored " -#~ "securely. This has been improved since then, however clients (such as " -#~ "PHP) from hosts running Debian 3.1 Sarge will not be able to connect to " -#~ "recent accounts or accounts whose password have been changed." +#~ "While not mandatory, it is highly recommended that you set a password for " +#~ "the MariaDB administrative \"root\" user." #~ msgstr "" -#~ "De wijze waarop wachtwoorden werden bewaard was niet erg veilig. Dit is " -#~ "verbeterd, maar helaas zullen programma's van computers die Debian 3.1 " -#~ "Sarge draaien, geen verbinding meer kunnen maken met accounts die nieuw " -#~ "zijn, of waarvan het wachtwoord is gewijzigd. Zie /usr/share/doc/mysql-" -#~ "server-5.1/README.Debian." +#~ "Hoewel niet verplicht, wordt het sterk aangeraden een wachtwoord in te " +#~ "stellen voor de \"root\"-gebruiker (beheerder) van MariaDB." -#~ 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 " -#~ "permissions (the uid/gid may be different)." +#~ msgid "If this field is left blank, the password will not be changed." #~ msgstr "" -#~ "Om mysql te gebruiken dient u een gebruiker en groep aan te maken, " -#~ "gelijkwaardig aan onderstaand voorbeeld, en u dient ervoor te zorgen dat /" -#~ "var/lib/mysql de bijbehorende toegangsrechten heeft (uid en gid mogen " -#~ "anders zijn)." +#~ "Als dit veld leeg wordt gelaten, zal het wachtwoord niet worden veranderd." -#~ msgid "" -#~ "/etc/passwd: mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false" -#~ msgstr "" -#~ "/etc/passwd: mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false" +#~ msgid "Repeat password for the MariaDB \"root\" user:" +#~ msgstr "Herhaal het wachtwoord voor de MariaDB \"root\"-gebruiker:" -#~ msgid "/etc/group: mysql:x:101:" -#~ msgstr "/etc/group: mysql:x:101:" +#~ msgid "Password input error" +#~ msgstr "Fout bij het invoeren van het wachtwoord" -#~ msgid "/var/lib/mysql: drwxr-xr-x mysql mysql" -#~ msgstr "/var/lib/mysql: drwxr-xr-x mysql mysql" - -#~ msgid "Remove the databases used by all MySQL versions?" -#~ msgstr "Databases verwijderen die door alle MySQL versies worden gebruikt?" - -#~ msgid "" -#~ "If you do not provide a password no changes will be made to the account." -#~ msgstr "" -#~ "Indien u geen wachtwoord opgeeft zal het account niet worden gewijzigd." - -#~ msgid "" -#~ "When installation finishes, you should verify that the account is " -#~ "properly protected with a password (see README.Debian for more " -#~ "information)." +#~ msgid "The two passwords you entered were not the same. Please try again." #~ msgstr "" -#~ "Wanneer de installatie klaar is, dient u te verifiëren dat het account " -#~ "netjes beschermd is met een wachtwoord (zie README.Debian voor meer " -#~ "informatie)." +#~ "De twee wachtwoorden die u invoerde waren niet gelijk. Probeer opnieuw." diff --git a/debian/po/pt.po b/debian/po/pt.po index 4f2e646..268a35f 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -1,14 +1,14 @@ # Portuguese translation for mysql-dfsg-5.1's debconf messages # Copyright (C) 2006 Miguel Figueiredo # This file is distributed under the same license as the mysql-dfsg-5.1 package. -# Miguel Figueiredo +# Miguel Figueiredo , 2014 # msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1\n" "Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" -"PO-Revision-Date: 2007-05-05 21:01+0100\n" +"POT-Creation-Date: 2015-01-31 14:00+0200\n" +"PO-Revision-Date: 2014-09-28 17:01+0100\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" "Language: pt\n" @@ -20,7 +20,7 @@ msgstr "" #. Description #: ../mariadb-server-10.0.templates:2001 msgid "Really proceed with downgrade?" -msgstr "Deseja mesmo fazer downgrade?" +msgstr "Deseja mesmo continuar com o downgrade?" #. Type: boolean #. Description @@ -31,15 +31,11 @@ msgstr "Existe um ficheiro chamado /var/lib/mysql/debian-*.flag neste sistema." #. Type: boolean #. Description #: ../mariadb-server-10.0.templates:2001 -#, fuzzy -#| msgid "" -#| "Such file is an indication that a mariadb-server package with a higher " -#| "version has been installed earlier." msgid "" "Such a file is an indication that a mariadb-server package with a higher " "version has been installed previously." msgstr "" -"Tal ficheiro significa que anteriormente foi instalado um pacote mariadb-" +"Tal ficheiro significa que anteriormente já foi instalado um pacote mariadb-" "server com um número de versão superior." #. Type: boolean @@ -50,13 +46,13 @@ msgid "" "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." +"seja capaz de utilizar as actuais bases de dados." #. Type: note #. Description #: ../mariadb-server-10.0.templates:3001 msgid "Important note for NIS/YP users" -msgstr "Nota importante para utilizadores de NIS/YP" +msgstr "Nota importante para os utilizadores de NIS/YP" #. Type: note #. Description @@ -65,19 +61,17 @@ msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" msgstr "" +"Utilizar MariaDB com NIS/YP necessita de uma conta de utilizador de mysql " +"para ser acrescentada ao sistema local com:" #. Type: note #. Description #: ../mariadb-server-10.0.templates:3001 -#, fuzzy -#| msgid "" -#| "You should also check the permissions and the owner of the /var/lib/mysql " -#| "directory:" msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" msgstr "" -"Deve também verificar as permissões e o dono do directório /var/lib/mysql :" +"Deve também verificar as permissões e o dono do directório /var/lib/mysql:" #. Type: boolean #. Description @@ -103,206 +97,97 @@ msgid "" "recent version or if a different mariadb-server package is already using it, " "the data should be kept." msgstr "" -"Se está a remover o pacote MariaDB de modo a posteriormente instalar uma " -"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.0.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "Iniciar o servidor MariaDB no arranque?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.0.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.0.templates:6001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "Nova palavra-passe para o utilizador \"root\" do MariaDB:" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Embora não seja mandatório, É fortemente recomendado que defina uma palavra-" -"passe para o utilizador administrativo \"root\" do MariaDB." - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -#, fuzzy -#| msgid "If that field is left blank, the password will not be changed." -msgid "If this field is left blank, the password will not be changed." -msgstr "" -"Se esse campo for deixado em branco, a palavra-passe não irá ser alterada." - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:7001 -#, fuzzy -#| msgid "New password for the MySQL \"root\" user:" -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Nova palavra-passe para o utilizador \"root\" do MariaDB:" +"Se está a remover o pacote MariaDB de forma a posteriormente instalar uma " +"versão mais recente ou se um pacote mariadb-server já o está a utilizar, " +"então os dados devem ser mantidos." #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 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 " +"Não foi possível definir a palavra-passe para o utilizador \"root\" de " "MariaDB" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " "because of a communication problem with the MariaDB server." msgstr "" "Ocorreu um erro enquanto era definida a palavra-passe para o utilizador " -"administrativo do MariaDB. Isto pode ter acontecido porque a cona já tem uma " -"palavra-passe, ou porque ocorreu um problema ao comunicação com o servidor " -"MariaDB." +"administrativo do MariaDB. Isto pode ter acontecido porque a conta já tem " +"uma palavra-passe, ou porque ocorreu um problema de comunicação com o " +"servidor MariaDB." #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 -#, fuzzy -#| msgid "" -#| "You should check the account's password after tha package installation." +#: ../mariadb-server-10.0.templates:5001 msgid "You should check the account's password after the package installation." -msgstr "" -"Você deve verificar a palavra-passe da conta após a instalação do pacote." +msgstr "Deve verificar a palavra-passe da conta após a instalação do pacote." #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 -#, fuzzy -#| msgid "" -#| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " -#| "more information." +#: ../mariadb-server-10.0.templates:5001 msgid "" "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " "more information." msgstr "" -"Para mais informação por favor leia o ficheiro /usr/share/doc/mariadb-" +"Para mais informações por favor leia o ficheiro /usr/share/doc/mariadb-" "server-10.0/README.Debian." -#. Type: error -#. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "Password input error" -msgstr "" - -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "" +#: ../mariadb-server-10.0.templates:6001 +msgid "Really migrate to MariaDB?" +msgstr "Realmente migrar para MariaDB?" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" +#: ../mariadb-server-10.0.templates:6001 +msgid "" +"MariaDB is a drop-in replacement for MySQL. It will use your current " +"configuration file (my.cnf) and current databases." msgstr "" +"MariaDB é um substituto para MySQL. Irá utilizar o seu ficheiro actual de " +"configuração (my.cnf) e bases de dados." -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 +#: ../mariadb-server-10.0.templates:6001 msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." +"Note that MariaDB has some enhanced features, which do not exist in MySQL " +"and thus migration back to MySQL might not always work, at least not as " +"automatically as migrating from MySQL to MariaDB." msgstr "" +"Note que MariaDB tem algumas funcionalidades melhoradas, as quais não " +"existem em MySQL e por isso a migração de volta para MySQL poderá nem sempre " +"funcionar, pelo menos não automaticamente como a migração de MySQL para " +"MariaDB." -#~ msgid "" -#~ "To use MariaDB, the following entries for users and groups should be " -#~ "added to the system:" -#~ msgstr "" -#~ "Para utilizar o MariaDB, têm de ser acrescentadas as seguintes entradas " -#~ "para os utilizadores e grupos:" - -#~ msgid "Cannot upgrade if ISAM tables are present!" -#~ msgstr "Não é possível actualizar se estiverem presentes tabelas ISAM!" - -#~ msgid "" -#~ "Recent versions of MySQL can no longer use the old ISAM table format and " -#~ "it is necessary to convert your tables to e.g. MyISAM before upgrading by " -#~ "using \"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". " -#~ "The installation of mysql-server-5.1 will now abort. In case your old " -#~ "mysql-server-4.1 gets removed nevertheless just reinstall it to convert " -#~ "those tables." -#~ msgstr "" -#~ "As versões recentes de MySQL já não podem utilizar o antigo formato de " -#~ "tabelas ISAM e é por isso necessário converter as suas tabelas pra e.g. " -#~ "MyISAM antes da actualização, utilizando \"mysql_convert_table_format\" " -#~ "ou \"ALTER TABLE x ENGINE=MyISAM\". A instalação de mysql-server-5.1 irá " -#~ "agora ser cancelada. Se o seu antigo mysql-server-4.1 for removido apenas " -#~ "reinstale para converter essas tabelas." - -#~ msgid "" -#~ "Support MySQL connections from hosts running Debian \"sarge\" or older?" -#~ msgstr "" -#~ "Suportar ligações MySQL de máquinas que corram Debian \"sarge\" ou mais " -#~ "antigos?" - -#~ msgid "" -#~ "In old versions of MySQL clients on Debian, passwords were not stored " -#~ "securely. This has been improved since then, however clients (such as " -#~ "PHP) from hosts running Debian 3.1 Sarge will not be able to connect to " -#~ "recent accounts or accounts whose password have been changed." -#~ msgstr "" -#~ "Nas versões antigas de clientes de MySQL em Debian, as palavras-passe não " -#~ "eram guardadas de forma segura. Isto foi melhorado desde aí, no entanto " -#~ "os clientes (como o PHP) de máquinas que corram Debian 3.1 Sarge não irão " -#~ "conseguir ligar-se a contas novas ou cuja palavra-passe foi alterada." +#~ msgid "New password for the MariaDB \"root\" user:" +#~ msgstr "Nova palavra-passe para o utilizador \"root\" do MariaDB:" #~ 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 " -#~ "permissions (the uid/gid may be different)." +#~ "While not mandatory, it is highly recommended that you set a password for " +#~ "the MariaDB administrative \"root\" user." #~ msgstr "" -#~ "Para utilizar mysql e instalar um utilizador e grupo equivalentes para o " -#~ "seguinte e assegurar-se que /var/lib/mysql têm as permissões correctas (o " -#~ "uid/gid podem ser diferentes)." +#~ "Embora não seja mandatório, é fortemente recomendado que defina uma " +#~ "palavra-passe para o utilizador administrativo \"root\" do MariaDB." -#~ msgid "" -#~ "/etc/passwd: mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false" +#~ msgid "If this field is left blank, the password will not be changed." #~ msgstr "" -#~ "/etc/passwd: mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false" - -#~ msgid "/etc/group: mysql:x:101:" -#~ msgstr "/etc/group: mysql:x:101:" +#~ "Se este campo for deixado em branco, a palavra-passe não será alterada." -#~ msgid "/var/lib/mysql: drwxr-xr-x mysql mysql" -#~ msgstr "/var/lib/mysql: drwxr-xr-x mysql mysql" +#~ msgid "Repeat password for the MariaDB \"root\" user:" +#~ msgstr "Repita a palavra-passe para o utilizador \"root\" do MariaDB:" -#~ msgid "Remove the databases used by all MySQL versions?" -#~ msgstr "Remover as bases de dados utilizadas por todas as versões de MySQL?" +#~ msgid "Password input error" +#~ msgstr "Erro de introdução de palavra-passe" -#~ msgid "" -#~ "If you do not provide a password no changes will be made to the account." -#~ msgstr "" -#~ "Se não disponibilizar uma password não serão feitas alterações nesta " -#~ "conta." - -#~ msgid "" -#~ "When installation finishes, you should verify that the account is " -#~ "properly protected with a password (see README.Debian for more " -#~ "information)." +#~ msgid "The two passwords you entered were not the same. Please try again." #~ msgstr "" -#~ "Quando terminar a instalação, deve verificar se a conta está devidamente " -#~ "protegida com uma password (para mais informações veja README.Debian)." +#~ "As duas palavras-passe que introduziu não são iguais. Por favor tente " +#~ "novamente." diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index 7cfa5a0..db1d9cb 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1\n" "Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" -"PO-Revision-Date: 2007-04-21 15:59-0300\n" +"POT-Creation-Date: 2015-01-31 14:00+0200\n" +"PO-Revision-Date: 2007-04-21 110.09-0300\n" "Last-Translator: André Luís Lopes \n" "Language-Team: Debian-BR Project \n" "Language: \n" @@ -110,63 +110,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.0.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.0.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.0.templates:6001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "Nova senha para o usuário \"root\" do MariaDB:" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Apesar de não ser mandatório, é altamente recomendado que você defina uma " -"senha para o usuário administrativo \"root\" do MariaDB." - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -#, fuzzy -#| msgid "If that field is left blank, the password will not be changed." -msgid "If this field is left blank, the password will not be changed." -msgstr "Caso este campo seja deixado em branco, a senha não sera mudada." - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:7001 -#, fuzzy -#| msgid "New password for the MySQL \"root\" user:" -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Nova senha para o usuário \"root\" do MariaDB:" - #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 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.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 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 +131,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 #, fuzzy #| msgid "" #| "You should check the account's password after tha package installation." @@ -188,7 +140,7 @@ msgstr "Você deverá checar a senha dessa conta após a instalação deste paco #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 #, fuzzy #| msgid "" #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " @@ -200,244 +152,45 @@ msgstr "" "Por favor, leia o arquivo /usr/share/doc/mariadb-server-10.0/README.Debian " "para maiores informações." -#. Type: error -#. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "Password input error" -msgstr "" - -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "The two passwords you entered were not the same. Please try again." +#: ../mariadb-server-10.0.templates:6001 +msgid "Really migrate to MariaDB?" msgstr "" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" +#: ../mariadb-server-10.0.templates:6001 +msgid "" +"MariaDB is a drop-in replacement for MySQL. It will use your current " +"configuration file (my.cnf) and current databases." msgstr "" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 +#: ../mariadb-server-10.0.templates:6001 msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." +"Note that MariaDB has some enhanced features, which do not exist in MySQL " +"and thus migration back to MySQL might not always work, at least not as " +"automatically as migrating from MySQL to MariaDB." msgstr "" -#~ msgid "" -#~ "To use MariaDB, the following entries for users and groups should be " -#~ "added to the system:" -#~ msgstr "" -#~ "Para utilizar o MariaDB, as seguintes entradas para usuários e grupos " -#~ "devem ser adicionadas ao sistema:" - -#~ msgid "" -#~ "Support MySQL connections from hosts running Debian \"sarge\" or older?" -#~ msgstr "" -#~ "Suportar conexões MySQL originadas de hosts executando o Debian \"sarge\" " -#~ "ou mais antigos ?" - -#~ msgid "" -#~ "In old versions of MySQL clients on Debian, passwords were not stored " -#~ "securely. This has been improved since then, however clients (such as " -#~ "PHP) from hosts running Debian 3.1 Sarge will not be able to connect to " -#~ "recent accounts or accounts whose password have been changed." -#~ msgstr "" -#~ "Em versões antigas dos clientes MySQL no Debian, as senhas não eram " -#~ "armazenadas de forma segura. Isto foi corrigido desde então, porém, " -#~ "clientes (como o PHP) em hosts executando o Debian 3.1 Sarge não serão " -#~ "capazes de conectar em contas recentes ou contas as quais as senhas " -#~ "tenham sido modificadas." +#~ msgid "New password for the MariaDB \"root\" user:" +#~ msgstr "Nova senha para o usuário \"root\" do MariaDB:" #~ 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 " -#~ "permissions (the uid/gid may be different)." +#~ "While not mandatory, it is highly recommended that you set a password for " +#~ "the MariaDB administrative \"root\" user." #~ msgstr "" -#~ "Para utilizar o MySQL, você deve instalar um usuário e um grupo " -#~ "equivalentes ao usuário e grupo a seguir para se certificar de que o " -#~ "diretório /var/lib/mysql possua as permissões correctas (o uid/gid podem " -#~ "ser diferentes)." - -#~ msgid "" -#~ "/etc/passwd: mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false" -#~ msgstr "" -#~ "/etc/passwd: mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false" - -#~ msgid "/etc/group: mysql:x:101:" -#~ msgstr "/etc/group: mysql:x:101:" - -#~ msgid "/var/lib/mysql: drwxr-xr-x mysql mysql" -#~ msgstr "/var/lib/mysql: drwxr-xr-x mysql mysql" - -#~ msgid "Remove the databases used by all MySQL versions?" -#~ msgstr "Remover as bases de dados utilizadas por todas as versões do MySQL?" - -#~ msgid "" -#~ "If you do not provide a password no changes will be made to the account." -#~ msgstr "" -#~ "Caso você não forneça uma senha, nenhuma mudança será feita na conta." - -#~ msgid "" -#~ "When installation finishes, you should verify that the account is " -#~ "properly protected with a password (see README.Debian for more " -#~ "information)." -#~ msgstr "" -#~ "Quando a instalação finalizar, você deverá verificar se a conta está " -#~ "apropriadamente protegida com uma senha (consulte o arquivo README.Debian " -#~ "para maiores informações)." - -#~ msgid "internal" -#~ msgstr "interno" - -#~ msgid "Only internally used." -#~ msgstr "Somente utilizado internamente." +#~ "Apesar de não ser mandatório, é altamente recomendado que você defina uma " +#~ "senha para o usuário administrativo \"root\" do MariaDB." #, fuzzy -#~ msgid "Update Hints" -#~ msgstr "Dicas de atualização" +#~| msgid "If that field is left blank, the password will not be changed." +#~ msgid "If this field is left blank, the password will not be changed." +#~ msgstr "Caso este campo seja deixado em branco, a senha não sera mudada." #, fuzzy -#~ msgid "" -#~ "Rarely, e.g. on new major versions, the privilege system is improved. To " -#~ "make use of it mysql_fix_privilege_tables must be executed manually. The " -#~ "script is not supposed to give any user more rights that he had before," -#~ msgstr "" -#~ "Raramente, por exemplo, em novas versões maiores, o sistema de " -#~ "privilégios é melhorado. Para fazer uso disso, o script " -#~ "mysql_fix_privilege_tables deve ser executado manualmente. O script não " -#~ "atribuirá a nenhum usuário mais direitos do que os mesmos já possuíam " -#~ "anteriormente." - -#~ msgid "Please also read http://www.mysql.com/doc/en/Upgrade.html" -#~ msgstr "Por favor, leia http://www.mysql.com/doc/en/Upgrade.html" - -#, fuzzy -#~ msgid "Install Hints" -#~ msgstr "Dicas de instalação" - -#, fuzzy -#~ msgid "" -#~ "MySQL will only install if you have a non-numeric hostname that is " -#~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command " -#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 " -#~ "myhostname\"." -#~ msgstr "" -#~ "O MySQL será instalado somente caso você possua um nome de host NÃO " -#~ "NUMÉRICO que possa ser resolvido através do arquivo /etc/hosts, ou seja, " -#~ "caso o comando \"hostname\" retorne \"myhostname\", uma linha como " -#~ "\"10.0.0.1 myhostname\" deverá existir no arquivo /etc/hosts." - -#~ msgid "" -#~ "A new mysql user \"debian-sys-maint\" will be created. This mysql account " -#~ "is used in the start/stop and cron scripts. Don't delete." -#~ msgstr "" -#~ "Um novo usuário MySQL de nome \"debian-sys-maint\" será criado. Essa " -#~ "conta MySQL é utilizada pelos scripts de inicialização/parada e pelos " -#~ "scripts cron. Não remova esse usuário." - -#, fuzzy -#~ msgid "" -#~ "Please remember to set a PASSWORD for the MySQL root user! If you use a /" -#~ "root/.my.cnf, always write the \"user\" and the \"password\" lines in " -#~ "there, never only the password!" -#~ msgstr "" -#~ "Por favor, lembre-se de definir uma SENHA para o usuário root do MySQL ! " -#~ "Caso você utilize um arquivo /root/.my.cnf, sempre inclua as linhas \"user" -#~ "\" e \"password\" nesse arquivo, nunca somente a senha ! Consulte o " -#~ "arquivo /usr/share/doc/mysql-server/README.Debian para mais informações." - -#~ msgid "" -#~ "Should I remove all databases below /var/lib/mysql as you are purging the " -#~ "mysql-server package?" -#~ msgstr "" -#~ "Todas as base de dados sob o diretório /var/lib/mysql devem ser removidas " -#~ "quando você remover o pacote pacote mysql-server ?" - -#~ msgid "" -#~ "Networking is disabled by default for security reasons. You can enable it " -#~ "by commenting out the skip-networking option in /etc/mysql/my.cnf." -#~ msgstr "" -#~ "O suporte ao funcionamento em rede está desativado por padrão por " -#~ "questões de segurança. Você poderá ativá-lo comentando a opção 'skip-" -#~ "networking' no arquivo /etc/mysql/my.cnf." - -#~ msgid "security and update notice" -#~ msgstr "aviso de segurança e actualização" - -#~ msgid "" -#~ "Should I remove everything below /var/lib/mysql when you purge the mysql-" -#~ "server package with the \"dpkg --purge mysql-server\" command (i.e. " -#~ "remove everything including the configuration) somewhen? (default is not)" -#~ msgstr "" -#~ "Devo remover tudo abaixo de /var/lib/mysql quando fizer o purge do pacote " -#~ "mysql-server com o comando \"dpkg --purge mysql-server\" (ou seja, " -#~ "remover tudo incluíndo a configuração)? (o padrão é não remover)" - -#~ msgid "Make MySQL reachable via network?" -#~ msgstr "Fazer com que o MySQL seja acessível via rede?" - -#~ msgid "" -#~ "Should MySQL listen on a network reachable TCP port? This is not " -#~ "necessary for use on a single computer and could be a security problem." -#~ msgstr "" -#~ "O MySQL deve aguardar ligações numa porta TCP acessível via rede? Isto " -#~ "não é necessário para uso num único computador e pode ser um problema de " -#~ "segurança." - -#~ msgid "Enable chroot mode?" -#~ msgstr "Activar o modo chroot?" - -#~ msgid "" -#~ "MySQL is able to jail itself into the /var/lib/mysql_jail directory so " -#~ "that users cannot modify any files outside this directory. This improves " -#~ "resistence against crackers, too, as they are not able to modify system " -#~ "files." -#~ msgstr "" -#~ "O MySQL é capaz de se prender no diretório /var/lib/mysql_jail, assim os " -#~ "utilizadores não poderão modificar ficheiros fora deste directório. Isto " -#~ "aumenta também a resistência contra crackers, pois eles não poderão " -#~ "modificar arquivos de sistema." - -#~ msgid "Please run mysql_fix_privilege_tables !" -#~ msgstr "Por favor execute mysql_fix_privilege_tables !" - -#~ msgid "" -#~ "I will ensure secure permissions of /var/lib/mysql by replacing GIDs " -#~ "other than root and mysql with mysql." -#~ msgstr "" -#~ "Permissões seguras para o diretório /var/lib/mysql serão asseguradas " -#~ "substituíndo GIDs diferentes de root e mysql por mysql." - -#~ msgid "" -#~ "Instructions how to enable SSL support are in /usr/share/doc/mysql-server/" -#~ msgstr "" -#~ "Instruções sobre como activar o suporte de SSL estão disponíveis no " -#~ "directório /usr/share/doc/mysql-server/." - -#, fuzzy -#~ msgid "mysql_fix_privileges_tables should be executed" -#~ msgstr "mysql_fix_privileges_tables será executado" - -#, fuzzy -#~ msgid "" -#~ "The latest MySQL versions have an enhanced, more fine grained, privilege " -#~ "system. To make use of it, some new fields must be added to the tables " -#~ "in the \"mysql\" database. This will not happen automatically." -#~ msgstr "" -#~ "As últimas versões do MySQL possuem um sistema de privilégios melhorado e " -#~ "mais refinado. Para utilizá-lo, alguns novos campos devem ser adicionados " -#~ "as tabelas na base de dados \"mysql\". Isto é feito pelo script " -#~ "mysql_fix_privileges_tables durante esta actualização independente do " -#~ "servidor estar a correr ou não !" - -#~ msgid "" -#~ "This script is not supposed to give any user more rights that he had " -#~ "before, if you encounter such a case, please contact me." -#~ msgstr "" -#~ "Este script não deverá fornecer mais direitos a um utilizador além dos " -#~ "quais ele já possua anteriormente. SE encontrar um caso desses, por favor " -#~ "entre em contacto com o mantainer deste pacote Debian." +#~| msgid "New password for the MySQL \"root\" user:" +#~ msgid "Repeat password for the MariaDB \"root\" user:" +#~ msgstr "Nova senha para o usuário \"root\" do MariaDB:" diff --git a/debian/po/ro.po b/debian/po/ro.po index a0c69e7..c3c521f 100644 --- a/debian/po/ro.po +++ b/debian/po/ro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: po-debconf://mysql-dfsg\n" "Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"POT-Creation-Date: 2015-01-31 14:00+0200\n" "PO-Revision-Date: 2006-12-20 21:27+0200\n" "Last-Translator: stan ioan-eugen \n" "Language-Team: romanian \n" @@ -111,67 +111,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.0.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.0.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.0.templates:6001 -#, fuzzy -#| msgid "New password for MySQL \"root\" user:" -msgid "New password for the MariaDB \"root\" user:" -msgstr "Noua parolă pentru utilizatorul „root” al MariaDB:" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -#, fuzzy -#| msgid "" -#| "It is highly recommended that you set a password for the MySQL " -#| "administrative \"root\" user." -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Este recomandat să stabiliţi o parolă pentru utilizatorul administrativ " -"„root” al MariaDB." - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -msgid "If this field is left blank, the password will not be changed." -msgstr "" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:7001 -#, fuzzy -#| msgid "New password for MySQL \"root\" user:" -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Noua parolă pentru utilizatorul „root” al MariaDB:" - #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 #, fuzzy #| msgid "Unable to set password for MySQL \"root\" user" msgid "Unable to set password for the MariaDB \"root\" user" @@ -179,7 +121,7 @@ msgstr "Nu s-a putut stabili parola pentru utilizatorul „root” al MariaDB" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 #, fuzzy #| msgid "" #| "It seems an error occurred while setting the password for the MySQL " @@ -198,123 +140,58 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "You should check the account's password after the package installation." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "" "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " "more information." msgstr "" -#. Type: error -#. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "Password input error" -msgstr "" - -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "The two passwords you entered were not the same. Please try again." +#: ../mariadb-server-10.0.templates:6001 +msgid "Really migrate to MariaDB?" msgstr "" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" +#: ../mariadb-server-10.0.templates:6001 +msgid "" +"MariaDB is a drop-in replacement for MySQL. It will use your current " +"configuration file (my.cnf) and current databases." msgstr "" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 +#: ../mariadb-server-10.0.templates:6001 msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." +"Note that MariaDB has some enhanced features, which do not exist in MySQL " +"and thus migration back to MySQL might not always work, at least not as " +"automatically as migrating from MySQL to MariaDB." msgstr "" -#~ msgid "Cannot upgrade if ISAM tables are present!" -#~ msgstr "Nu se poate face actualizarea dacă sunt prezente tabele ISAM!" - -#~ msgid "" -#~ "Recent versions of MySQL can no longer use the old ISAM table format and " -#~ "it is necessary to convert your tables to e.g. MyISAM before upgrading by " -#~ "using \"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". " -#~ "The installation of mysql-server-5.1 will now abort. In case your old " -#~ "mysql-server-4.1 gets removed nevertheless just reinstall it to convert " -#~ "those tables." -#~ msgstr "" -#~ "Versiunile recente MySQL nu mai pot folosi vechiul format de tabele ISAM " -#~ "şieste necesar să convertiţi tabelele dumneavoastră de ex. la formatul " -#~ "MyISAM înainte de a face actualizarea folosind comanda " -#~ "„mysql_convert_table_format” sau „ALTER TABLE x ENGINE=MyISAM”. " -#~ "Instalarea mysql-server-5.1 va eşua. În caz că ştergeţiversiunea " -#~ "anterioară mysql-server-4.1 va trebui reinstalată pentru a converti " -#~ "tabelele." - -#~ msgid "" -#~ "Support MySQL connections from hosts running Debian \"sarge\" or older?" -#~ msgstr "" -#~ "Suportaţi conexiuni MySQL de la staţii ce rulează sistemul Debian „sarge” " -#~ "sau mai vechi?" +#, fuzzy +#~| msgid "New password for MySQL \"root\" user:" +#~ msgid "New password for the MariaDB \"root\" user:" +#~ msgstr "Noua parolă pentru utilizatorul „root” al MariaDB:" #, fuzzy #~| msgid "" -#~| "The way passwords were stored was not very secure. This has been " -#~| "improved with the drawback that clients (e.g. PHP) from hosts running " -#~| "Debian 3.1 Sarge will not be able to connect to account which are new or " -#~| "whose password have been changed. See /usr/share/doc/mysql-server-5.1/" -#~| "README.Debian." -#~ msgid "" -#~ "In old versions of MySQL clients on Debian, passwords were not stored " -#~ "securely. This has been improved since then, however clients (such as " -#~ "PHP) from hosts running Debian 3.1 Sarge will not be able to connect to " -#~ "recent accounts or accounts whose password have been changed." -#~ msgstr "" -#~ "Modul în care erau păstrate parolele nu era foarte sigur. Acest lucru a " -#~ "fost îmbunătăţitcu dezajantajul că clienţii (de ex. PHP) de pe staţii ce " -#~ "rulează sistemul Debian 3.1 Sargenu se vor putea conecta la conturi noi " -#~ "sau ale căror parole au fost schimbate. Citiţi /usr/share/doc/mysql-" -#~ "server-5.1/README.Debian." - +#~| "It is highly recommended that you set a password for the MySQL " +#~| "administrative \"root\" user." #~ 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 " -#~ "permissions (the uid/gid may be different)." +#~ "While not mandatory, it is highly recommended that you set a password for " +#~ "the MariaDB administrative \"root\" user." #~ msgstr "" -#~ "Pentru a folosi mysql trebuie să adăugaţi un utilizator şi grup " -#~ "echivalent şi să vă asiguraţi că /var/lib/mysql are permisiunile " -#~ "stabilite corect (uid/gid pot aveavalori diferite)." - -#~ msgid "" -#~ "/etc/passwd: mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false" -#~ msgstr "" -#~ "/etc/passwd:\tmysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false" - -#~ msgid "/etc/group: mysql:x:101:" -#~ msgstr "/etc/group:\tmysql:x:101:" +#~ "Este recomandat să stabiliţi o parolă pentru utilizatorul administrativ " +#~ "„root” al MariaDB." -#~ msgid "/var/lib/mysql: drwxr-xr-x mysql mysql" -#~ msgstr "/var/lib/mysql:\tdrwxr-xr-x\tmysql\tmysql" - -#~ msgid "Remove the databases used by all MySQL versions?" -#~ msgstr "Doriţi să ştergeţi bazele de date folosite de toate versiune MySQL?" - -#~ msgid "" -#~ "If you do not provide a password no changes will be made to the account." -#~ msgstr "" -#~ "Dacă nu introduceţi nici o parolă, nici o schimbare nu va fi luată în " -#~ "considerare." - -#~ msgid "" -#~ "When installation finishes, you should verify that the account is " -#~ "properly protected with a password (see README.Debian for more " -#~ "information)." -#~ msgstr "" -#~ "După finalizarea instalării, ar trebui să verificaţi dacă contul este " -#~ "protejat cu o parolă (citiţi fişierul README.Debian pentru informaţii " -#~ "suplimentare)." +#, fuzzy +#~| msgid "New password for MySQL \"root\" user:" +#~ msgid "Repeat password for the MariaDB \"root\" user:" +#~ msgstr "Noua parolă pentru utilizatorul „root” al MariaDB:" diff --git a/debian/po/ru.po b/debian/po/ru.po index e1e73ee..bb8d8aa 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -1,32 +1,22 @@ # translation of ru.po to Russian -# Russian messages: -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry'# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans# -# Developers do not need to manually edit POT or PO files. # # Ilgiz Kalmetev , 2003. # Yuriy Talakan' , 2005, 2006. # Yuriy Talakan' , 2007. -# Yuri Kozlov , 2009. +# Yuri Kozlov , 2009, 2014. msgid "" msgstr "" -"Project-Id-Version: mysql-dfsg-5.1 5.1.37-1\n" +"Project-Id-Version: mariadb 10.0_10.0.32-1\n" "Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" -"PO-Revision-Date: 2009-08-06 20:27+0400\n" +"POT-Creation-Date: 2015-01-31 14:00+0200\n" +"PO-Revision-Date: 2014-01-07 07:18+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.4\n" "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" @@ -113,59 +103,15 @@ msgstr "" "есть другие пакеты mariadb-server, использующие этот каталог, то данные " "лучше сохранить." -#. Type: boolean -#. Description -#: ../mariadb-server-10.0.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "Запускать MariaDB при загрузке системы?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.0.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.0.templates:6001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "Новый пароль для MariaDB пользователя \"root\":" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Хотя и необязательно, но настоятельно рекомендуется установить пароль для " -"административного пользователя MariaDB \"root\"." - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -msgid "If this field is left blank, the password will not be changed." -msgstr "Если оставить поле пустым, то пароль изменён не будет." - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:7001 -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Повторите ввод пароля для MariaDB пользователя \"root\":" - #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "Unable to set password for the MariaDB \"root\" user" -msgstr "Невозможно задать пароль MariaDB пользователю \"root\"" +msgstr "Невозможно задать пароль MariaDB пользователю «root»" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 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,49 +123,66 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "You should check the account's password after the package installation." msgstr "Проверьте пароль учётной записи после установки пакета." #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 -#, fuzzy -#| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " -#| "more information." +#: ../mariadb-server-10.0.templates:5001 msgid "" "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " "more information." msgstr "" -"Подробности см. в файле /usr/share/doc/mariadb-server-10.0/README.Debian." - -#. Type: error -#. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "Password input error" -msgstr "Ошибка ввода пароля" +"Подробности смотрите в файле /usr/share/doc/mariadb-server-10.0/README." +"Debian." -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "Два введённых пароля не одинаковы. Повторите ввод." +#: ../mariadb-server-10.0.templates:6001 +msgid "Really migrate to MariaDB?" +msgstr "Хотите перейти на MariaDB?" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "NDB Cluster уже используется" +#: ../mariadb-server-10.0.templates:6001 +msgid "" +"MariaDB is a drop-in replacement for MySQL. It will use your current " +"configuration file (my.cnf) and current databases." +msgstr "" +"MariaDB — современная замена MySQL. Будет использован ваш файл настроек (my." +"cnf) и имеющиеся базы данных." -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 +#: ../mariadb-server-10.0.templates:6001 msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." +"Note that MariaDB has some enhanced features, which do not exist in MySQL " +"and thus migration back to MySQL might not always work, at least not as " +"automatically as migrating from MySQL to MariaDB." msgstr "" -"MySQL-5.1 больше не поддерживает NDB Cluster. Переходите на новый пакет " -"mysql-cluster и удалите все строки, начинающиеся с \"ndb\", из всех файлов " -"настройки в каталоге /etc/mysql/." +"Заметим, что MariaDB имеет дополнительные возможности, которые отсутствуют в " +"MySQL, и поэтому обратный переход на MySQL не всегда может быть выполнен, по " +"крайней мере, не в автоматическом режиме как с MySQL на MariaDB." + +#~ msgid "New password for the MariaDB \"root\" user:" +#~ msgstr "Новый пароль для MariaDB пользователя «root»:" + +#~ msgid "" +#~ "While not mandatory, it is highly recommended that you set a password for " +#~ "the MariaDB administrative \"root\" user." +#~ msgstr "" +#~ "Хотя и необязательно, но настоятельно рекомендуется установить пароль для " +#~ "административного пользователя MariaDB «root»." + +#~ msgid "If this field is left blank, the password will not be changed." +#~ msgstr "Если оставить поле пустым, то пароль изменён не будет." + +#~ msgid "Repeat password for the MariaDB \"root\" user:" +#~ msgstr "Повторите ввод пароля для MariaDB пользователя «root»:" + +#~ msgid "Password input error" +#~ msgstr "Ошибка ввода пароля" + +#~ msgid "The two passwords you entered were not the same. Please try again." +#~ msgstr "Два введённых пароля не одинаковы. Повторите ввод." diff --git a/debian/po/sv.po b/debian/po/sv.po index 788349f..b9daacc 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -1,23 +1,22 @@ -# Translation of mysql-dfsg-5.1 debconf template to Swedish -# Copyright (C) 2009 Martin Bagge -# This file is distributed under the same license as the mysql-dfsg-5.1 package. +# Translation of mariadb-10.0 debconf template to Swedish +# Copyright (C) 2015 Martin Bagge +# This file is distributed under the same license as the mariadb-10.0 package. # # Andreas Henriksson , 2007 -# Martin Bagge , 2009 +# Martin Bagge , 2009, 2015 msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1 5.0.21-3\n" "Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" -"PO-Revision-Date: 2009-09-08 21:42+0100\n" -"Last-Translator: Martin Bagge \n" +"POT-Creation-Date: 2015-01-31 14:00+0200\n" +"PO-Revision-Date: 2015-04-01 18:11+0100\n" +"Last-Translator: Martin Bagge / brother \n" "Language-Team: Swedish \n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Swedish\n" -"X-Poedit-Country: Sweden\n" +"X-Generator: Poedit 1.7.3\n" #. Type: boolean #. Description @@ -105,59 +104,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.0.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "Ska MariaDB startas vid systemets uppstart?" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.0.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.0.templates:6001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "Nytt lösenord för MariaDBs \"root\"-användare:" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Det är inte obligatoriskt men starkt rekommenderat att du sätter ett " -"lösenord för MariaDBs administrativa \"root\"-användare." - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -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.0.templates:7001 -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Repetera lösenordet för MariaDBs \"root\"-användare:" - #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 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.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 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,17 +125,13 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 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.0.templates:8001 -#, fuzzy -#| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " -#| "more information." +#: ../mariadb-server-10.0.templates:5001 msgid "" "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " "more information." @@ -188,39 +139,31 @@ msgstr "" "Läs filen /usr/share/doc/mariadb-server-10.0/README.Debian för mer " "information." -#. Type: error -#. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "Password input error" -msgstr "Fel vid inmatning av lösenord" - -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:9001 -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." +#: ../mariadb-server-10.0.templates:6001 +msgid "Really migrate to MariaDB?" +msgstr "Ska migreringen till MariaDB fortsätta?" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "NDB-kluster används inte" +#: ../mariadb-server-10.0.templates:6001 +msgid "" +"MariaDB is a drop-in replacement for MySQL. It will use your current " +"configuration file (my.cnf) and current databases." +msgstr "" +"MariaDB är en ersättare för MySQL som helt och hållet fyller platsen efter " +"MySQL. Den kommer att använda din nuvarande inställningsfil (my.cnf) och " +"nuvarande databaser." -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 +#: ../mariadb-server-10.0.templates:6001 msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." +"Note that MariaDB has some enhanced features, which do not exist in MySQL " +"and thus migration back to MySQL might not always work, at least not as " +"automatically as migrating from MySQL to MariaDB." msgstr "" -"Stödet för NDB-kluster har tagits bort i MySQL-5.1. Migrera till det nya " -"paketet mysql-cluster och ta bort alla rader som inleds med \"ndb\" från " -"alla inställlningsfiler i /etc/mysql/." - -#~ msgid "" -#~ "To use MySQL, the following entries for users and groups should be added " -#~ "to the system:" -#~ msgstr "" -#~ "För att använda MySQL måste följande användare och grupper läggas till i " -#~ "systemet:" +"Observera att det finns ett antal förbättrade funktioner som inte finns i " +"MySQL, att gå tillbaka till MySQL är därför inte garanterat fungerande. " +"Åtminstone med samma automatik som från MySQL till MariaDB." diff --git a/debian/po/templates.pot b/debian/po/templates.pot index b046b06..f064014 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: mariadb-10.0\n" "Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"POT-Creation-Date: 2015-01-31 14:00+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -90,55 +90,15 @@ msgid "" "the data should be kept." msgstr "" -#. Type: boolean -#. Description -#: ../mariadb-server-10.0.templates:5001 -msgid "Start the MariaDB server on boot?" -msgstr "" - -#. Type: boolean -#. Description -#: ../mariadb-server-10.0.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.0.templates:6001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -msgid "If this field is left blank, the password will not be changed." -msgstr "" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:7001 -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "" - #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 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,41 +107,37 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "You should check the account's password after the package installation." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "" "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " "more information." msgstr "" -#. Type: error -#. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "Password input error" -msgstr "" - -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "The two passwords you entered were not the same. Please try again." +#: ../mariadb-server-10.0.templates:6001 +msgid "Really migrate to MariaDB?" msgstr "" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" +#: ../mariadb-server-10.0.templates:6001 +msgid "" +"MariaDB is a drop-in replacement for MySQL. It will use your current " +"configuration file (my.cnf) and current databases." msgstr "" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 +#: ../mariadb-server-10.0.templates:6001 msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." +"Note that MariaDB has some enhanced features, which do not exist in MySQL " +"and thus migration back to MySQL might not always work, at least not as " +"automatically as migrating from MySQL to MariaDB." msgstr "" diff --git a/debian/po/tr.po b/debian/po/tr.po index a648bf3..91533d6 100644 --- a/debian/po/tr.po +++ b/debian/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-4.1\n" "Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" -"POT-Creation-Date: 2012-01-12 13:08+0100\n" +"POT-Creation-Date: 2015-01-31 14:00+0200\n" "PO-Revision-Date: 2004-06-05 08:53+0300\n" "Last-Translator: Gürkan Aslan \n" "Language-Team: Turkish \n" @@ -91,61 +91,15 @@ msgid "" "the data should be kept." msgstr "" -#. Type: boolean -#. Description -#: ../mariadb-server-10.0.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.0.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.0.templates:6001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:6001 -msgid "If this field is left blank, the password will not be changed." -msgstr "" - -#. Type: password -#. Description -#: ../mariadb-server-10.0.templates:7001 -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "" - #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 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,189 +108,37 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "You should check the account's password after the package installation." msgstr "" #. Type: error #. Description -#: ../mariadb-server-10.0.templates:8001 +#: ../mariadb-server-10.0.templates:5001 msgid "" "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " "more information." msgstr "" -#. Type: error -#. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "Password input error" -msgstr "" - -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:9001 -msgid "The two passwords you entered were not the same. Please try again." +#: ../mariadb-server-10.0.templates:6001 +msgid "Really migrate to MariaDB?" msgstr "" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" +#: ../mariadb-server-10.0.templates:6001 +msgid "" +"MariaDB is a drop-in replacement for MySQL. It will use your current " +"configuration file (my.cnf) and current databases." msgstr "" -#. Type: error +#. Type: boolean #. Description -#: ../mariadb-server-10.0.templates:10001 +#: ../mariadb-server-10.0.templates:6001 msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." +"Note that MariaDB has some enhanced features, which do not exist in MySQL " +"and thus migration back to MySQL might not always work, at least not as " +"automatically as migrating from MySQL to MariaDB." msgstr "" - -#~ 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 " -#~ "permissions (the uid/gid may be different)." -#~ msgstr "" -#~ "Mysql'i kullanmak için aşağıdakiyle eşdeğer bir kullanıcı ve grup " -#~ "tanımlamalı, ve /var/lib/mysql izinlerinin uygun şekilde ayarlandığından " -#~ "emin olmalısınız (uid/gid farklı olabilir)." - -#~ msgid "" -#~ "/etc/passwd: mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false" -#~ msgstr "" -#~ "/etc/passwd: mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false" - -#~ msgid "/etc/group: mysql:x:101:" -#~ msgstr "/etc/group: mysql:x:101:" - -#~ msgid "/var/lib/mysql: drwxr-xr-x mysql mysql" -#~ msgstr "/var/lib/mysql: drwxr-xr-x mysql mysql" - -#, fuzzy -#~ msgid "Please also read http://www.mysql.com/doc/en/Upgrade.html" -#~ msgstr "Lütfen http://www.mysql.com/doc/en/Upgrade.html belgesini okuyun" - -#, fuzzy -#~ msgid "" -#~ "MySQL will only install if you have a non-numeric hostname that is " -#~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command " -#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 " -#~ "myhostname\"." -#~ msgstr "" -#~ "MySQL sadece /etc/hosts dosyası yoluyla çözülebilir NUMERİK OLMAYAN bir " -#~ "makine adına sahipseniz kurulacaktır. Örneğin, eğer \"hostname\" komutu " -#~ "\"makinem\" ismini döndürüyorsa, bu dosya içinde \"10.0.0.1 makinem\" " -#~ "gibi bir satır olmalıdır." - -#, fuzzy -#~ msgid "" -#~ "A new mysql user \"debian-sys-maint\" will be created. This mysql account " -#~ "is used in the start/stop and cron scripts. Don't delete." -#~ msgstr "" -#~ "Yeni mysql kullanıcısı \"debian-sys-maint\" yaratılacak. Bu hesap, " -#~ "başlangıç betiklerinde ve cron içinde kullanılıyor. Bu hesabı silmeyin." - -#, fuzzy -#~ msgid "" -#~ "Please remember to set a PASSWORD for the MySQL root user! If you use a /" -#~ "root/.my.cnf, always write the \"user\" and the \"password\" lines in " -#~ "there, never only the password!" -#~ msgstr "" -#~ "Lütfen MySQL root kullanıcısı için bir PAROLA girmeyi unutmayın! Eğer /" -#~ "root/.my.cnf kullanıyorsanız, \"user\" ve \"password\" satırlarını her " -#~ "zaman buraya ekleyin, sadece parolayı değil! Daha fazla bilgi için /usr/" -#~ "share/doc/mysql-server/README.Debian dosyasını okuyun." - -#, fuzzy -#~ msgid "" -#~ "Should I remove all databases below /var/lib/mysql as you are purging the " -#~ "mysql-server package?" -#~ msgstr "" -#~ "mysql-server paketi kaldırıldıktan sonra bütün veritabanları silinsin mi?" - -#~ msgid "" -#~ "Networking is disabled by default for security reasons. You can enable it " -#~ "by commenting out the skip-networking option in /etc/mysql/my.cnf." -#~ msgstr "" -#~ "Ağ, öntanımlı olarak güvenlik gerekçeleriyle devre dışı bırakıldı. Bu " -#~ "özelliği /etc/mysql/my.cnf dosyası içindeki \"skip-networking\" " -#~ "seçeneğini kaldırarak etkinleştirebilirsiniz." - -#~ msgid "security and update notice" -#~ msgstr "güvenlik ve güncelleme duyurusu" - -#~ msgid "" -#~ "Should I remove everything below /var/lib/mysql when you purge the mysql-" -#~ "server package with the \"dpkg --purge mysql-server\" command (i.e. " -#~ "remove everything including the configuration) somewhen? (default is not)" -#~ msgstr "" -#~ "mysql-server paketini temizlemek için \"dpkg --purge mysql-server\" " -#~ "komutunu kullandığınızda (yani yapılandırma dahil herşeyi silmek) /var/" -#~ "lib/mysql altındaki herşeyi sileyim mi? (öntanımlı cevap hayır'dır)." - -#~ msgid "Please run mysql_fix_privilege_tables !" -#~ msgstr "Lütfen mysql_fix_privilege_tables komutunu çalıştırın!" - -#~ msgid "" -#~ "I will ensure secure permissions of /var/lib/mysql by replacing GIDs " -#~ "other than root and mysql with mysql." -#~ msgstr "" -#~ "/var/lib/mysql'in izinlerinin güvenli olmasını sağlamak amacıyla, buna " -#~ "ait GID'leri root ve mysql'den farklı olacak şekilde değiştireceğim." - -#~ msgid "" -#~ "Instructions how to enable SSL support are in /usr/share/doc/mysql-server/" -#~ msgstr "" -#~ "SSL desteğini nasıl etkinleştirebileceğinize ilişkin talimatlar /usr/" -#~ "share/doc/mysql-server/ içinde." - -#~ msgid "mysql_fix_privileges_tables will be executed" -#~ msgstr "mysql_fix_privileges_tables çalıştırılacak" - -#~ msgid "" -#~ "The latest MySQL versions have an enhanced, more fine grained, privilege " -#~ "system. To make use of it, some new fields must be added to the tables " -#~ "in the \"mysql\" database. This is done by the " -#~ "mysql_fix_privilege_tables script during this upgrade regardless of if " -#~ "the server is currently running or not!" -#~ msgstr "" -#~ "En son MySQL sürümleri zenginleştirilmiş, daha ayrıntılandırılmış bir " -#~ "ayrıcalık (privilege) sistemine sahiptir. Yeni sistemi kullanmak için, " -#~ "\"mysql\" veritabanındaki tablolara bazı yeni alanlar eklenmelidir. Bu " -#~ "işlem, sunucunun çalışıp çalışmamasına bağlı olmaksızın " -#~ "mysql_fix_privilege_tables betiği tarafından bu yükseltme sırasında " -#~ "yapılır." - -#~ msgid "" -#~ "This script is not supposed to give any user more rights that he had " -#~ "before, if you encounter such a case, please contact me." -#~ msgstr "" -#~ "Bu betiğin hiç bir kullanıcıya öncekinden daha fazla hak kazandırmadığı " -#~ "varsayılıyor. Eğer bunun aksinde bir durumla karşılaşırsanız, lütfen " -#~ "benimle bağlantıya geçin." - -#~ msgid "Make MySQL reachable via network?" -#~ msgstr "MySQL network üzerinden ulaşılabilir olsun mu?" - -#~ msgid "" -#~ "Should MySQL listen on a network reachable TCP port? This is not " -#~ "necessary for use on a single computer and could be a security problem." -#~ msgstr "" -#~ "MySQL ağ üzerinde ulaşılabilen bir TCP portunu dinlesin mi? Tek olan bir " -#~ "bilgisayar için bu ayar gerekli değildir ve bir güvenlik sorunu " -#~ "oluşturabilir." - -#~ msgid "Enable chroot mode?" -#~ msgstr "chroot kipi etkinleştirilsin mi?" - -#~ msgid "" -#~ "MySQL is able to jail itself into the /var/lib/mysql_jail directory so " -#~ "that users cannot modify any files outside this directory. This improves " -#~ "resistence against crackers, too, as they are not able to modify system " -#~ "files." -#~ msgstr "" -#~ "MySQL kendini /var/lib/mysql_jail dizinine hapsederek kullanıcıların bu " -#~ "dizin dışındaki hiç bir dosyayı değiştirmemesini sağlayabilir. Bu " -#~ "düzenleme, sistem dosyalarını değiştirmelerini engelleyeceğinden, " -#~ "cracker'lara karşı dayanıklılığı arttırır." diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..6e69caa --- /dev/null +++ b/debian/rules @@ -0,0 +1,186 @@ +#!/usr/bin/make -f + +export DH_VERBOSE=1 + +# enable Debian Hardening +# see: https://wiki.debian.org/Hardening +export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie # # why -pie? In fact, 10.1 builds with pie by default, it doesn't need any # additional debian hardening. ##=> ok, let's enable it # +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_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM) +DEBVERSION := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' ) +DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':')) +DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') +DEB_NOEPOCH_VERSION ?= $(shell echo $(DEB_VERSION) | cut -d: -f2-) +DEB_UPSTREAM_VERSION ?= $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//') +DEB_UPSTREAM_VERSION_MAJOR_MINOR := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -r -n 's/^([0-9]+\.[0-9]+).*/\1/p') +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +DISTRIBUTION := $(shell lsb_release -i -s) +RELEASE := $(shell lsb_release -r -s) +TMP:=$(CURDIR)/debian/tmp + + +export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc +export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++ # # oops. In the old files MYSQL_BUILD_CXX and MYSQL_BUILD_CC can be # set by the *user* to specify what compiler to use. # furthermore it's used in a conditional ${MYSQL_BUILD_CC:gcc} which # kind of implies that MYSQL_BUILD_CC can be unset. # if you overwrite it, this kills the whole idea. # ##=> is was this way in the downstream and it may be risky to change it # # ok, then either # 1. remove these assignments (which may be risky) # or # 2. remove the conditional, remove "export", that is make these two # pure Makefile variables and use them with no conditional. Like # # CC := $(DEB_HOST_GNU_TYPE)-gcc #..... # CC=$(CC) cmake # + +# Parallel build support as adviced +# 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))) + # Even though at later point the MAKEFLAGS variable will end up + # having the -j option without a parameter, in test builds it has been + # confirmed that the NUMJOBS really doeas has an effect via MAKEFLAGS magic. + # MAKEFLAGS magic will later also add the -jobserver option. # ##=> let's remove the comment # + MAKEFLAGS += -j $(NUMJOBS) +endif + +# This is removed in mysql-5.6 and a candidate for removal in MariaDB too # # I'm ok with it # +USE_ASSEMBLER:=--enable-assembler +ifneq (,$(filter $(ARCH), i386 kfreebsd-i386 hurd-i386)) + TAOCRYPT_OPT="-DTAOCRYPT_DISABLE_X86ASM" +endif + +# Skip TokuDB if arch is not amd64 +ifneq ($(ARCH), amd64) + CMAKEFLAGS += -DWITHOUT_TOKUDB=true +endif # # should not be needed, TokuDB is automatically disabled # on non-amd64 platforms # + +# Completely disable TokuDB as it fails to build on some platforms and +# upstream developers do not seem to have fixing those on their roadmap +# See https://lists.launchpad.net/maria-developers/msg08390.html +CMAKEFLAGS += -DWITHOUT_TOKUDB=true # # we should fix it. for now at least add a link to MDEV here # + +# Skip Mroonga if arch is not amd64 +ifneq ($(ARCH), amd64) + CMAKEFLAGS += -DWITHOUT_MROONGA=true +endif # # add a link to MDEV here # + +# Add support for verbose builds +MAKEFLAGS += VERBOSE=1 + +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 # # we never run tests like that, they aren't guaranteed to work # +endif + +ifneq (,$(filter $(ARCH), amd64 kfreebsd-amd64 i386 kfreebsd-i386 ia64 s390 s390x)) + TESTSUITE_FAIL_CMD:=exit 1 +else + TESTSUITE_FAIL_CMD:=true +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 # # that's a pretty weird "clean" target. # why is it like that? # + +override_dh_prep: + # Don't clean /tmp/ away, it is needed by all binary packages # # Why? # + +override_dh_auto_configure: + @echo "RULES.$@" + dh_testdir + + ( test -d $(BUILDDIR) || mkdir $(BUILDDIR) ) && cd $(BUILDDIR) && \ # # mkdir -p $(BUILDDIR) and no need to test # + sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/usr/local/bin:/usr/bin:/bin"} \ + CC=$${MYSQL_BUILD_CC:-gcc} \ + CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -DBIG_JOINS=1 -fno-strict-aliasing ${TAOCRYPT_OPT}"} \ + CXX=$${MYSQL_BUILD_CXX:-g++} \ + CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -DBIG_JOINS=1 -felide-constructors -fno-exceptions -fno-rtti -fno-strict-aliasing ${TAOCRYPT_OPT}"} \ # # 1. why -O2 for C and -O3 for C++ ? # 2. remove BIG_JOINS # 3. not need to have TAOCRYPT_OPT in CFLAGS, taocrypt is C++ # + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + $(CMAKEFLAGS) \ + -DWITH_LIBWRAP=no \ # # LIBWRAP is disabled by default, no need to bother # + -DWITH_SSL=bundled \ # # I'd suggest WITH_SSL=system for security reasons # + -DCOMPILATION_COMMENT="($(DISTRIBUTION))" \ # # better: "MariaDB.org package for $(DISTRIBUTION) $(RELEASE)" # + -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \ + -DSYSTEM_TYPE="debian-$(DEB_BUILD_GNU_SYSTEM)" \ + -DBUILD_CONFIG=mysql_release \ + -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \ + -DINSTALL_PLUGINDIR=lib/mysql/plugin \ # # shouldn't plugins go into DEB_HOST_MULTIARCH too ? # + -DDEB=1 ..' + touch $@ + +# This is needed, otherwise 'make test' will run before binaries have been built # # I don't see it at all. How can 'make test' be possibly run before build? # +override_dh_auto_build: + @echo "RULES.$@" + @echo "MAKEFLAGS: $(value MAKEFLAGS)" # # I guess this line ^^^ can be removed now # + cd $(BUILDDIR) && $(MAKE) + touch $@ + +override_dh_auto_test: + @echo "RULES.$@" +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + cd $(BUILDDIR) && $(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ; +endif + +override_dh_auto_install: + @echo "RULES.$@" + dh_testdir + dh_testroot + + # If TokuDB plugin was built add it to the server install list. + [ ! -f $(BUILDDIR)/storage/tokudb/ha_tokudb.so ] || echo 'usr/lib/mysql/plugin/ha_tokudb.so\netc/mysql/conf.d/tokudb.cnf\nusr/bin/tokuftdump\nusr/share/doc/mariadb-server-10.0/README-TOKUDB\nusr/share/doc/mariadb-server-10.0/README.md' >> debian/mariadb-server-10.0.install + + # If Mroonga plugin was built add it to the server install list. + [ ! -f $(BUILDDIR)/storage/mroonga/ha_mroonga.so ] || echo 'usr/lib/mysql/plugin/ha_mroonga.so' >> debian/mariadb-server-10.0.install + + # If libthrift-dev was available (manually installed, as it is + # not in Debian) and ha_cassandra.so was thus built add it to + # the server install list. + [ ! -f $(BUILDDIR)/storage/cassandra/ha_cassandra.so ] || echo 'usr/lib/mysql/plugin/ha_cassandra.so' >> debian/mariadb-server-10.0.install # # ok, let's then remove TOKUDB_DEB_FILES/etc from storage/*/CMakeLists.txt # I hated that hack anyway :) # + + # make install + cd $(BUILDDIR) && $(MAKE) install DESTDIR=$(TMP) + + # mariadb-server + # INBO_BIN is generated at build time and must thus be installed like this # # we don't install INFO_BIN and INFO_SRC files anymore # + install -D -m 0644 $(BUILDDIR)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-server-10.0/INFO_BIN + rm -vf $(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 # # no need to delete them, they'll be ignored as no *.install file mentions them # + # nm numeric soft is not enough, therefore extra sort in command + # to satisfy Debian reproducible build requirements + nm -n $(BUILDDIR)/sql/mysqld | sort | gzip -n -9 > $(TMP)/usr/share/doc/mariadb-server-10.0/mysqld.sym.gz # # add a link to MDEV-8423, please # + + # rename and install AppArmor profile + install -D -m 644 debian/apparmor-profile $(TMP)/etc/apparmor.d/usr.sbin.mysqld + + # rename and install Apport hook + install -D -m 644 debian/mariadb-server-10.0.py $(TMP)/usr/share/apport/package-hooks/source_mariadb-10.0.py + + # mariadb-test + mv $(TMP)/usr/mysql-test $(TMP)/usr/share/mysql # # 1. and plugin suites too # 2. why not to set INSTALL_MYSQLTESTDIR instead? # + + touch $@ + +override_dh_installlogrotate-arch: + dh_installlogrotate --name mysql-server + +# Start mysql in runlevel 19 before 20 where apache, proftpd etc gets # # 19 and 20 are not *runlevel*, runlevel can only be 2 to 5 (or S). # 19 is a "sequence number" # +# started which might depend on a running database server. +override_dh_installinit-arch: + dh_installinit --name=mysql -- defaults 19 21 + +override_dh_installcron-arch: + dh_installcron --name mysql-server + +get-orig-source: + uscan --force-download --verbose # # what is this for? # + +%: + dh $@ --parallel # # what kind of magic is that? # + +# vim: ts=8 diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc new file mode 100644 index 0000000..aaa63db --- /dev/null +++ b/debian/upstream/signing-key.asc # # I suppose we don't need that # @@ -0,0 +1,112 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.11 (GNU/Linux) + +mQGiBEtohJARBACxvZpWSIMTp/e7BUzSW+WDL7Pl0JDg6v7ZJFGJk9qo+5JXIiis +497Ul0FmVJ6EoyVzfpqe5FyUvqtLCkM6UP5adyvXTHi1KMiYacu2q5yRhDpMKbpM +LkAg23Yyz1yK/d0TsAkerLJ6K1Bh8NIm44Op+qFrDxeYZDIR5Q8WaCdK8wCg/jc8 +p/4XaKq74ghUHEX+35qk63UD/0YEsgHrsRQZ42wKNeO8ZUJKqCVHXYJrCq7DhRhn +U5aYnuK3op0JusPN5fdIGkKwJy24dWRoRfNIIg0WvM8qUNrC2NvhomnZNudsI0Jb +XapRemrIwbvrZToD6ei1awdVqa5fT6XIxV4MSQEwn47qmUNSz/0TkUmB3VZ2EL/j +zfHUA/91ZfAdWCmRemTLWRrzIYYJKyEInZ0qwZVrkyMY8+T7b2/6RGR0f2oV1dOx +cjbd0+N3vKrUkjuzkcVu/oB8wq9UBfuSHwsxYqub4gvIh0/LW+CsWa955sQ/Hj9H +48j3nUHaXqM9uJyMMgMlCdo3rLpnYCJH8w2kFfLHIDksMs1YtLQ9TWFyaWFEQiBQ +YWNrYWdlIFNpZ25pbmcgS2V5IDxwYWNrYWdlLXNpZ25pbmcta2V5QG1hcmlhZGIu +b3JnPohiBBMRAgAiBQJREUepAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK +CRDLywgqG7lD28y4AJ0aByfYvJWqBm5PZjusZiG0vo9SRwCeM0izj/oryMu0fJi3 +kRbTlojzCd2JAhwEEAECAAYFAlERSAgACgkQQd3AtA2lbyLlsQ/+KbSkMhjnZ73I +9XhndOX7USxIIumuVI2nU829+EiLhxYYcVJHUO5tO9rvRGgmSg0IhPSwEMK3GLC3 +P5v6gipyCKOAnx2T0qF2k8gq9YRVFd7LZqJsM06HuGsFG5SWieVjjjE0s7A/urLb +Uxa067pleZeKFCTTxTnar2eBKQAhwZkRSEBvvcAHkqQQAMwiAHvq2A0IjC3txqUF +iQbMouPCOJYA3Wn3NXKZwCxcyl2WwGSt7EwAs6C6d266QyWVQT+kZ6JFgRibcnfl +sNdniknGue5EKAj0nlhHGf6cyqJZ3AN4h+W40kKfIqnaeWkT0K+MnKp3Tah9y+h0 +u5buKfR5D/tK5ZYLUS0ujQJ0tlO1KpZuvTn13n7OMn7fOb3yqUcthnSTcuB/wpH2 +YDeON8sITqhHC1wDvxh5Iu8gYhBGoDmXzAiwpeZpQEHWzGVoG4SGNExwdOUFzX2b +GhC3Eol6z7fR32mUhisy/78wbu7mF9w32H1mgrjEW7sjLa3jebHbca3YIA8wUnAJ +7+KQXun/9X0joyyBy3U+8oW9i4E3UtKrsKOwd20NmfnOQCZg15pi7Yp2/ChgWkKD +EDpQcR2ZuyqRSzPRExnEcKKAq9hKS7l/bNhZJqoj3CMgJt9Co+Y89ObKwRCdwnJb +LWIajqBftzdZeRFkcsu4sKhfhnudCmWJAhwEEAECAAYFAlERSDUACgkQkXEYmZXk +Wp4Q4RAAj230KH+LtFGGlLhBARk+kBUV3mfoJKTye52ELQxbqudU9JrUceUXDGq3 +d/2n0mBt2mkmHYyqIMFShE5fnFrW4KXLVCKDCDy6mZ7/PBarB9y6lL8sVFXFpfVo +8hQInSR7fIEkREQQkpNtUddUHlCepyHj8QMKENjaxq6yrF3KvW+kWhAxvDutUzlr +q1N7AkedZ6owP0ChELdQYPtsGOcuipkqQgfpVB3PVBAsYe8wm5HbjqZCbV+VgLl6 +4WDyqmhJlOsT3KthLdNkmFyzL7BbkkyC5RX/X1xfyGhtYRpRNUF+5ewXItmpMnfI +UmEKIVF1jTwpj7554dQSCVJNlNOFiyYgRmcNs1XFQfa0bmv2raWZf3Zb0yfYR+tl +J2BuU3yBzhbFGmry7GdquqtbgRX+zFJsnkH7kGyP177QxDREwrhGZXcJgeO7Op8B +TJfTGhhDclIei1EZvvlVetiQ8PKtRA4D/zsCloHrSTu8uOXQlj+GPivM6sfVjhZF +F1I4FVeqUXze5vBz5O8IPfPuPcK+i5P2L0OZODpZ5CP30zY/L7wrgX2/fzJpGTz6 ++Lh77SGczGwQRfB/+D2kJkwaYeXd764pPVy0bdKGw4QPGtvyUQ4+fWQa5hyZSoTR +tj7fFYtYQvmPsMAIknR/lQxuZI7fX1M5j+FgijwUkv9fQzhorYK0Q0RhbmllbCBC +YXJ0aG9sb21ldyAoTW9udHkgUHJvZ3JhbSBzaWduaW5nIGtleSkgPGRiYXJ0QGFz +a21vbnR5Lm9yZz6IYAQTEQIAIAUCS2iEkAIbAwYLCQgHAwIEFQIIAwQWAgMBAh4B +AheAAAoJEMvLCCobuUPboDgAoNQVrK4i5LXTgwnWke2MxsXCoHDnAJ93j733YuNk +V64aHEUwWxNCkkwUkYkCHAQQAQIABgUCTWPEiQAKCRCRcRiZleRansGMD/96EvJv +LiuoQvv/KkeftLfvwoULVBBdAKLFmPyMjDbMP+1I2YnyF/7pSVmn/37QAP05QdoP +51RlZwRkEEVRMOlKIqny2WGGm8oxtkd3Lvi2TDkYRdkbfCn983WEUXqziOLadB3r +UPy+76D1GynoIerIyp9kzLtfJeHMWJumfh7poxnCup55eA5v4bbvToLacxca4ZJZ +gcdGrYGKKmYubrFGlrJqeF83JfQqXvD9ip15iOs4fSAeHVs0XbTFIsErk1axIXnE +mylHbSgu0Cri0ltNomAmFKuUR9hDamn8DaRWTTqAi9r7Mgm+KRB54Vn84yi3OAkE +etc8Qvz98Mp4kucHxt9daU1sA6pYWFf8jY61AXn7Qbm5t2l+RZhdIrJeHK3zktnn +MPoIwxgxogrTrLxL+WJGjCUAUfKzxd5eg+kqypIp5NIxpzKZrxXX+isLzjAiu+6l +Z8wbyspjybiMrVQsLF3bxBS3vaV3PDbhH4RI66FtwWbiOUAoMJH67uWlSbAjeAok +ZWJ0GchtgDfLI2olaM//gPxqDlNULkCsogypZCVYDcLR76kc3grhldtDfgU/PZLd +TuVtJnYsUWUgzbi+MYjMNFvojVkBsZdi8xXMTTaJ4EBr/x7FKr0yQrmqY6SIkKUA +RZqxMYERQm2toRfhWt5N9wKHuvqMv/eGYcCzcokCHAQQAQIABgUCTWPMCgAKCRBB +3cC0DaVvIjZREACImkZmDsZHOi3tZZKgttmxyK1uCJJoS8egX3DLQdBTci2PmiL1 +f9io2r7ii1Au/vfEdFGDVHOy3ksrJlazVgneGLmVbin9+B7OiQGiINQFoZ9WGCnL +MYt5BvBsP5nGuJHXpxG/OTAfWmqEx7wB15LMoAcA45o10IazIJB+78EwAbqJvhFm +hWBCuM9bvaigemdIjyKZM6Fd4B5ElQIsw3XFBLWEVnCfdPvD++cZU6U9F5PCM+oL +gmyGrpxbdiP2wGNhsh+w+jwRCPGVpivZMMHUVYJNLC2BModnyanz0obrw22U2LKT +nQOOVRMmvO6jYxdMUrOz+qjILLClozZd83X5P3Yz9rZYDXwu526iCGfKcoTWecru +oKw/nlHharrf97Kj9LZirHEUa3wrjEWTr1g90YgyVVqw5H1jdQ3kZ677bgJfSiT/ +OXwUhrqXBrPxIfYBweISDttbV7XkNFOM8tV+fM/CyV97omep8pctLyHL4QTs1BW5 +YhFsLEfw4M9hYcPD9EKs/f3EdDB9eKWbYkdWAnPwJtML6/OowtTM98FbsAbjKctb +O9LXzfrzCwV7137vLNrzFQXupzK3D+ar+oEZQIyezJyWz/Kl4xatx/B2E6APDpyb +iHwpzjHZbNY1uswuQTGJgi7huQRNooDJmMToYnGP+Mv9C1bcesf8K1qnjYkCHAQQ +AQIABgUCTXeZrgAKCRBB3cC0DaVvIghPEACo1DbukXlf/7lbSOPMZ+eUPaVQoP3M +QZC3e+KbbsQqw0YWwgmJRybyB8x5OYeBqoP1kOZX0MxOLqsMvFYNXGJIPbag+ufU +Q4NhNXFnRMJD6Exlum3M30s7SvxzX9sVZCvoAyrqDp9xiFs0cKtU2DUTS/LawkJm +0ro4K5JFH9irmpsXMzf83EfTR62lzDYSf3JOh9605jkJCQt+gj/T8YzPIqTy2569 +alBEEAFxoh+PMfxFNDv7siNLYBgbCTuE3ZifOD+3xZo4nlryGjzPI6C80nR9RPO7 +pPoJ26zEwWKC5bcBHcnIXpG1v4+at9A0YQqdLeufL+b3W+tPulf1bYtgKPq6oMR3 +lQSswaX0AockF4Dpz2smSiBdYX1XMkp1BjfAlqi+lhr4Uf68fZbQhhAf8puY4EQp +mobXY6/Un8h0C6xH8KzRxAPhB3r8XMwgFD6PYzmy5tB0v+Lt/nzkRMrRrgtEqwKo +BRzTy7jI7rr1hTkNdPKEiT/LbuQcNgrRqD4q1mM5N6RFqezx1pboTxdR5CppabwF +1qu1RUFt9xLsNcBFynAa8/Vmhn8dFggY240FJht2aKpj9S8G6ufwhq9JeAFqwDt5 +kHNTjkEFF20XeXvYamF2dX6kRtGm+hauDiHzhGbAoHxJIvLqNyLtxIZGapeVL36M +1RAUOqlnMiqPhYkCHAQQAQIABgUCTXeZ8wAKCRCRcRiZleRannQDEACaIRmvVUrp +d0LAKvtov9ZXfhHMxTbnIIvszbII8shPt29UO08er4Yd0ZnTIFHMvnX5MWCLWBlu +aJ56ucoXMJpcNRPmNCw1bWnjFwQVxajzSpzm4duGQnakOKH7uywNaaUE81nd1VY6 +XUW7J/IergcscMOOxHfbXu2hF/2AV7x9NkjbykuMBscgEc8CRuUHJ+A/52Ilwo9R +sEsxKJfh86++h1jaLjs8RL2dEo2ioO0QfAW+rXLgctCe7v3Zs8xBv1qFIV7QW5a+ +ZaYW1SRhMNJVnN5iP+WbFiMelzEqcxkgXErGeoDHPE4GDNIQyvhwhryOz1lJONix +b+Cb5jqUoC0Wa96fKP2/t1Dlm+d3ZSp7nQSaQZJ+8pF0yYcAqbKam5zr/XY+EPex +cGJ2GQuQ2y6tSz5kqy5qr5xQoHqif9dCFBkL7aOEO+5waBSy5oTb7uMHki+hKWTz +dlldliXKt4P2tMa/2uFj5m9DXn+CneoHi3FzET24RbglDb445aPNMM+EWqRGQUR0 +8wzp8X00WVRuLGenBws5LSjftHCdtVqdDLsM6eJ7BqH0wNPrMwXNz8lErNFnpIwT +DbZiw7GcQGkjRNvDpovAB7OUcGQNXaLvbsjF93OY3lOeBoyPokONIzUPSUdKurbZ +YyfT2mcqGEp1hkZVwPsKIA1y5ioxHQI2HbkEDQRLaIS4EBAApZ0wvxpQVlZ6OEFa +9SBQ5eclRIOjXjKqkYGkvIx+jUmqCYfOgfPixOGYS5Q2KwHNz4XEOIOA1kyClAoA +AgOEGUxj8CxnbBk10IVo/JBONjdqKYPZ2YNdeIIrKXEmai4i5hK5AfZHoyqsV5aq +xGkGeVUju/coyRJY6La8iL+RBuxiRuUPWymGjtISAR6fSiN8f/kRly/y9LmMO8Jc +OpeieqLUFPK6KuzhI4F0nFkHJpZPDNOHHl+GmAZ+SqZxmIrpkGymd36hTKxW4nln +N6kqc1gMwdn1L/u/D+C/jhMbTTssqiMZeyP9uFmnMB3ls1NV8OxvbxcTBG0M7g4A +lffUQKpUrNhIBoC3R7UbYQ3CTZX1Qp/TBzbfRAgGhdWBQDQEd3/Ll9G4QaCs9I+4 +W68rkAr7e7IylHyfEi9oYQkXFIEeaAhiENmJBpcLpas/yNJoLayqzPsQ+lRNg3om +FntPtZolkMi6orRNixrgXV64m/01YNjmBFTqsp5wOq2j0cmTkbOWqdnlmGPg2El1 +ufebJc6YWS1nFm6YRpN/B3QbtAnar1Cb+IHlr0haTOYhQp+XFN+k1brqs+Sufa8/ +rz6N5tsm+W5GjHKvHr24FTa02u3H4lIqNlNBkzZZKhzAhxEWiJzwc/f2upG5vdpl +rM/YCU+XTotYPb5ZEXQe2mD/rXMAAwUP/0f1DOJIfnMrh1o/3RKqDq8k7tlv2GEE +v0VEnh8ty4dMb8Dos2M1Oc4Kv9QLB3DXcS4/L4JW5vF0QgSAzq1r5oBT1zaMcqDS +6OUlHrWUi8aDNt5EPQuEGdP2/iTDeAq4r8eCYrHRC7egldyRZrmWNfcZN6/G9K+J +SjhWfSWWSBRIqb+UxcQNCp6i6tvVSxCfLK1R4P4kA/Z4Co2vywIfVfPhHd5nIWNl +1yl9O3r04GCNTjzwsv/dhUGDFIVsghgehZuL0Bb7hDuyvZ2ShALumZ5t7mU/SJ2h +Ok3klO+2bIJB0gquUkWn/4g1h2Tp9XVWrI1x6GUBxRYkwC4tWajzWeVC5hcDVAdq +YN0H0HVj/CEgrEWlCVv1hJ0JYAsjX8Cj1QuZB1i34fjEkgybMjo3oCU5GCSiNmvt +TeUpexyY/7iHAdyoZHFT+fQS84VMYKFT4tTYH+5jTa62yfPhn63TYPorrRyTqG8a +JQLnczm0NN5R5mriYJQjr4Pj8PSSwWck/Gt8R5vb+C69+uXINB6OKqhG6xU0bqnC +Ixt3OhVS7v0SfHjn0+il/JOc/ev9wm6G5FxmEWOoYwibmaDzHfc9N1HMRzjTENI7 +fyJPNFj9IDkpwk4E3ylrkuVl2KEmYDJ9T9ny4UMnQ7Sb6w59UhxMIFtRTPNpQJWC +WXfhWUAo4WfCiEkEGBECAAkFAktohLgCGwwACgkQy8sIKhu5Q9vThgCg7R7ImT+2 +1phcbxVYBQZjiJVY/2YAnRKPeNKPNIviaUUV7kxMXt949GQX +=t6GF +-----END PGP PUBLIC KEY BLOCK----- diff --git a/debian/watch b/debian/watch # # and, I suspect, not that # index f6fdd67..76fb8db 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,10 @@ version=3 -opts="uversionmangle=s/-(rc|beta)/$1/" \ - ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/www.mysql.com/Downloads/MySQL-5.1/mysql-([\d\.]*(?:-beta|-rc)?).tar.gz debian +opts=pgpsigurlmangle=s/$/.asc/,uversionmangle=s/-(rc|beta)/$1/,pasv \ + ftp://ftp.osuosl.org/pub/mariadb/mariadb-10.0.([\d\.]*(?:-beta|-rc)?)/source/mariadb-([\d\.]*(?:-beta|-rc)?).tar.gz \ + debian uupdate + +# Added string "-10.0." in path as MariaDB has release series 5.5 and 10.x in parallel, +# and we want uscan to check for updates only in the 10-series. + +# Automated signature checking with pgpsigurlmangle has been available +# only since devscripts version 2.13.3 diff --git a/debian/patches/extend_default_test_timeout_for_tokudb.patch b/debian/patches/extend_default_test_timeout_for_tokudb.patch new file mode 100644 index 0000000..4a45d55 --- /dev/null +++ b/debian/patches/extend_default_test_timeout_for_tokudb.patch @@ -0,0 +1,14 @@ +Author: Otto Kekäläinen +Description: Extend timeout as some Debian pbuilder/sbuilder chroots may be very slow to run these + # # ok, I won't comment on patches now. there's a separate MDEV for that # https://mariadb.atlassian.net/browse/MDEV-6828 # +--- old/mysql-test/CMakeLists.txt 2014-02-12 17:55:23.469136898 +0200 ++++ new/mysql-test/CMakeLists.txt 2014-02-12 17:54:07.471406742 +0200 +@@ -64,7 +64,7 @@ + ENDIF() + + ++SET(MTR_FORCE perl ./mysql-test-run.pl --force --testcase-timeout=30 --suite-timeout=540) +-SET(MTR_FORCE perl ./mysql-test-run.pl --force) + IF(EXISTS ${CMAKE_SOURCE_DIR}/mysql-test/suite/nist) + SET(TEST_NIST ${MTR_FORCE} --comment=nist suite=nist ${EXP} && + ${MTR_FORCE} --comment=nist --force --suite=nist+ps ${EXP}) diff --git a/debian/patches/fix-spelling-errors.patch b/debian/patches/fix-spelling-errors.patch new file mode 100644 index 0000000..214b450 --- /dev/null +++ b/debian/patches/fix-spelling-errors.patch @@ -0,0 +1,62 @@ +Description: Fix spelling errors +Author: Otto Kekäläinen +Last-Update: 2014-10-02 + +--- mariadb-10.0-10.0.13.orig/storage/connect/tabxml.cpp ++++ mariadb-10.0-10.0.13/storage/connect/tabxml.cpp +@@ -1798,7 +1798,7 @@ void XMULCOL::ReadColumn(PGLOBAL g) + + if (N > Tdbp->Limit) { + N = Tdbp->Limit; +- sprintf(g->Message, "Mutiple values limited to %d", Tdbp->Limit); ++ sprintf(g->Message, "Multiple values limited to %d", Tdbp->Limit); + PushWarning(g, Tdbp); + } // endif N + +--- mariadb-10.0-10.0.13.orig/man/mysqldump.1 ++++ mariadb-10.0-10.0.13/man/mysqldump.1 +@@ -1261,7 +1261,7 @@ to point the slave to the correct master + .\" max-allowed-packet option: mysqldump + \fB\-\-max\-allowed\-packet=\fR\fB\fIlength\fR\fR + .sp +-Sets the maximum packet length to send to or recieve from server\&. ++Sets the maximum packet length to send to or receive from server\&. + .RE + .sp + .RS 4 +diff --git a/storage/connect/mysql-test/connect/r/xml_mult.result b/storage/connect/mysql-test/connect/r/xml_mult.result + +--- a/storage/connect/mysql-test/connect/r/xml_mult.result ++++ b/storage/connect/mysql-test/connect/r/xml_mult.result +@@ -51,14 +51,14 @@ WEB XQuery Kick Start en Per Bothner 2003 49.99 + WEB XQuery Kick Start en Kurt Cagle 2003 49.99 + WEB Learning XML en Erik T. Ray 2003 39.95 + Warnings: +-Warning 1105 Mutiple values limited to 3 ++Warning 1105 Multiple values limited to 3 + # One line lost because the where clause is applied only on the first 3 rows + SELECT category, title, author, price FROM bookstore WHERE author LIKE 'J%'; + category title author price + CHILDREN Harry Potter J K. Rowling 29.99 + WEB XQuery Kick Start James McGovern 49.99 + Warnings: +-Warning 1105 Mutiple values limited to 3 ++Warning 1105 Multiple values limited to 3 + # + # Testing concatenated values + # +@@ -91,12 +91,12 @@ CHILDREN Harry Potter en J K. Rowling 2005 29.99 + WEB XQuery Kick Start en James McGovern, Per Bothner, Kurt Cagle, James Linn 2003 49.99 + WEB Learning XML en Erik T. Ray 2003 39.95 + Warnings: +-Warning 1105 Mutiple values limited to 4 ++Warning 1105 Multiple values limited to 4 + # The where clause is applied on the concatenated column result + SELECT category, title, author, price FROM bookstore WHERE author LIKE 'J%'; + category title author price + CHILDREN Harry Potter J K. Rowling 29.99 + WEB XQuery Kick Start James McGovern, Per Bothner, Kurt Cagle, James Linn 49.99 + Warnings: +-Warning 1105 Mutiple values limited to 4 ++Warning 1105 Multiple values limited to 4 + DROP TABLE bookstore; diff --git a/debian/patches/innodb_simulate_comp_test_speedup.patch b/debian/patches/innodb_simulate_comp_test_speedup.patch new file mode 100644 index 0000000..024be54 --- /dev/null +++ b/debian/patches/innodb_simulate_comp_test_speedup.patch @@ -0,0 +1,15 @@ +Description: Add options to innodb test that fixes possible test failure + It was noticed that the test innodb_simulate_comp_failures_small + repeatedly fails on some machines because the test is way too I/O + heavy and mysqld starts to time-out under heavy load. + . + Remove this once upstream has released an official fix. +Author: Otto Kekäläinen +Bug: https://mariadb.atlassian.net/browse/MDEV-6682 + +--- mariadb-10.0-10.0.13.orig/mysql-test/suite/innodb/t/innodb_simulate_comp_failures_small-master.opt ++++ mariadb-10.0-10.0.13/mysql-test/suite/innodb/t/innodb_simulate_comp_failures_small-master.opt +@@ -1,2 +1,3 @@ + --innodb-file-per-table ++--innodb-flush-log-at-trx-commit=2 + diff --git a/debian/patches/mroonga-disable-switch.patch b/debian/patches/mroonga-disable-switch.patch new file mode 100644 index 0000000..c1bc202 --- /dev/null +++ b/debian/patches/mroonga-disable-switch.patch @@ -0,0 +1,21 @@ +Description: Add Mroonga disable switch + It seems Mroonga does not build or at least does not pass + it's own build time tests on i386. On arch amd64 it seems + to work OK. Added a switch in the CMakeLists.txt + so that Mroonga can be disabled in debian/rules for non-amd64. +Author: Otto Kekäläinen +Bug: https://mariadb.atlassian.net/browse/MDEV-7210 + +--- a/storage/mroonga/CMakeLists.txt ++++ b/storage/mroonga/CMakeLists.txt +@@ -17,6 +17,10 @@ + # License along with this library; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + ++if(WITHOUT_MROONGA) ++ return() ++endif() ++ + cmake_minimum_required(VERSION 2.6) + project(mroonga) + diff --git a/debian/patches/50_mysql-test__db_test.dpatch b/debian/patches/mysql-test__db_test.patch old mode 100755 new mode 100644 similarity index 92% rename from debian/patches/50_mysql-test__db_test.dpatch rename to debian/patches/mysql-test__db_test.patch index 670afbf..571c491 --- a/debian/patches/50_mysql-test__db_test.dpatch +++ b/debian/patches/mysql-test__db_test.patch @@ -1,16 +1,12 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run ## 50_mysql-test__db_test.dpatch by Christian Hammers ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Patch 33_scripts__mysql_create_system_tables__no_test removes the ## DP: rights for anybody to connect to the test database but the test ## DP: suite depends on them. - -@DPATCH@ - --- old/mysql-test/mysql-test-run.pl 2009-06-16 14:24:09.000000000 +0200 +++ new/mysql-test/mysql-test-run.pl 2009-07-04 00:03:34.000000000 +0200 -@@ -3578,6 +3578,11 @@ sub mysql_install_db { +@@ -3602,6 +3602,11 @@ sub mysql_install_db { mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql", $bootstrap_sql_file); diff --git a/debian/patches/mysqld_multi.server_lsb-header.patch b/debian/patches/mysqld_multi.server_lsb-header.patch new file mode 100644 index 0000000..627987c --- /dev/null +++ b/debian/patches/mysqld_multi.server_lsb-header.patch @@ -0,0 +1,31 @@ +Description: Provides LSB headers for example initscript (Closes: #778762) +Author: Jan Wagner +--- a/support-files/mysqld_multi.server.sh ++++ b/support-files/mysqld_multi.server.sh +@@ -14,8 +14,24 @@ + # Version 1.0 + # + +-basedir=/usr/local/mysql +-bindir=/usr/local/mysql/bin ++### BEGIN INIT INFO ++# Provides: mysqld_multi ++# 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 multiple mysql database server daemon instances ++# Description: Controls multiple MariaDB database server daemon instances ++### END INIT INFO ++ ++PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin ++NAME=mysqld_multi ++DESC=mysqld_multi ++ ++basedir=/usr ++bindir=/usr/bin + + if test -x $bindir/mysqld_multi + then diff --git a/debian/patches/mysqld_multi_confd.patch b/debian/patches/mysqld_multi_confd.patch new file mode 100644 index 0000000..70839fd --- /dev/null +++ b/debian/patches/mysqld_multi_confd.patch @@ -0,0 +1,12 @@ +Description: Makes mysqld_multi reading conf.d (Closes: #778761) +Author: Jan Wagner +--- a/scripts/mysqld_multi.sh ++++ b/scripts/mysqld_multi.sh +@@ -504,6 +504,7 @@ + '@prefix@/my.cnf', + ($ENV{MYSQL_HOME} ? "$ENV{MYSQL_HOME}/my.cnf" : undef), + $opt{'extra-file'}, ++ , + ($ENV{HOME} ? "$ENV{HOME}/.my.cnf" : undef)); + } + diff --git a/debian/patches/remove_rename_mariadb-server_files_in.patch b/debian/patches/remove_rename_mariadb-server_files_in.patch new file mode 100644 index 0000000..6ff641f --- /dev/null +++ b/debian/patches/remove_rename_mariadb-server_files_in.patch @@ -0,0 +1,18 @@ +Author: Otto Kekäläinen +Description: Remove upstream debian/* handling that is obsolete + +--- old/CMakeLists.txt 2014-01-29 20:55:56.499842093 +0200 ++++ new/CMakeLists.txt 2014-01-31 17:12:27.633594128 +0200 +@@ -460,12 +460,6 @@ CONFIGURE_FILE( + ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in + ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY) + +-IF(DEB) +- CONFIGURE_FILE( +- ${CMAKE_SOURCE_DIR}/debian/mariadb-server-10.0.files.in +- ${CMAKE_SOURCE_DIR}/debian/mariadb-server-10.0.files) +-ENDIF(DEB) +- + # Handle the "INFO_*" files. + INCLUDE(${CMAKE_BINARY_DIR}/info_macros.cmake) + # Source: This can be done during the cmake phase, all information is diff --git a/debian/patches/61_replace_dash_with_bash_mbug675185.dpatch b/debian/patches/replace_dash_with_bash_mbug675185.patch old mode 100755 new mode 100644 similarity index 88% rename from debian/patches/61_replace_dash_with_bash_mbug675185.dpatch rename to debian/patches/replace_dash_with_bash_mbug675185.patch index 2a4ee8c..1d920b1 --- a/debian/patches/61_replace_dash_with_bash_mbug675185.dpatch +++ b/debian/patches/replace_dash_with_bash_mbug675185.patch @@ -1,4 +1,3 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run ## 61_replace_dash_with_bash_mbug675185.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. @@ -6,9 +5,6 @@ ## DP: A race in dash causes mysqld_safe to occasionally loop infinitely. ## DP: Fix by using bash instead. ## DP: https://bugs.launchpad.net/ubuntu/+source/mysql-dfsg-5.0/+bug/675185 - -@DPATCH@ -=== modified file 'scripts/mysqld_safe.sh' --- old/scripts/mysqld_safe.sh 2010-04-09 11:47:18 +0000 +++ new/scripts/mysqld_safe.sh 2010-11-21 09:40:50 +0000 @@ -1,4 +1,4 @@ diff --git a/debian/patches/44_scripts__mysql_config__libs.dpatch b/debian/patches/scripts__mysql_config__libs.patch old mode 100755 new mode 100644 similarity index 82% rename from debian/patches/44_scripts__mysql_config__libs.dpatch rename to debian/patches/scripts__mysql_config__libs.patch index c06275f..e1abf4d --- a/debian/patches/44_scripts__mysql_config__libs.dpatch +++ b/debian/patches/scripts__mysql_config__libs.patch @@ -1,14 +1,10 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 99-unnamed.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Removes unnecessary library dependencies. See #390692 +Author: Christian Hammers +Description: 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 @@ +@@ -107,10 +107,10 @@ # Create options # We intentionally add a space to the beginning and end of lib strings, simplifies replace later @@ -22,3 +18,4 @@ diff -Nur mysql-dfsg-5.1-5.1.31.orig/scripts/mysql_config.sh mysql-dfsg-5.1-5.1. if [ -r "$pkglibdir/libmygcc.a" ]; then # When linking against the static library with a different version of GCC + diff --git a/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch b/debian/patches/scripts__mysql_create_system_tables__no_test.patch old mode 100755 new mode 100644 similarity index 97% rename from debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch rename to debian/patches/scripts__mysql_create_system_tables__no_test.patch index 7ce692a..1287039 --- a/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch +++ b/debian/patches/scripts__mysql_create_system_tables__no_test.patch @@ -1,4 +1,3 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run ## 33_scripts__mysql_create_system_tables__no_test.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. @@ -7,7 +6,6 @@ ## DP: circumstances as it is checked first. See #301741. ## DP: http://bugs.mysql.com/bug.php?id=6901 -@DPATCH@ --- old/scripts/mysql_system_tables_data.sql 2008-12-04 22:59:44.000000000 +0100 +++ new/scripts/mysql_system_tables_data.sql 2008-12-04 23:00:07.000000000 +0100 @@ -26,16 +26,6 @@ @@ -36,4 +34,3 @@ INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0; DROP TABLE tmp_user; - diff --git a/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch b/debian/patches/scripts__mysql_install_db.sh__no_test.patch old mode 100755 new mode 100644 similarity index 92% rename from debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch rename to debian/patches/scripts__mysql_install_db.sh__no_test.patch index 5ab8ab3..a44fbdb --- a/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch +++ b/debian/patches/scripts__mysql_install_db.sh__no_test.patch @@ -1,12 +1,9 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run ## 41_scripts__mysql_install_db.sh__no_test.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: scripts__mysql_install_db.sh__no_test ## DP: http://bugs.mysql.com/bug.php?id=6901 -@DPATCH@ - --- mysql-dfsg-5.1-5.1.23rc.orig/scripts/mysql_install_db.sh 2008-01-29 22:41:20.000000000 +0100 +++ mysql-dfsg-5.1-5.1.23rc/scripts/mysql_install_db.sh 2008-02-28 10:08:11.000000000 +0100 @@ -372,7 +372,7 @@ then diff --git a/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch b/debian/patches/scripts__mysqld_safe.sh__signals.patch old mode 100755 new mode 100644 similarity index 91% rename from debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch rename to debian/patches/scripts__mysqld_safe.sh__signals.patch index 5a9c3a5..7024c09 --- a/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch +++ b/debian/patches/scripts__mysqld_safe.sh__signals.patch @@ -1,15 +1,12 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run ## 38_scripts__mysqld_safe.sh__signals.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Executes /etc/init.d/mysql on signals ## DP: Reported as http://bugs.mysql.com/bug.php?id=31361 -@DPATCH@ - --- a/scripts/mysqld_safe.sh 2013-01-11 16:02:41 +0000 +++ b/scripts/mysqld_safe.sh 2013-01-11 16:03:14 +0000 -@@ -32,7 +32,6 @@ err_log= +@@ -33,7 +33,6 @@ err_log= syslog_tag_mysqld=mysqld syslog_tag_mysqld_safe=mysqld_safe @@ -17,7 +14,7 @@ # MySQL-specific environment variable. First off, it's not really a umask, # it's the desired mode. Second, it follows umask(2), not umask(3) in that -@@ -163,7 +162,7 @@ eval_log_error () { +@@ -164,7 +163,7 @@ eval_log_error () { # sed buffers output (only GNU sed supports a -u (unbuffered) option) # which means that messages may not get sent to syslog until the # mysqld process quits. @@ -26,7 +23,7 @@ ;; *) echo "Internal program error (non-fatal):" \ -@@ -805,6 +804,13 @@ then +@@ -806,6 +805,13 @@ then fi # @@ -40,4 +37,3 @@ # Uncomment the following lines if you want all tables to be automatically # checked and repaired during startup. You should add sensible key_buffer # and sort_buffer values to my.cnf to improve check performance or require - diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..81196be --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,14 @@ +scripts__mysql_create_system_tables__no_test.patch +scripts__mysqld_safe.sh__signals.patch +scripts__mysql_install_db.sh__no_test.patch +scripts__mysql_config__libs.patch +mysql-test__db_test.patch +replace_dash_with_bash_mbug675185.patch +extend_default_test_timeout_for_tokudb.patch +remove_rename_mariadb-server_files_in.patch +innodb_simulate_comp_test_speedup.patch +fix-spelling-errors.patch +mroonga-disable-switch.patch +mysqld_multi_confd.patch +mysqld_multi.server_lsb-header.patch +build_reproducibly.patch diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides index d2ba378..634700d 100644 --- a/debian/source.lintian-overrides +++ b/debian/source.lintian-overrides @@ -1,2 +1,11 @@ -maintainer-script-lacks-debhelper-token debian/mariadb-server-10.0.postinst +# OK, otherwise some updates fail, same as for mysql-5.5/5.6 and mariadb-5.5 maintainer-script-lacks-debhelper-token debian/mariadb-server-10.0.postrm +# Not SVN but a X509 CRL file +source-contains-svn-conflict-file mysql-test/std_data/crldir/fc725416.r0 +# OK, used in the test suite +source-contains-prebuilt-windows-binary mysql-test/std_data/ctype_upgrade/maria050533_xxx_croatian_ci.MYD +source-contains-prebuilt-windows-binary mysql-test/std_data/ctype_upgrade/maria100004_xxx_croatian_ci.MYD +source-contains-prebuilt-windows-binary mysql-test/std_data/ctype_upgrade/mysql050614_xxx_croatian_ci.MYD +# File is multi-licensed, and thus should be OK for Debian +license-problem-non-free-RFC include/sha1.h +license-problem-non-free-RFC mysys/sha1.c # # 1. these is no mysys/sha1.c anymore # 2. sha1.h is fully our own now # (at least this is true in 10.1) # diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) # # what is the earlier debian and ubuntu versions when this is supported? # diff --git a/debian/additions/my.cnf b/debian/additions/my.cnf deleted file mode 100644 index a27f854..0000000 --- a/debian/additions/my.cnf +++ /dev/null @@ -1,171 +0,0 @@ -# MariaDB database server configuration file. -# -# You can copy this file to one of: -# - "/etc/mysql/my.cnf" to set global options, -# - "~/.my.cnf" to set user-specific options. -# -# One can use all long options that the program supports. -# Run program with --help to get a list of available options and with -# --print-defaults to see which it would actually understand and use. -# -# For explanations see -# http://dev.mysql.com/doc/mysql/en/server-system-variables.html - -# This will be passed to all mysql clients -# It has been reported that passwords should be enclosed with ticks/quotes -# escpecially if they contain "#" chars... -# Remember to edit /etc/mysql/debian.cnf when changing the socket location. -[client] -port = 3306 -socket = /var/run/mysqld/mysqld.sock - -# Here is entries for some specific programs -# The following values assume you have at least 32M ram - -# This was formally known as [safe_mysqld]. Both versions are currently parsed. -[mysqld_safe] -socket = /var/run/mysqld/mysqld.sock -nice = 0 - -[mysqld] -# -# * Basic Settings -# -user = mysql -pid-file = /var/run/mysqld/mysqld.pid -socket = /var/run/mysqld/mysqld.sock -port = 3306 -basedir = /usr -datadir = /var/lib/mysql -tmpdir = /tmp -lc_messages_dir = /usr/share/mysql -lc_messages = en_US -skip-external-locking -# -# Instead of skip-networking the default is now to listen only on -# localhost which is more compatible and is not less secure. -bind-address = 127.0.0.1 -# -# * Fine Tuning -# -max_connections = 100 -connect_timeout = 5 -wait_timeout = 600 -max_allowed_packet = 16M -thread_cache_size = 128 -sort_buffer_size = 4M -bulk_insert_buffer_size = 16M -tmp_table_size = 32M -max_heap_table_size = 32M -# -# * MyISAM -# -# This replaces the startup script and checks MyISAM tables if needed -# the first time they are touched. On error, make copy and try a repair. -myisam_recover = BACKUP -key_buffer_size = 128M -#open-files-limit = 2000 -table_open_cache = 400 -myisam_sort_buffer_size = 512M -concurrent_insert = 2 -read_buffer_size = 2M -read_rnd_buffer_size = 1M -# -# * Query Cache Configuration -# -# Cache only tiny result sets, so we can fit more in the query cache. -query_cache_limit = 128K -query_cache_size = 64M -# for more write intensive setups, set to DEMAND or OFF -#query_cache_type = DEMAND -# -# * Logging and Replication -# -# Both location gets rotated by the cronjob. -# Be aware that this log type is a performance killer. -# As of 5.1 you can enable the log at runtime! -#general_log_file = /var/log/mysql/mysql.log -#general_log = 1 -# -# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf. -# -# we do want to know about network errors and such -log_warnings = 2 -# -# Enable the slow query log to see queries with especially long duration -#slow_query_log[={0|1}] -slow_query_log_file = /var/log/mysql/mariadb-slow.log -long_query_time = 10 -#log_slow_rate_limit = 1000 -log_slow_verbosity = query_plan - -#log-queries-not-using-indexes -#log_slow_admin_statements -# -# The following can be used as easy to replay backup logs or for replication. -# note: if you are setting up a replication slave, see README.Debian about -# other settings you may need to change. -#server-id = 1 -#report_host = master1 -#auto_increment_increment = 2 -#auto_increment_offset = 1 -log_bin = /var/log/mysql/mariadb-bin -log_bin_index = /var/log/mysql/mariadb-bin.index -# not fab for performance, but safer -#sync_binlog = 1 -expire_logs_days = 10 -max_binlog_size = 100M -# slaves -#relay_log = /var/log/mysql/relay-bin -#relay_log_index = /var/log/mysql/relay-bin.index -#relay_log_info_file = /var/log/mysql/relay-bin.info -#log_slave_updates -#read_only -# -# If applications support it, this stricter sql_mode prevents some -# mistakes like inserting invalid dates etc. -#sql_mode = NO_ENGINE_SUBSTITUTION,TRADITIONAL -# -# * InnoDB -# -# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/. -# Read the manual for more InnoDB related options. There are many! -default_storage_engine = InnoDB -# you can't just change log file size, requires special procedure -#innodb_log_file_size = 50M -innodb_buffer_pool_size = 256M -innodb_log_buffer_size = 8M -innodb_file_per_table = 1 -innodb_open_files = 400 -innodb_io_capacity = 400 -innodb_flush_method = O_DIRECT -# -# * Security Features -# -# Read the manual, too, if you want chroot! -# chroot = /var/lib/mysql/ -# -# For generating SSL certificates I recommend the OpenSSL GUI "tinyca". -# -# ssl-ca=/etc/mysql/cacert.pem -# ssl-cert=/etc/mysql/server-cert.pem -# ssl-key=/etc/mysql/server-key.pem - - - -[mysqldump] -quick -quote-names -max_allowed_packet = 16M - -[mysql] -#no-auto-rehash # faster start of mysql but no tab completition - -[isamchk] -key_buffer = 16M - -# -# * IMPORTANT: Additional settings that can override those from this file! -# The files must end with '.cnf', otherwise they'll be ignored. -# -!includedir /etc/mysql/conf.d/ diff --git a/debian/additions/mariadb.conf.d/mysqld.cnf b/debian/additions/mariadb.conf.d/mysqld.cnf new file mode 100644 index 0000000..192c4f0 --- /dev/null +++ b/debian/additions/mariadb.conf.d/mysqld.cnf @@ -0,0 +1,106 @@ +[mysqld] +# +# * Basic Settings +# +user = mysql +pid-file = /var/run/mysqld/mysqld.pid +socket = /var/run/mysqld/mysqld.sock +port = 3306 +basedir = /usr +datadir = /var/lib/mysql +tmpdir = /tmp +lc-messages-dir = /usr/share/mysql +skip-external-locking + +# Instead of skip-networking the default is now to listen only on +# localhost which is more compatible and is not less secure. +bind-address = 127.0.0.1 + +# +# * Fine Tuning +# +key_buffer = 16M +max_allowed_packet = 16M +thread_stack = 192K +thread_cache_size = 8 +# This replaces the startup script and checks MyISAM tables if needed +# the first time they are touched +myisam-recover = BACKUP +#max_connections = 100 +#table_cache = 64 +#thread_concurrency = 10 + +# +# * Query Cache Configuration +# +query_cache_limit = 1M +query_cache_size = 16M + +# +# * Logging and Replication +# +# Both location gets rotated by the cronjob. +# Be aware that this log type is a performance killer. +# As of 5.1 you can enable the log at runtime! +#general_log_file = /var/log/mysql/mysql.log +#general_log = 1 +# +# Error log - should be very few entries. +# +log_error = /var/log/mysql/error.log +# +# Here you can see queries with especially long duration +#log_slow_queries = /var/log/mysql/mysql-slow.log +#long_query_time = 2 +#log-queries-not-using-indexes +# +# The following can be used as easy to replay backup logs or for replication. +# note: if you are setting up a replication slave, see README.Debian about +# other settings you may need to change. +#server-id = 1 +#log_bin = /var/log/mysql/mysql-bin.log +expire_logs_days = 10 +max_binlog_size = 100M +#binlog_do_db = include_database_name +#binlog_ignore_db = include_database_name + +# +# * InnoDB +# +# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/. +# Read the manual for more InnoDB related options. There are many! + +# +# * Security Features +# +# Read the manual, too, if you want chroot! +# chroot = /var/lib/mysql/ +# +# For generating SSL certificates I recommend the OpenSSL GUI "tinyca". +# +# ssl-ca=/etc/mysql/cacert.pem +# ssl-cert=/etc/mysql/server-cert.pem +# ssl-key=/etc/mysql/server-key.pem + +# +# * Character sets +# +# MySQL/MariaDB default is Latin1, but in Debian we rather default to the full +# utf8 4-byte character set. See also client.cnf +# +character-set-server = utf8mb4 +collation-server = utf8mb4_general_ci +character_set_server = utf8mb4 +collation_server = utf8mb4_general_ci +init-connect='SET NAMES utf8mb4' # # isn't that an overkill? # + + +# +# * Unix socket authentication plugin +# +# Needed so the root database user can authenticate without a password but +# only when running as the unix root user. +# +# Also available for other users if required. +# See https://mariadb.com/kb/en/unix_socket-authentication-plugin/ +plugin-load-add = auth_socket.so