MariaDB

Merge lp://staging/~otto/maria/maria-fix-debpkg-5.5 into lp://staging/maria/5.5

maria-fix-debpkg-5.5
Merge into 5.5

Proposed by Otto Kekäläinen on 2014-05-30

Status:	Needs review
Proposed branch:	lp://staging/~otto/maria/maria-fix-debpkg-5.5
Merge into:	lp://staging/maria/5.5
Diff against target:	11747 lines (+4517/-4706) (has conflicts) 125 files modified CMakeLists.txt (+0/-6) debian/README.Maintainer (+123/-114) debian/additions/innotop/changelog.innotop (+0/-357) debian/additions/my.cnf (+0/-171) debian/additions/mysql_tableinfo.1.OTHER (+322/-0) debian/apparmor-profile (+15/-0) debian/autobake-deb.sh (+0/-37) debian/changelog (+8/-23) debian/clean (+3/-0) debian/compat (+1/-1) debian/control (+259/-0) debian/copyright (+1004/-60) debian/dist/Debian/mariadb-server-5.5.README.Debian (+0/-109) debian/dist/Debian/mariadb-server-5.5.dirs (+0/-10) debian/dist/Debian/mariadb-server-5.5.files.in (+0/-75) debian/dist/Debian/mariadb-server-5.5.postinst (+0/-268) debian/dist/Debian/mariadb-server-5.5.postrm (+0/-83) debian/dist/Ubuntu/apparmor-profile (+0/-15) debian/dist/Ubuntu/mariadb-server-5.5.README.Debian (+0/-109) debian/dist/Ubuntu/mariadb-server-5.5.dirs (+0/-10) debian/dist/Ubuntu/mariadb-server-5.5.postinst (+0/-284) debian/dist/Ubuntu/mariadb-server-5.5.postrm (+0/-86) debian/dist/Ubuntu/mariadb-server-5.5.py (+0/-52) debian/gbp.conf (+3/-0) debian/libmariadbclient-dev.files (+0/-7) debian/libmariadbclient-dev.install (+8/-0) debian/libmariadbclient-dev.links (+0/-2) debian/libmariadbclient-dev.lintian-overrides (+2/-0) debian/libmariadbclient-dev.manpages (+1/-0) debian/libmariadbclient18.files (+0/-3) debian/libmariadbclient18.install (+3/-0) debian/libmariadbclient18.lintian-overrides (+8/-0) debian/libmariadbclient18.postinst (+8/-5) debian/libmariadbclient18.symbols (+374/-0) debian/libmariadbd-dev.files (+0/-2) debian/libmariadbd-dev.install (+2/-0) debian/libmariadbd-dev.lintian-overrides (+11/-0) debian/libmariadbd-dev.postinst (+9/-0) debian/license-reconcile.yml (+179/-0) debian/mariadb-client-5.5.docs (+0/-1) debian/mariadb-client-5.5.install (+14/-0) debian/mariadb-client-5.5.lintian-overrides (+13/-3) debian/mariadb-client-5.5.manpages (+16/-0) debian/mariadb-client-5.5.menu (+1/-1) debian/mariadb-client-core-5.5.files (+0/-4) debian/mariadb-client-core-5.5.install (+2/-0) debian/mariadb-client-core-5.5.lintian-overrides (+5/-0) debian/mariadb-client-core-5.5.manpages (+2/-0) debian/mariadb-client.lintian-overrides (+3/-0) debian/mariadb-common.files (+0/-1) debian/mariadb-common.lintian-overrides (+3/-0) debian/mariadb-common.postrm (+0/-8) debian/mariadb-server-5.5.NEWS (+0/-34) debian/mariadb-server-5.5.README.Debian (+109/-0) debian/mariadb-server-5.5.config (+4/-2) debian/mariadb-server-5.5.dirs (+7/-0) debian/mariadb-server-5.5.install (+72/-0) debian/mariadb-server-5.5.lintian-overrides (+10/-5) debian/mariadb-server-5.5.manpages (+22/-0) debian/mariadb-server-5.5.mysql.init (+3/-3) debian/mariadb-server-5.5.postinst (+267/-0) debian/mariadb-server-5.5.postrm (+83/-0) debian/mariadb-server-5.5.preinst (+22/-8) debian/mariadb-server-5.5.prerm (+3/-1) debian/mariadb-server-5.5.py (+52/-0) debian/mariadb-server-5.5.templates (+14/-9) debian/mariadb-server-core-5.5.files (+0/-26) debian/mariadb-server-core-5.5.install (+25/-0) debian/mariadb-server-core-5.5.lintian-overrides (+4/-0) debian/mariadb-server-core-5.5.manpages (+1/-0) debian/mariadb-server.lintian-overrides (+2/-0) debian/mariadb-test-5.5.dirs (+0/-18) debian/mariadb-test-5.5.files (+0/-19) debian/mariadb-test-5.5.install (+15/-0) debian/mariadb-test-5.5.lintian-overrides (+9/-0) debian/mariadb-test-5.5.manpages (+4/-0) debian/mariadb-test.lintian-overrides (+2/-0) debian/mysql-common.dirs (+0/-1) debian/mysql-common.files (+0/-3) debian/mysql-common.lintian-overrides (+0/-2) debian/mysql-common.postrm (+0/-7) debian/patches/00list (+0/-11) debian/patches/01_MAKEFILES__Docs_Images_Makefile.in.dpatch (+0/-776) debian/patches/01_MAKEFILES__Docs_Makefile.in.dpatch (+0/-776) debian/patches/02_no_builtin_ndbcluster_plugin.dpatch (+0/-18) debian/patches/21_init__openquery_configtest.dpatch (+0/-33) debian/patches/33_scripts__mysql_create_system_tables__no_test.diff (+28/-0) debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch (+0/-30) debian/patches/38_scripts__mysqld_safe.sh__signals.diff (+40/-0) debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch (+0/-43) debian/patches/41_scripts__mysql_install_db.sh__no_test.diff (+17/-0) debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch (+0/-20) debian/patches/44_scripts__mysql_config__libs.diff (+19/-0) debian/patches/44_scripts__mysql_config__libs.dpatch (+0/-24) debian/patches/50_mysql-test__db_test.diff (+20/-0) debian/patches/50_mysql-test__db_test.dpatch (+0/-24) debian/patches/60_zlib_innodb_workaround.dpatch (+0/-31) debian/patches/61_replace_dash_with_bash_mbug675185.diff (+16/-0) debian/patches/61_replace_dash_with_bash_mbug675185.dpatch (+0/-20) debian/patches/82_extend_default_test_timeout_for_tokudb.diff (+14/-0) debian/patches/series (+7/-0) debian/po/ar.po (+46/-29) debian/po/ca.po (+50/-33) debian/po/cs.po (+46/-29) debian/po/da.po (+78/-234) debian/po/de.po (+47/-29) debian/po/es.po (+46/-29) debian/po/eu.po (+46/-29) debian/po/fr.po (+63/-41) debian/po/gl.po (+46/-29) debian/po/it.po (+46/-29) debian/po/ja.po (+44/-36) debian/po/nb.po (+52/-35) debian/po/nl.po (+52/-35) debian/po/pt.po (+46/-29) debian/po/pt_BR.po (+47/-29) debian/po/ro.po (+52/-35) debian/po/ru.po (+61/-53) debian/po/sv.po (+46/-29) debian/po/templates.pot (+37/-28) debian/po/tr.po (+50/-33) debian/rules (+206/-0) debian/source.lintian-overrides (+11/-1) debian/source/format (+1/-0) debian/watch (+5/-1) Contents conflict in debian/additions/mysql_tableinfo.1 Contents conflict in debian/dist/Debian/rules Contents conflict in debian/dist/Ubuntu/rules Contents conflict in debian/mariadb-client-5.5.files
To merge this branch:	bzr merge lp://staging/~otto/maria/maria-fix-debpkg-5.5
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Sergei Golubchik		2014-05-30	Needs Fixing on 2014-06-03
Review via email: mp+221576@code.staging.launchpad.net

Description of the change

See details at https://mariadb.atlassian.net/browse/MDEV-6284

lp://staging/~otto/maria/maria-fix-debpkg-5.5 updated on 2014-05-30

4201. By Otto Kekäläinen on 2014-05-30: Typofix

Revision history for this message

Sergei Golubchik (sergii) wrote on 2014-06-03:

just testing new inline diff comments on launchpad :)

Revision history for this message

Sergei Golubchik (sergii) wrote on 2014-06-03:

This doesn't work at all, no control file. Perhaps, you've forgot to check it in?

review: Needs Fixing

lp://staging/~otto/maria/maria-fix-debpkg-5.5 updated on 2014-06-03

4202. By Otto Kekäläinen on 2014-06-03: Reviewed whole folder, minor fixes done

Revision history for this message

Otto Kekäläinen (otto) wrote on 2014-06-03:

Hmm, I must have typoed something. I am a git man you know :)

Anyway, new commit pushed: https://bazaar.launchpad.net/~otto/maria/maria-fix-debpkg-5.5/revision/4202

If the branch merge is smart, it should now automatically point to the latest commit in this fix branch.

Unmerged revisions

4202. By Otto Kekäläinen on 2014-06-03: Reviewed whole folder, minor fixes done
4201. By Otto Kekäläinen on 2014-05-30: Typofix
4200. By Otto Kekäläinen on 2014-05-30: Merged with 5.5 packaging in Debian