[Commits] Rev 3252: Add INFO_SRC and INFO_BIN to .deb packaging to fix a test failure in in http://bazaar.launchpad.net/~maria-captains/maria/5.5

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Sat Jan 28 22:22:15 EET 2012


At http://bazaar.launchpad.net/~maria-captains/maria/5.5

------------------------------------------------------------
revno: 3252
revision-id: knielsen at knielsen-hq.org-20120128202214-qfyud6pec8l3x7if
parent: knielsen at knielsen-hq.org-20120128160842-mg5g581kc0plu8m5
committer: knielsen at knielsen-hq.org
branch nick: mariadb-5.5
timestamp: Sat 2012-01-28 21:22:14 +0100
message:
  Add INFO_SRC and INFO_BIN to .deb packaging to fix a test failure in
  file_contents.test. Also fix some old references to 5.3 in .deb packaging
  found while debugging this.
=== modified file 'debian/dist/Debian/mariadb-server-5.5.dirs'
--- a/debian/dist/Debian/mariadb-server-5.5.dirs	2012-01-23 11:20:16 +0000
+++ b/debian/dist/Debian/mariadb-server-5.5.dirs	2012-01-28 20:22:14 +0000
@@ -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

=== modified file 'debian/dist/Debian/mariadb-server-5.5.files'
--- a/debian/dist/Debian/mariadb-server-5.5.files	2012-01-24 11:27:44 +0000
+++ b/debian/dist/Debian/mariadb-server-5.5.files	2012-01-28 20:22:14 +0000
@@ -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

=== modified file 'debian/dist/Debian/rules'
--- a/debian/dist/Debian/rules	2012-01-26 11:55:12 +0000
+++ b/debian/dist/Debian/rules	2012-01-28 20:22:14 +0000
@@ -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
 

=== modified file 'debian/dist/Ubuntu/mariadb-server-5.5.dirs'
--- a/debian/dist/Ubuntu/mariadb-server-5.5.dirs	2012-01-23 11:20:16 +0000
+++ b/debian/dist/Ubuntu/mariadb-server-5.5.dirs	2012-01-28 20:22:14 +0000
@@ -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

=== modified file 'debian/dist/Ubuntu/mariadb-server-5.5.files'
--- a/debian/dist/Ubuntu/mariadb-server-5.5.files	2012-01-24 11:27:44 +0000
+++ b/debian/dist/Ubuntu/mariadb-server-5.5.files	2012-01-28 20:22:14 +0000
@@ -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

=== modified file 'debian/dist/Ubuntu/mariadb-server-5.5.py'
--- a/debian/dist/Ubuntu/mariadb-server-5.5.py	2012-01-23 11:20:16 +0000
+++ b/debian/dist/Ubuntu/mariadb-server-5.5.py	2012-01-28 20:22:14 +0000
@@ -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 at 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'):

=== modified file 'debian/dist/Ubuntu/rules'
--- a/debian/dist/Ubuntu/rules	2012-01-26 11:55:12 +0000
+++ b/debian/dist/Ubuntu/rules	2012-01-28 20:22:14 +0000
@@ -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
 

=== modified file 'debian/mariadb-server-5.5.lintian-overrides'
--- a/debian/mariadb-server-5.5.lintian-overrides	2012-01-23 11:20:16 +0000
+++ b/debian/mariadb-server-5.5.lintian-overrides	2012-01-28 20:22:14 +0000
@@ -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

=== modified file 'debian/mariadb-server-5.5.mysql.init'
--- a/debian/mariadb-server-5.5.mysql.init	2012-01-23 11:20:16 +0000
+++ b/debian/mariadb-server-5.5.mysql.init	2012-01-28 20:22:14 +0000
@@ -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

=== modified file 'debian/mariadb-server-5.5.templates'
--- a/debian/mariadb-server-5.5.templates	2012-01-23 11:20:16 +0000
+++ b/debian/mariadb-server-5.5.templates	2012-01-28 20:22:14 +0000
@@ -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
  .
  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

=== modified file 'debian/po/ar.po'
--- a/debian/po/ar.po	2012-01-23 11:20:16 +0000
+++ b/debian/po/ar.po	2012-01-28 20:22:14 +0000
@@ -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 للمزيد من "

=== modified file 'debian/po/ca.po'
--- a/debian/po/ca.po	2012-01-23 11:20:16 +0000
+++ b/debian/po/ca.po	2012-01-28 20:22:14 +0000
@@ -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 ""
 

=== modified file 'debian/po/cs.po'
--- a/debian/po/cs.po	2012-01-23 11:20:16 +0000
+++ b/debian/po/cs.po	2012-01-28 20:22:14 +0000
@@ -197,7 +197,7 @@ msgstr "Po instalaci balíku byste měli
 #| "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."

=== modified file 'debian/po/da.po'
--- a/debian/po/da.po	2012-01-23 11:20:16 +0000
+++ b/debian/po/da.po	2012-01-28 20:22:14 +0000
@@ -198,7 +198,7 @@ msgstr "Du bør tjekke kontoens adgangsko
 #| "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 "

=== modified file 'debian/po/de.po'
--- a/debian/po/de.po	2012-01-23 11:20:16 +0000
+++ b/debian/po/de.po	2012-01-28 20:22:14 +0000
@@ -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."

=== modified file 'debian/po/es.po'
--- a/debian/po/es.po	2012-01-23 11:20:16 +0000
+++ b/debian/po/es.po	2012-01-28 20:22:14 +0000
@@ -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 "

=== modified file 'debian/po/eu.po'
--- a/debian/po/eu.po	2012-01-23 11:20:16 +0000
+++ b/debian/po/eu.po	2012-01-28 20:22:14 +0000
@@ -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 "

=== modified file 'debian/po/fr.po'
--- a/debian/po/fr.po	2012-01-23 11:20:16 +0000
+++ b/debian/po/fr.po	2012-01-28 20:22:14 +0000
@@ -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 "

=== modified file 'debian/po/gl.po'
--- a/debian/po/gl.po	2012-01-23 11:20:16 +0000
+++ b/debian/po/gl.po	2012-01-28 20:22:14 +0000
@@ -190,7 +190,7 @@ msgstr "Debería comprobar o contrasinal
 #| "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 "

=== modified file 'debian/po/it.po'
--- a/debian/po/it.po	2012-01-23 11:20:16 +0000
+++ b/debian/po/it.po	2012-01-28 20:22:14 +0000
@@ -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-"

=== modified file 'debian/po/ja.po'
--- a/debian/po/ja.po	2012-01-23 11:20:16 +0000
+++ b/debian/po/ja.po	2012-01-28 20:22:14 +0000
@@ -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 を参照してください。"

=== modified file 'debian/po/nb.po'
--- a/debian/po/nb.po	2012-01-23 11:20:16 +0000
+++ b/debian/po/nb.po	2012-01-28 20:22:14 +0000
@@ -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 ""
 

=== modified file 'debian/po/nl.po'
--- a/debian/po/nl.po	2012-01-23 11:20:16 +0000
+++ b/debian/po/nl.po	2012-01-28 20:22:14 +0000
@@ -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 ""
 

=== modified file 'debian/po/pt.po'
--- a/debian/po/pt.po	2012-01-23 11:20:16 +0000
+++ b/debian/po/pt.po	2012-01-28 20:22:14 +0000
@@ -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-"

=== modified file 'debian/po/pt_BR.po'
--- a/debian/po/pt_BR.po	2012-01-23 11:20:16 +0000
+++ b/debian/po/pt_BR.po	2012-01-28 20:22:14 +0000
@@ -194,7 +194,7 @@ msgstr "Você deverá checar a senha des
 #| "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 "

=== modified file 'debian/po/ro.po'
--- a/debian/po/ro.po	2012-01-23 11:20:16 +0000
+++ b/debian/po/ro.po	2012-01-28 20:22:14 +0000
@@ -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 ""
 

=== modified file 'debian/po/ru.po'
--- a/debian/po/ru.po	2012-01-23 11:20:16 +0000
+++ b/debian/po/ru.po	2012-01-28 20:22:14 +0000
@@ -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."

=== modified file 'debian/po/sv.po'
--- a/debian/po/sv.po	2012-01-23 11:20:16 +0000
+++ b/debian/po/sv.po	2012-01-28 20:22:14 +0000
@@ -182,7 +182,7 @@ msgstr "Du bör kontrollera kontots lös
 #| "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 "

=== modified file 'debian/po/templates.pot'
--- a/debian/po/templates.pot	2012-01-23 11:20:16 +0000
+++ b/debian/po/templates.pot	2012-01-28 20:22:14 +0000
@@ -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 ""
 

=== modified file 'debian/po/tr.po'
--- a/debian/po/tr.po	2012-01-23 11:20:16 +0000
+++ b/debian/po/tr.po	2012-01-28 20:22:14 +0000
@@ -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 ""
 

=== modified file 'debian/source.lintian-overrides'
--- a/debian/source.lintian-overrides	2012-01-23 11:20:16 +0000
+++ b/debian/source.lintian-overrides	2012-01-28 20:22:14 +0000
@@ -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

=== modified file 'mysql-test/t/file_contents.test'
--- a/mysql-test/t/file_contents.test	2012-01-28 09:52:26 +0000
+++ b/mysql-test/t/file_contents.test	2012-01-28 20:22:14 +0000
@@ -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)



More information about the commits mailing list