diff options
Diffstat (limited to 'debian')
37 files changed, 65 insertions, 60 deletions
diff --git a/debian/additions/mariadb.cnf b/debian/additions/mariadb.cnf index 12db9581469..6c2d812f0cc 100644 --- a/debian/additions/mariadb.cnf +++ b/debian/additions/mariadb.cnf @@ -15,22 +15,3 @@ #default-collation = utf8_general_ci #character_set_server = utf8 #collation_server = utf8_general_ci -# -# * Fine Tuning -# -max_connections = 100 -connect_timeout = 5 -wait_timeout = 600 -sort_buffer_size = 4M -bulk_insert_buffer_size = 16M -tmp_table_size = 32M -max_heap_table_size = 32M -# -# * MyISAM -# -key_buffer_size = 128M -table_cache = 400 -myisam_sort_buffer_size = 512M -concurrent_insert = 2 -read_buffer_size = 2M -read_rnd_buffer_size = 1M diff --git a/debian/additions/my.cnf b/debian/additions/my.cnf index ed19dcf5fc9..fd9bcf19977 100644 --- a/debian/additions/my.cnf +++ b/debian/additions/my.cnf @@ -48,15 +48,28 @@ 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_cache = 400 +myisam_sort_buffer_size = 512M +concurrent_insert = 2 +read_buffer_size = 2M +read_rnd_buffer_size = 1M # # * Query Cache Configuration # diff --git a/debian/dist/Debian/mariadb-server-5.5.dirs b/debian/dist/Debian/mariadb-server-5.5.dirs index 40b789231e0..6afd2a1854c 100644 --- a/debian/dist/Debian/mariadb-server-5.5.dirs +++ b/debian/dist/Debian/mariadb-server-5.5.dirs @@ -5,6 +5,6 @@ usr/bin usr/sbin usr/share/man/man8 usr/share/mysql -usr/share/doc/mariadb-server-5.3 +usr/share/doc/mariadb-server-5.5 var/run/mysqld var/lib/mysql-upgrade diff --git a/debian/dist/Debian/mariadb-server-5.5.files b/debian/dist/Debian/mariadb-server-5.5.files index e57752ec54a..b236d19a2c5 100644 --- a/debian/dist/Debian/mariadb-server-5.5.files +++ b/debian/dist/Debian/mariadb-server-5.5.files @@ -30,6 +30,8 @@ usr/bin/replace usr/bin/resolve_stack_dump usr/bin/resolveip usr/share/doc/mariadb-server-5.5/mysqld.sym.gz +usr/share/doc/mariadb-server-5.5/INFO_SRC +usr/share/doc/mariadb-server-5.5/INFO_BIN usr/share/lintian/overrides/mariadb-server-5.5 usr/share/man/man1/msql2mysql.1 usr/share/man/man1/myisamchk.1 diff --git a/debian/dist/Debian/mariadb-server-5.5.postinst b/debian/dist/Debian/mariadb-server-5.5.postinst index 60365711ebf..e3f2df13b4b 100644 --- a/debian/dist/Debian/mariadb-server-5.5.postinst +++ b/debian/dist/Debian/mariadb-server-5.5.postinst @@ -21,7 +21,7 @@ invoke() { fi } -MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --innodb=OFF --pbxt=OFF --default-storage-engine=myisam" +MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --loose-innodb=OFF --loose-pbxt=OFF --default-storage-engine=myisam" test_mysql_access() { mysql --no-defaults -u root -h localhost </dev/null >/dev/null 2>&1 diff --git a/debian/dist/Debian/rules b/debian/dist/Debian/rules index 3c060c99c88..457502882c4 100755 --- a/debian/dist/Debian/rules +++ b/debian/dist/Debian/rules @@ -66,7 +66,7 @@ endif ( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \ sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin:/usr/local/bin"} \ CC=$${MYSQL_BUILD_CC:-gcc} \ - CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized"} \ + 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 .. \ @@ -191,7 +191,7 @@ install: build install -m 0755 $(BUILDDIR)/scripts/mysqld_safe $(TMP)/usr/bin/mysqld_safe mkdir -p $(TMP)/usr/share/doc/mariadb-server-5.5/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-5.3/examples/ + # $(TMP)/usr/share/mysql/*cnf $(TMP)/usr/share/doc/mariadb-server-5.5/examples/ rm -vf $(TMP)/usr/share/mysql/my-*.cnf \ $(TMP)/usr/share/mysql/config-*.cnf \ $(TMP)/usr/share/mysql/mi_test_all* \ @@ -203,6 +203,9 @@ install: build 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-5.5/INFO_SRC + install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-server-5.5/INFO_BIN + # mariadb-test mv $(TMP)/usr/mysql-test $(TMP)/usr/share/mysql diff --git a/debian/dist/Ubuntu/mariadb-server-5.5.dirs b/debian/dist/Ubuntu/mariadb-server-5.5.dirs index 40b789231e0..6afd2a1854c 100644 --- a/debian/dist/Ubuntu/mariadb-server-5.5.dirs +++ b/debian/dist/Ubuntu/mariadb-server-5.5.dirs @@ -5,6 +5,6 @@ usr/bin usr/sbin usr/share/man/man8 usr/share/mysql -usr/share/doc/mariadb-server-5.3 +usr/share/doc/mariadb-server-5.5 var/run/mysqld var/lib/mysql-upgrade diff --git a/debian/dist/Ubuntu/mariadb-server-5.5.files b/debian/dist/Ubuntu/mariadb-server-5.5.files index d08e6253fe8..e88e52689ae 100644 --- a/debian/dist/Ubuntu/mariadb-server-5.5.files +++ b/debian/dist/Ubuntu/mariadb-server-5.5.files @@ -32,6 +32,8 @@ usr/bin/replace usr/bin/resolve_stack_dump usr/bin/resolveip usr/share/doc/mariadb-server-5.5/mysqld.sym.gz +usr/share/doc/mariadb-server-5.5/INFO_SRC +usr/share/doc/mariadb-server-5.5/INFO_BIN usr/share/lintian/overrides/mariadb-server-5.5 usr/share/man/man1/msql2mysql.1 usr/share/man/man1/myisamchk.1 diff --git a/debian/dist/Ubuntu/mariadb-server-5.5.postinst b/debian/dist/Ubuntu/mariadb-server-5.5.postinst index 68e24a2d833..a0c351194bb 100644 --- a/debian/dist/Ubuntu/mariadb-server-5.5.postinst +++ b/debian/dist/Ubuntu/mariadb-server-5.5.postinst @@ -21,7 +21,7 @@ invoke() { fi } -MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --innodb=OFF --pbxt=OFF --default-storage-engine=myisam" +MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --loose-innodb=OFF --loose-pbxt=OFF --default-storage-engine=myisam" test_mysql_access() { mysql --no-defaults -u root -h localhost </dev/null >/dev/null 2>&1 diff --git a/debian/dist/Ubuntu/mariadb-server-5.5.py b/debian/dist/Ubuntu/mariadb-server-5.5.py index e0c59c260e2..a1372a3baf5 100644 --- a/debian/dist/Ubuntu/mariadb-server-5.5.py +++ b/debian/dist/Ubuntu/mariadb-server-5.5.py @@ -1,4 +1,4 @@ -'''apport package hook for mariadb-5.3 +'''apport package hook for mariadb-5.5 (c) 2009 Canonical Ltd. Author: Mathias Gug <mathias.gug@canonical.com> @@ -20,7 +20,7 @@ def _add_my_conf_files(report, filename): continue def add_info(report): - attach_conffiles(report, 'mariadb-server-5.3', conffiles=None) + attach_conffiles(report, 'mariadb-server-5.5', conffiles=None) key = 'Logs' + path_to_key('/var/log/daemon.log') report[key] = "" for line in read_file('/var/log/daemon.log').split('\n'): diff --git a/debian/dist/Ubuntu/rules b/debian/dist/Ubuntu/rules index f0ece68641d..69e1cba2893 100755 --- a/debian/dist/Ubuntu/rules +++ b/debian/dist/Ubuntu/rules @@ -191,7 +191,7 @@ install: build install -m 0755 $(BUILDDIR)/scripts/mysqld_safe $(TMP)/usr/bin/mysqld_safe mkdir -p $(TMP)/usr/share/doc/mariadb-server-5.5/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-5.3/examples/ + # $(TMP)/usr/share/mysql/*cnf $(TMP)/usr/share/doc/mariadb-server-5.5/examples/ rm -vf $(TMP)/usr/share/mysql/my-*.cnf \ $(TMP)/usr/share/mysql/config-*.cnf \ $(TMP)/usr/share/mysql/mi_test_all* \ @@ -203,6 +203,9 @@ install: build 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-5.5/INFO_SRC + install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-server-5.5/INFO_BIN + # mariadb-test mv $(TMP)/usr/mysql-test $(TMP)/usr/share/mysql diff --git a/debian/mariadb-server-5.5.lintian-overrides b/debian/mariadb-server-5.5.lintian-overrides index 3a3dc20c563..a5075e2231a 100644 --- a/debian/mariadb-server-5.5.lintian-overrides +++ b/debian/mariadb-server-5.5.lintian-overrides @@ -1,5 +1,5 @@ -mariadb-server-5.3: command-with-path-in-maintainer-script postinst -mariadb-server-5.3: possible-bashism-in-maintainer-script postinst:81 'p{("a".."z","A".."Z",0..9)[int(rand(62))]}' -mariadb-server-5.3: possible-bashism-in-maintainer-script preinst:33 '${cmd/ */}' -mariadb-server-5.3: statically-linked-binary ./usr/bin/mysql_tzinfo_to_sql -mariadb-server-5.3: statically-linked-binary ./usr/sbin/mysqld +mariadb-server-5.5: command-with-path-in-maintainer-script postinst +mariadb-server-5.5: possible-bashism-in-maintainer-script postinst:81 'p{("a".."z","A".."Z",0..9)[int(rand(62))]}' +mariadb-server-5.5: possible-bashism-in-maintainer-script preinst:33 '${cmd/ */}' +mariadb-server-5.5: statically-linked-binary ./usr/bin/mysql_tzinfo_to_sql +mariadb-server-5.5: statically-linked-binary ./usr/sbin/mysqld diff --git a/debian/mariadb-server-5.5.mysql.init b/debian/mariadb-server-5.5.mysql.init index e9dd08481c6..b83316aedea 100644 --- a/debian/mariadb-server-5.5.mysql.init +++ b/debian/mariadb-server-5.5.mysql.init @@ -152,7 +152,7 @@ case "${1:-''}" in if ! mysqld_status check_dead warn; then log_end_msg 1 - log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-5.3/README.Debian.gz!" + log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-5.5/README.Debian.gz!" exit -1 else log_end_msg 0 diff --git a/debian/mariadb-server-5.5.preinst b/debian/mariadb-server-5.5.preinst index 9a7e337d168..1c48fde2837 100644 --- a/debian/mariadb-server-5.5.preinst +++ b/debian/mariadb-server-5.5.preinst @@ -49,7 +49,7 @@ stop_server() { this_version=5.5 # Abort if an NDB cluster is in use. -if egrep -qi -r '^[^#]*ndb.connectstring|^[:space:]*\[[:space:]*ndb_mgmd' /etc/mysql/; then +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 db_go diff --git a/debian/mariadb-server-5.5.templates b/debian/mariadb-server-5.5.templates index 436d599bde3..dfe5f68b319 100644 --- a/debian/mariadb-server-5.5.templates +++ b/debian/mariadb-server-5.5.templates @@ -7,7 +7,7 @@ # Even minor modifications require translation updates and such # changes should be coordinated with translators and reviewers. -Template: mariadb-server-5.3/really_downgrade +Template: mariadb-server-5.5/really_downgrade Type: boolean Default: false _Description: Really proceed with downgrade? @@ -73,7 +73,7 @@ _Description: Unable to set password for the MariaDB "root" user . You should check the account's password after the package installation. . - Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file + Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for more information. Template: mysql-server/password_mismatch diff --git a/debian/patches/50_mysql-test__db_test.dpatch b/debian/patches/50_mysql-test__db_test.dpatch index 6a5cab91c39..fe356ae46ef 100755 --- a/debian/patches/50_mysql-test__db_test.dpatch +++ b/debian/patches/50_mysql-test__db_test.dpatch @@ -10,12 +10,13 @@ --- 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 -@@ -2717,6 +2717,10 @@ +@@ -2717,6 +2717,11 @@ mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql", $bootstrap_sql_file); + mtr_tofile($bootstrap_sql_file, "-- Debian removed the default privileges on the 'test' database\n"); + mtr_tofile($bootstrap_sql_file, "INSERT INTO mysql.db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');\n"); ++ mtr_tofile($bootstrap_sql_file, "INSERT INTO mysql.db VALUES ('%','test\\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');\n"); + + # Add test data for timezone - this is just a subset, on a real diff --git a/debian/po/ar.po b/debian/po/ar.po index 4ac2e393790..7791fbebf2e 100644 --- a/debian/po/ar.po +++ b/debian/po/ar.po @@ -194,7 +194,7 @@ msgstr "يجب عليك التحقق من كلمة مرور الحساب عقب #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "الرجاء قراءة الملف /usr/share/doc/mariadb-server-5.5/README.Debian للمزيد من " diff --git a/debian/po/ca.po b/debian/po/ca.po index 2deeb98a08f..612ed584c96 100644 --- a/debian/po/ca.po +++ b/debian/po/ca.po @@ -161,7 +161,7 @@ msgstr "" #. Description #: ../mariadb-server-5.5.templates:8001 msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" diff --git a/debian/po/cs.po b/debian/po/cs.po index 6016b8fcf5a..87d9645a4c5 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -197,7 +197,7 @@ msgstr "Po instalaci balíku byste měli heslo ověřit." #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "Více informací naleznete v /usr/share/doc/mariadb-server-5.5/README.Debian." diff --git a/debian/po/da.po b/debian/po/da.po index fa4b512a859..a42e3bd67d7 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -198,7 +198,7 @@ msgstr "Du br tjekke kontoens adgangskode efter pakkeinstallationen." #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "Se filen /usr/share/doc/mariadb-server-5.5/README.Debian for yderligere " diff --git a/debian/po/de.po b/debian/po/de.po index 6dd989c7ae6..bbefb910646 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -194,7 +194,7 @@ msgstr "" #| "Please read the /usr/share/doc/mariadb-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "Für weitere Informationen lesen Sie /usr/share/doc/mariadb-server-5.1/README." diff --git a/debian/po/es.po b/debian/po/es.po index 42efda1896a..cb77ed5a50e 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -226,7 +226,7 @@ msgstr "" #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "Consulte /usr/share/doc/mariadb-server-5.5/README.Debian para más " diff --git a/debian/po/eu.po b/debian/po/eu.po index 019fc5ce090..ef195532d2a 100644 --- a/debian/po/eu.po +++ b/debian/po/eu.po @@ -188,7 +188,7 @@ msgstr "" #| "Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "Mesedez irakurri /usr/share/doc/mariadb-server-5.5/README.Debian fitxategia " diff --git a/debian/po/fr.po b/debian/po/fr.po index 98690573a6b..d9f59de8e3e 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -182,7 +182,7 @@ msgstr "" #| "Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "Veuillez consulter le fichier /usr/share/doc/mysql-server-5.5/README.Debian " diff --git a/debian/po/gl.po b/debian/po/gl.po index 7feb5944c02..0f05f62ba6d 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -190,7 +190,7 @@ msgstr "Debería comprobar o contrasinal da conta trala instalación do paquete. #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "Consulte o ficheiro /usr/share/doc/mariadb-server-5.5/README.Debian para " diff --git a/debian/po/it.po b/debian/po/it.po index 69ef4238c29..b377d9f9fb3 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -181,7 +181,7 @@ msgstr "" #| "Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "Per maggiori informazioni si consulti il file /usr/share/doc/mariadb-" diff --git a/debian/po/ja.po b/debian/po/ja.po index 07a0172c8ca..f63f21fdb8d 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -188,7 +188,7 @@ msgstr "" #| "Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "詳細は /usr/share/doc/mariadb-server-5.5/README.Debian を参照してください。" diff --git a/debian/po/nb.po b/debian/po/nb.po index 9f5b169a534..3dd6ec7ae5c 100644 --- a/debian/po/nb.po +++ b/debian/po/nb.po @@ -206,7 +206,7 @@ msgstr "" #. Description #: ../mariadb-server-5.5.templates:8001 msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" diff --git a/debian/po/nl.po b/debian/po/nl.po index 758ca85cabd..09cf06c7c47 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -207,7 +207,7 @@ msgstr "" #. Description #: ../mariadb-server-5.5.templates:8001 msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" diff --git a/debian/po/pt.po b/debian/po/pt.po index 9ab2f36bdf1..e1a3cad5c24 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -195,7 +195,7 @@ msgstr "" #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "Para mais informação por favor leia o ficheiro /usr/share/doc/mariadb-" diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index 8a538dfb8e4..26a5ac3d6fa 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -194,7 +194,7 @@ msgstr "Você deverá checar a senha dessa conta após a instalação deste paco #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "Por favor, leia o arquivo /usr/share/doc/mariadb-server-5.5/README.Debian " diff --git a/debian/po/ro.po b/debian/po/ro.po index 41baba6e6f8..81d64f37658 100644 --- a/debian/po/ro.po +++ b/debian/po/ro.po @@ -206,7 +206,7 @@ msgstr "" #. Description #: ../mariadb-server-5.5.templates:8001 msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" diff --git a/debian/po/ru.po b/debian/po/ru.po index 5349416a602..8ce5690ffe1 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -189,7 +189,7 @@ msgstr "Проверьте пароль учётной записи после #| "Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "Подробности см. в файле /usr/share/doc/mariadb-server-5.5/README.Debian." diff --git a/debian/po/sv.po b/debian/po/sv.po index 0dd6008bc83..297a2fb6d68 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -182,7 +182,7 @@ msgstr "Du bör kontrollera kontots lösenord efter installationen av paketet." #| "Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "Läs filen /usr/share/doc/mariadb-server-5.5/README.Debian för mer " diff --git a/debian/po/templates.pot b/debian/po/templates.pot index f70ac168367..742ea566a84 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -155,7 +155,7 @@ msgstr "" #. Description #: ../mariadb-server-5.5.templates:8001 msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" diff --git a/debian/po/tr.po b/debian/po/tr.po index 8fa4522d51e..046c346e85c 100644 --- a/debian/po/tr.po +++ b/debian/po/tr.po @@ -162,7 +162,7 @@ msgstr "" #. Description #: ../mariadb-server-5.5.templates:8001 msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides index 75c4215bba5..6a2a0dfe234 100644 --- a/debian/source.lintian-overrides +++ b/debian/source.lintian-overrides @@ -1,2 +1,2 @@ -maintainer-script-lacks-debhelper-token debian/mariadb-server-5.3.postinst -maintainer-script-lacks-debhelper-token debian/mariadb-server-5.3.postrm +maintainer-script-lacks-debhelper-token debian/mariadb-server-5.5.postinst +maintainer-script-lacks-debhelper-token debian/mariadb-server-5.5.postrm |