1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add INFO_SRC and INFO_BIN to .deb packaging to fix a test failure in

Browse Source 
file_contents.test. Also fix some old references to 5.3 in .deb packaging
found while debugging this.
This commit is contained in:
unknown 2012-01-28 21:22:14 +01:00
parent 300ec4d25e
commit f923073f68
32 changed files with 49 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/dist/Debian/mariadb-server-5.5.dirs vendored
View File

@ -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

2
debian/dist/Debian/mariadb-server-5.5.files vendored
View File

@ -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

5
debian/dist/Debian/rules vendored
View File

@ -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

2
debian/dist/Ubuntu/mariadb-server-5.5.dirs vendored
View File

@ -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

2
debian/dist/Ubuntu/mariadb-server-5.5.files vendored
View File

@ -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

4
debian/dist/Ubuntu/mariadb-server-5.5.py vendored
View File

@ -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'):

5
debian/dist/Ubuntu/rules vendored
View File

@ -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

10
debian/mariadb-server-5.5.lintian-overrides vendored
View File

@ -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

2
debian/mariadb-server-5.5.mysql.init vendored
View File

@ -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

4
debian/mariadb-server-5.5.templates vendored
View File

@ -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

2
debian/po/ar.po vendored
View File

@ -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 للمزيد من "

2
debian/po/ca.po vendored
View File

@ -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 ""

2
debian/po/cs.po vendored
View File

@ -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."

2
debian/po/da.po vendored
View File

@ -198,7 +198,7 @@ msgstr "Du b
#| "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 "

2
debian/po/de.po vendored
View File

@ -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."

2
debian/po/es.po vendored
View File

@ -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 "

2
debian/po/eu.po vendored
View File

@ -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 "

2
debian/po/fr.po vendored
View File

@ -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 "

2
debian/po/gl.po vendored
View File

@ -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 "

2
debian/po/it.po vendored
View File

@ -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-"

2
debian/po/ja.po vendored
View File

@ -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 を参照してください。"

2
debian/po/nb.po vendored
View File

@ -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 ""

2
debian/po/nl.po vendored
View File

@ -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 ""

2
debian/po/pt.po vendored
View File

@ -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-"

2
debian/po/pt_BR.po vendored
View File

@ -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 "

2
debian/po/ro.po vendored
View File

@ -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 ""

2
debian/po/ru.po vendored
View File

@ -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."

2
debian/po/sv.po vendored
View File

@ -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 "

2
debian/po/templates.pot vendored
View File

@ -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 ""

2
debian/po/tr.po vendored
View File

@ -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 ""

4
debian/source.lintian-overrides vendored
View File

@ -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

5
mysql-test/t/file_contents.test
View File

@ -29,8 +29,9 @@ if ($dir_bin eq '/usr/') {
# SuSE: "packages/" in the documentation path
$dir_docs = glob "$dir_docs/packages/MySQL-server*";
} else {
# RedHat: version number in directory name
$dir_docs = glob "$dir_docs/MySQL-server*";
# RedHat/Debian: version number in directory name
$dir_docs = glob "$dir_docs/mariadb-server-*";
$dir_docs = glob "$dir_docs/MySQL-server*" unless -d $dir_docs;
}
} else {
# tar.gz package, Windows, or developer work (in BZR)