Skip to content
Permalink
Browse files

fix debian packaging for 10.2

  • Loading branch information...
vuvova committed Nov 20, 2015
1 parent d73cf39 commit 679aa122bf7f94c773c6553f5a7236aae3982bb3
Showing with 581 additions and 569 deletions.
  1. +2 −2 CMakeLists.txt
  2. +1 −1 debian/autobake-deb.sh
  3. +40 −28 debian/control
  4. 0 debian/{mariadb-client-10.1.README.Debian → mariadb-client-10.2.README.Debian}
  5. 0 debian/{mariadb-client-10.1.dirs → mariadb-client-10.2.dirs}
  6. 0 debian/{mariadb-client-10.1.docs → mariadb-client-10.2.docs}
  7. 0 debian/{mariadb-client-10.1.files → mariadb-client-10.2.files}
  8. 0 debian/{mariadb-client-10.1.links → mariadb-client-10.2.links}
  9. 0 debian/{mariadb-client-10.1.menu → mariadb-client-10.2.menu}
  10. 0 debian/{mariadb-client-core-10.1.files → mariadb-client-core-10.2.files}
  11. 0 debian/{mariadb-connect-engine-10.1.files → mariadb-connect-engine-10.2.files}
  12. 0 debian/{mariadb-cracklib-password-check-10.1.files → mariadb-cracklib-password-check-10.2.files}
  13. 0 debian/{mariadb-oqgraph-engine-10.1.files → mariadb-oqgraph-engine-10.2.files}
  14. 0 debian/{mariadb-server-10.1.README.Debian → mariadb-server-10.2.README.Debian}
  15. 0 debian/{mariadb-server-10.1.config → mariadb-server-10.2.config}
  16. +1 −1 debian/{mariadb-server-10.1.dirs → mariadb-server-10.2.dirs}
  17. +4 −4 debian/{mariadb-server-10.1.files.in → mariadb-server-10.2.files.in}
  18. 0 debian/{mariadb-server-10.1.logcheck.ignore.paranoid → mariadb-server-10.2.logcheck.ignore.paranoid}
  19. 0 debian/{mariadb-server-10.1.logcheck.ignore.server → mariadb-server-10.2.logcheck.ignore.server}
  20. 0 ...ariadb-server-10.1.logcheck.ignore.workstation → mariadb-server-10.2.logcheck.ignore.workstation}
  21. 0 debian/{mariadb-server-10.1.mysql-server.logrotate → mariadb-server-10.2.mysql-server.logrotate}
  22. +1 −1 debian/{mariadb-server-10.1.mysql.init → mariadb-server-10.2.mysql.init}
  23. +1 −1 debian/{mariadb-server-10.1.postinst → mariadb-server-10.2.postinst}
  24. 0 debian/{mariadb-server-10.1.postrm → mariadb-server-10.2.postrm}
  25. +1 −1 debian/{mariadb-server-10.1.preinst → mariadb-server-10.2.preinst}
  26. 0 debian/{mariadb-server-10.1.prerm → mariadb-server-10.2.prerm}
  27. +2 −2 debian/{mariadb-server-10.1.py → mariadb-server-10.2.py}
  28. +2 −2 debian/{mariadb-server-10.1.templates → mariadb-server-10.2.templates}
  29. 0 debian/{mariadb-server-core-10.1.files → mariadb-server-core-10.2.files}
  30. 0 debian/{mariadb-test-10.1.dirs → mariadb-test-10.2.dirs}
  31. 0 debian/{mariadb-test-10.1.files → mariadb-test-10.2.files}
  32. 0 debian/{mariadb-test-10.1.links → mariadb-test-10.2.links}
  33. +1 −1 debian/po/POTFILES.in
  34. +25 −25 debian/po/ar.po
  35. +26 −26 debian/po/ca.po
  36. +27 −27 debian/po/cs.po
  37. +27 −27 debian/po/da.po
  38. +24 −24 debian/po/de.po
  39. +27 −27 debian/po/es.po
  40. +26 −26 debian/po/eu.po
  41. +26 −26 debian/po/fr.po
  42. +25 −25 debian/po/gl.po
  43. +26 −26 debian/po/it.po
  44. +26 −26 debian/po/ja.po
  45. +24 −24 debian/po/nb.po
  46. +24 −24 debian/po/nl.po
  47. +25 −25 debian/po/pt.po
  48. +27 −27 debian/po/pt_BR.po
  49. +24 −24 debian/po/ro.po
  50. +26 −26 debian/po/ru.po
  51. +26 −26 debian/po/sv.po
  52. +24 −24 debian/po/templates.pot
  53. +26 −26 debian/po/tr.po
  54. +13 −13 debian/rules
  55. +1 −1 storage/tokudb/CMakeLists.txt
@@ -441,8 +441,8 @@ CONFIGURE_FILE(

IF(DEB)
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/debian/mariadb-server-10.1.files.in
${CMAKE_SOURCE_DIR}/debian/mariadb-server-10.1.files)
${CMAKE_SOURCE_DIR}/debian/mariadb-server-10.2.files.in
${CMAKE_SOURCE_DIR}/debian/mariadb-server-10.2.files)
ENDIF(DEB)

# Handle the "INFO_*" files.
@@ -37,7 +37,7 @@ if apt-cache madison cracklib2|grep 'cracklib2 *| *2\.[0-8]\.' >/dev/null 2>&1
then
# Anything in MARIADB_OPTIONAL_DEBS is omitted from the resulting
# packages by snipped in rules file
MARIADB_OPTIONAL_DEBS="${MARIADB_OPTIONAL_DEBS} cracklib-password-check-10.1"
MARIADB_OPTIONAL_DEBS="${MARIADB_OPTIONAL_DEBS} cracklib-password-check-10.2"
sed -i -e "/\\\${MAYBE_LIBCRACK}/d" debian/control
else
MAYBE_LIBCRACK='libcrack2-dev (>= 2.9.0),'
@@ -1,4 +1,4 @@
Source: mariadb-10.1
Source: mariadb-10.2
Section: database
Priority: optional
Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
@@ -128,7 +128,7 @@ Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf)
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.1
Package: mariadb-client-core-10.2
Architecture: any
Depends: libmariadbclient18 (>= ${source:Version}),
mariadb-common (>= ${source:Version}),
@@ -139,11 +139,13 @@ Provides: mysql-client-core,
mysql-client-core-5.5,
mysql-client-core-5.6,
virtual-mysql-client-core
Conflicts: mariadb-client-10.0,
Conflicts: mariadb-client-10.1,
mariadb-client-10.0,
mariadb-client-5.1,
mariadb-client-5.2,
mariadb-client-5.3,
mariadb-client-5.5,
mariadb-client-core-10.1,
mariadb-client-core-10.0,
mariadb-client-core-5.1,
mariadb-client-core-5.2,
@@ -157,11 +159,13 @@ Conflicts: mariadb-client-10.0,
mysql-client-core-5.5,
mysql-client-core-5.6,
virtual-mysql-client-core
Replaces: mariadb-client-10.0,
Replaces: mariadb-client-10.1,
mariadb-client-10.0,
mariadb-client-5.1,
mariadb-client-5.2,
mariadb-client-5.3,
mariadb-client-5.5,
mariadb-client-core-10.1,
mariadb-client-core-10.0,
mariadb-client-core-5.1,
mariadb-client-core-5.2,
@@ -183,13 +187,13 @@ Description: MariaDB database core client binaries
.
This package includes the core client files, as used by Akonadi.

Package: mariadb-client-10.1
Package: mariadb-client-10.2
Architecture: any
Depends: debianutils (>=1.6),
libdbd-mysql-perl (>= 1.2202),
libdbi-perl,
libmariadbclient18 (>= ${source:Version}),
mariadb-client-core-10.1 (>= ${source:Version}),
mariadb-client-core-10.2 (>= ${source:Version}),
mariadb-common,
${misc:Depends},
${perl:Depends},
@@ -202,6 +206,7 @@ Provides: mysql-client,
mysql-client-5.6,
virtual-mysql-client
Conflicts: mariadb-client (<< ${source:Version}),
mariadb-client-10.1,
mariadb-client-10.0,
mariadb-client-5.1,
mariadb-client-5.2,
@@ -214,6 +219,7 @@ Conflicts: mariadb-client (<< ${source:Version}),
mysql-client-5.6,
virtual-mysql-client
Replaces: mariadb-client (<< ${source:Version}),
mariadb-client-10.1,
mariadb-client-10.0,
mariadb-client-5.1,
mariadb-client-5.2,
@@ -234,7 +240,7 @@ Description: MariaDB database client binaries
This package includes the client binaries and the additional tools
innotop and mysqlreport.

Package: mariadb-server-core-10.1
Package: mariadb-server-core-10.2
Architecture: any
Depends: libmariadbclient18 (>= ${binary:Version}),
mariadb-common (>= ${source:Version}),
@@ -245,7 +251,8 @@ Provides: mysql-server-core,
mysql-server-core-5.5,
mysql-server-core-5.6,
virtual-mysql-server-core
Conflicts: mariadb-server-core-10.0,
Conflicts: mariadb-server-core-10.1,
mariadb-server-core-10.0,
mariadb-server-core-5.1,
mariadb-server-core-5.2,
mariadb-server-core-5.3,
@@ -256,7 +263,8 @@ Conflicts: mariadb-server-core-10.0,
mysql-server-core-5.5,
mysql-server-core-5.6,
virtual-mysql-server-core
Replaces: mariadb-server-core-10.0,
Replaces: mariadb-server-core-10.1,
mariadb-server-core-10.0,
mariadb-server-core-5.1,
mariadb-server-core-5.2,
mariadb-server-core-5.3,
@@ -275,20 +283,22 @@ Description: MariaDB database core server files
.
This package includes the core server files, as used by Akonadi.

Package: mariadb-test-10.1
Package: mariadb-test-10.2
Architecture: any
Depends: mariadb-client-10.1 (= ${binary:Version}),
mariadb-server-10.1 (= ${binary:Version})
Depends: mariadb-client-10.2 (= ${binary:Version}),
mariadb-server-10.2 (= ${binary:Version})
Suggests: patch
Conflicts: mariadb-galera-server-5.5 (<< 5.5.33),
mariadb-server-5.5 (<< 5.5.33),
mariadb-test (<< ${source:Version}),
mariadb-test-10.1,
mariadb-test-10.0,
mariadb-test-5.1,
mariadb-test-5.2,
mariadb-test-5.3,
virtual-mysql-testsuite
Replaces: mariadb-test (<< ${source:Version}),
mariadb-test-10.1,
mariadb-test-10.0,
mariadb-test-5.1,
mariadb-test-5.2,
@@ -303,7 +313,7 @@ Description: MariaDB database regression test suite
.
This package includes the regression test suite.

Package: mariadb-server-10.1
Package: mariadb-server-10.2
Architecture: any
Suggests: mailx, mariadb-test, netcat-openbsd, socat, tinyca
Recommends: libhtml-template-perl
@@ -318,8 +328,8 @@ Depends: bsdutils,
libdbi-perl,
lsb-base (>= 3.0-10),
lsof,
mariadb-client-10.1 (>= ${source:Version}),
mariadb-server-core-10.1 (>= ${binary:Version}),
mariadb-client-10.2 (>= ${source:Version}),
mariadb-server-core-10.2 (>= ${binary:Version}),
passwd,
perl (>= 5.6),
psmisc,
@@ -329,6 +339,7 @@ Depends: bsdutils,
${shlibs:Depends}
Provides: mariadb-server, mysql-server, virtual-mysql-server
Conflicts: mariadb-server (<< ${source:Version}),
mariadb-server-10.1,
mariadb-server-10.0,
mariadb-server-5.1,
mariadb-server-5.2,
@@ -346,6 +357,7 @@ Conflicts: mariadb-server (<< ${source:Version}),
Replaces: libmariadbclient-dev (<< 5.5.0),
libmariadbclient16 (<< 5.3.4),
mariadb-server (<< ${source:Version}),
mariadb-server-10.1,
mariadb-server-10.0,
mariadb-server-5.1,
mariadb-server-5.2,
@@ -370,10 +382,10 @@ Description: MariaDB database server binaries

Package: mariadb-server
Architecture: all
Depends: mariadb-server-10.1 (= ${source:Version}), ${misc:Depends}
Depends: mariadb-server-10.2 (= ${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.1), as determined by the MariaDB
mariadb-server (currently mariadb-server-10.2), 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.
@@ -385,26 +397,26 @@ Description: MariaDB database server (metapackage depending on the latest versio

Package: mariadb-client
Architecture: all
Depends: mariadb-client-10.1 (= ${source:Version}), ${misc:Depends}
Depends: mariadb-client-10.2 (= ${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.1), as determined by the MariaDB
mariadb-client (currently mariadb-client-10.2), 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.1 (= ${source:Version}), ${misc:Depends}
Depends: mariadb-test-10.2 (= ${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.1), as determined by the MariaDB
mariadb-test (currently mariadb-test-10.2), as determined by the MariaDB
maintainers.

Package: mariadb-connect-engine-10.1
Package: mariadb-connect-engine-10.2
Architecture: any
Depends: libxml2, mariadb-server-10.1, unixODBC
Depends: libxml2, mariadb-server-10.2, unixODBC
Build-Depends: libxml2-dev,
mariadb-server-10.1,
mariadb-server-10.2,
unixODBC-dev,
${misc:Depends},
${shlibs:Depends}
@@ -414,18 +426,18 @@ Description: Connect storage engine for MariaDB
other interesting features.
This package contains the Connect plugin for MariaDB.

Package: mariadb-oqgraph-engine-10.1
Package: mariadb-oqgraph-engine-10.2
Architecture: any
Depends: libjudydebian1, mariadb-server-10.1, ${misc:Depends}, ${shlibs:Depends}
Depends: libjudydebian1, mariadb-server-10.2, ${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.

Package: mariadb-cracklib-password-check-10.1
Package: mariadb-cracklib-password-check-10.2
Section: database
Architecture: any
Depends: libcrack2 (>= 2.9.0), mariadb-server-10.1
Depends: libcrack2 (>= 2.9.0), mariadb-server-10.2
Description: CrackLib Password Validation Plugin for MariaDB
This password validation plugin uses cracklib to allow only
sufficiently secure (as defined by cracklib) user passwords in MariaDB.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -5,6 +5,6 @@ usr/bin
usr/sbin
usr/share/man/man8
usr/share/mysql
usr/share/doc/mariadb-server-10.1
usr/share/doc/mariadb-server-10.2
var/run/mysqld
var/lib/mysql-upgrade
@@ -20,7 +20,7 @@ usr/lib/mysql/plugin/sql_errlog.so
usr/lib/mysql/plugin/wsrep_info.so
usr/lib/libhsclient.so.*
etc/apparmor.d/usr.sbin.mysqld
usr/share/apport/package-hooks/source_mariadb-10.1.py
usr/share/apport/package-hooks/source_mariadb-10.2.py
etc/mysql/debian-start
etc/mysql/conf.d/mysqld_safe_syslog.cnf
usr/bin/msql2mysql
@@ -55,9 +55,9 @@ usr/bin/wsrep_sst_mysqldump
usr/bin/wsrep_sst_rsync
usr/bin/wsrep_sst_xtrabackup
usr/bin/wsrep_sst_xtrabackup-v2
usr/share/doc/mariadb-server-10.1/mysqld.sym.gz
usr/share/doc/mariadb-server-10.1/INFO_SRC
usr/share/doc/mariadb-server-10.1/INFO_BIN
usr/share/doc/mariadb-server-10.2/mysqld.sym.gz
usr/share/doc/mariadb-server-10.2/INFO_SRC
usr/share/doc/mariadb-server-10.2/INFO_BIN
usr/share/man/man1/msql2mysql.1
usr/share/man/man1/myisamchk.1
usr/share/man/man1/myisam_ftdump.1
@@ -155,7 +155,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-10.1/README.Debian.gz!"
log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-10.2/README.Debian.gz!"
exit -1
else
log_end_msg 0
@@ -131,7 +131,7 @@ EOF
db_set mysql-server/postrm_remove_database false || true

# To avoid downgrades.
touch $mysql_statedir/debian-10.1.flag
touch $mysql_statedir/debian-10.2.flag

## On every reconfiguration the maintenance user is recreated.
#
File renamed without changes.
@@ -46,7 +46,7 @@ stop_server() {

################################ main() ##########################

this_version=10.1
this_version=10.2

# Safe the user from stupidities.
show_downgrade_warning=0
File renamed without changes.
@@ -1,4 +1,4 @@
'''apport package hook for mariadb-10.1
'''apport package hook for mariadb-10.2
(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-10.1', conffiles=None)
attach_conffiles(report, 'mariadb-server-10.2', conffiles=None)
key = 'Logs' + path_to_key('/var/log/daemon.log')
report[key] = ""
for line in read_file('/var/log/daemon.log').split('\n'):
@@ -7,7 +7,7 @@
# Even minor modifications require translation updates and such
# changes should be coordinated with translators and reviewers.

Template: mariadb-server-10.1/really_downgrade
Template: mariadb-server-10.2/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-10.1/README.Debian file
Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file
for more information.

Template: mysql-server/password_mismatch
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1 +1 @@
[type: gettext/rfc822deb] mariadb-server-10.1.templates
[type: gettext/rfc822deb] mariadb-server-10.2.templates

0 comments on commit 679aa12

Please sign in to comment.
You can’t perform that action at this time.