From ee2fce5e88b3ea4a3193422105c83dc1582de29f Mon Sep 17 00:00:00 2001 From: Christian Loos Date: Tue, 20 Oct 2015 09:41:44 +0200 Subject: fix debian logrotate slow log filename debian/additions/my.cnf sets slow_query_log_file to /var/log/mysql/mariadb-slow.log. Update the filename to rotate the slow log file. --- debian/mariadb-server-5.5.mysql-server.logrotate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/mariadb-server-5.5.mysql-server.logrotate b/debian/mariadb-server-5.5.mysql-server.logrotate index 0f0de516b13..789ad353e43 100644 --- a/debian/mariadb-server-5.5.mysql-server.logrotate +++ b/debian/mariadb-server-5.5.mysql-server.logrotate @@ -2,7 +2,7 @@ # flush-logs'd only once. # Else the binary logs would automatically increase by n times every day. # - The error log is obsolete, messages go to syslog now. -/var/log/mysql.log /var/log/mysql/mysql.log /var/log/mysql/mysql-slow.log { +/var/log/mysql.log /var/log/mysql/mysql.log /var/log/mysql/mariadb-slow.log { daily rotate 7 missingok -- cgit v1.2.1 From 2e1c3373501b6940308f18ca25ffe8786bf9c9e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Sat, 28 Nov 2015 00:02:08 +0200 Subject: Replace two identical debian/control files with a single one The only difference between the files was the Debian standards line by one micro version. There was no logical motivation why there was separate control file for Debian and Ubuntu. The new debian/control file lives directly at the correct location and has the correct contents. Modify autobake.sh to take into account new control file location. --- debian/autobake-deb.sh | 8 +- debian/control | 287 +++++++++++++++++++++++++++++++++++++++++++++ debian/dist/Debian/control | 287 --------------------------------------------- debian/dist/Ubuntu/control | 287 --------------------------------------------- 4 files changed, 292 insertions(+), 577 deletions(-) create mode 100644 debian/control delete mode 100644 debian/dist/Debian/control delete mode 100644 debian/dist/Ubuntu/control (limited to 'debian') diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 3ee877af482..e263feaef10 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -39,11 +39,15 @@ case "${CODENAME}" in *) LIBREADLINE_DEV=libreadline-gplv2-dev ;; esac +sed -i -e "s/\\\${LIBREADLINE_DEV}/${LIBREADLINE_DEV}/g" debian/control + case "${CODENAME}" in etch|lenny|hardy|intrepid|jaunty|karmic) CMAKE_DEP='' ;; *) CMAKE_DEP='cmake (>= 2.7), ' ;; esac +sed -i -e "s/\\\${CMAKE_DEP}/${CMAKE_DEP}/g" debian/control + # Clean up build file symlinks that are distro-specific. First remove all, then set # new links. DISTRODIRS="$(ls ./debian/dist)" @@ -60,9 +64,7 @@ echo "Copying distribution specific build files for ${DISTRO}" DISTROFILES="$(ls ./debian/dist/${DISTRO})" for distrofile in ${DISTROFILES}; do rm -f "./debian/${distrofile}" - sed -e "s/\\\${LIBREADLINE_DEV}/${LIBREADLINE_DEV}/g" \ - -e "s/\\\${CMAKE_DEP}/${CMAKE_DEP}/g" \ - < "./debian/dist/${DISTRO}/${distrofile}" > "./debian/${distrofile}" + cat "./debian/dist/${DISTRO}/${distrofile}" > "./debian/${distrofile}" chmod --reference="./debian/dist/${DISTRO}/${distrofile}" "./debian/${distrofile}" done; diff --git a/debian/control b/debian/control new file mode 100644 index 00000000000..b3027b3f463 --- /dev/null +++ b/debian/control @@ -0,0 +1,287 @@ +Source: mariadb-10.0 +Section: misc +Priority: optional +Maintainer: MariaDB Developers +XSBC-Original-Maintainer: Maria Developers +Uploaders: MariaDB Developers +Build-Depends: procps | hurd, debhelper, libncurses5-dev (>= 5.0-6), + perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), + zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, + libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, + dpatch, gawk, bison, lsb-release, hardening-wrapper, + ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0) +Standards-Version: 3.8.3 +Homepage: http://mariadb.org/ +Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/10.0/files +Vcs-Bzr: bzr://lp:maria + +Package: libmariadbclient18 +Section: libs +Architecture: any +Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} +Conflicts: mariadb-server-10.0 (<< 10.0.5), mariadb-galera-server-10.0 (<< 10.0.5), + mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33), + mariadb-server-5.1, + mariadb-server-5.2, + mariadb-server-5.3 +Description: MariaDB database client library + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the client library. + +Package: libmysqlclient18 +Section: libs +Architecture: any +Depends: libmariadbclient18 (= ${source:Version}) +Replaces: libmysqlclient18 (<< ${source:Version}) +Description: Virtual package to satisfy external depends + This is an empty package that provides an updated "best" version of + libmysqlclient18 that does not conflict with the libmariadbclient18 + package. + . + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + +Package: libmariadbd-dev +Architecture: any +Section: libdevel +Depends: libmariadbclient-dev (>= ${source:Version}), ${misc:Depends} +Provides: libmysqld-dev +Conflicts: libmysqld-dev +Replaces: libmysqld-dev +Description: MariaDB embedded database development files + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the embedded server library and header files. + +Package: libmariadbclient-dev +Architecture: any +Section: libdevel +Depends: libmariadbclient18 (>= ${source:Version}), zlib1g-dev, , ${shlibs:Depends}, ${misc:Depends} +Replaces: libmariadbclient16-dev, libmysqlclient16-dev +Conflicts: libmysqlclient-dev, libmariadbclient16-dev, libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev, libmysqlclient15-dev, libmysqlclient16-dev +Provides: libmysqlclient-dev +Description: MariaDB database development files + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes development libraries and header files. + +Package: mysql-common +Section: database +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: MariaDB database common files (e.g. /etc/mysql/my.cnf) + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes files needed by all versions of the client library + (e.g. /etc/mysql/my.cnf). + +Package: mariadb-common +Section: database +Architecture: all +Depends: mysql-common, ${shlibs:Depends}, ${misc:Depends} +Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf) + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + 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.0 +Architecture: any +Depends: mariadb-common, libmariadbclient18 (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} +Provides: mysql-client-core, mysql-client-core-5.1, mysql-client-core-5.5 +Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, + mysql-client-5.1 (<< ${source:Version}), mysql-client-5.5 (<< ${source:Version}), + mysql-client-core-5.1, mysql-client-core-5.5, + mariadb-client-5.1, mariadb-client-core-5.1, + mariadb-client-5.2, mariadb-client-core-5.2, + mariadb-client-5.3, mariadb-client-core-5.3, + mariadb-client-5.5, mariadb-client-core-5.5 +Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, + mysql-client-5.1, mysql-client-5.5, + mysql-client-core-5.1, mysql-client-core-5.5, + mariadb-client-5.1, mariadb-client-core-5.1, + mariadb-client-5.2, mariadb-client-core-5.2, + mariadb-client-5.3, mariadb-client-core-5.3, + mariadb-client-5.5, mariadb-client-core-5.5 +Description: MariaDB database core client binaries + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the core client files, as used by Akonadi. + +Package: mariadb-client-10.0 +Architecture: any +Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), + mariadb-common, libmariadbclient18 (>= ${source:Version}), + mariadb-client-core-10.0 (>= ${source:Version}), ${perl:Depends}, + ${shlibs:Depends}, ${misc:Depends} +Suggests: libterm-readkey-perl +Provides: virtual-mysql-client, mysql-client, + mysql-client-4.1, mysql-client-5.1, mysql-client-5.5 +Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, + mariadb-client (<< ${source:Version}), + mariadb-client-5.1, + mariadb-client-5.2, + mariadb-client-5.3, + mariadb-client-5.5, mysql-client-5.5 +Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, + mariadb-client (<< ${source:Version}), + mariadb-client-5.1, + mariadb-client-5.2, + mariadb-client-5.3, + mariadb-client-5.5, mysql-client-5.5 +Description: MariaDB database client binaries + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the client binaries and the additional tools + innotop and mysqlreport. + +Package: mariadb-server-core-10.0 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version}) +Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5 +Conflicts: mysql-server-5.0, mysql-server-core-5.0, + mariadb-server-core-5.1, mysql-server-core-5.1, + mariadb-server-core-5.2, + mariadb-server-core-5.3, + mariadb-server-core-5.5, mysql-server-core-5.5 +Replaces: mysql-server-5.0, mysql-server-core-5.0, + mariadb-server-core-5.1, mysql-server-core-5.1, + mariadb-server-core-5.2, + mariadb-server-core-5.3, + mariadb-server-core-5.5, mysql-server-core-5.5 +Description: MariaDB database core server files + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the core server files, as used by Akonadi. + +Package: mariadb-test-10.0 +Section: database +Architecture: any +Depends: mariadb-server-10.0 (= ${source:Version}), mariadb-client-10.0 (= ${source:Version}) +Suggests: patch +Conflicts: mariadb-test (<< ${source:Version}), + mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3, + mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33) +Replaces: mariadb-test (<< ${source:Version}), + mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3 +Description: MariaDB database regression test suite + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the regression test suite. + +Package: mariadb-server-10.0 +Architecture: any +Suggests: tinyca, mailx, mariadb-test +Recommends: libhtml-template-perl +Pre-Depends: mariadb-common, adduser (>= 3.40), debconf +Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, + perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, + passwd, lsb-base (>= 3.0-10), bsdutils, + mariadb-server-core-10.0 (>= ${binary:Version}) +Provides: mariadb-server, mysql-server, virtual-mysql-server +Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), + mysql-server-4.1, mysql-server-5.0, + mariadb-server-5.1, mysql-server-5.1, + mariadb-server-5.2, + mariadb-server-5.3, + mariadb-server-5.5, mysql-server-5.5, + mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0 +Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), + mysql-server-4.1, mysql-server-5.0, + mariadb-server-5.1, mysql-server-5.1, + mariadb-server-5.2, + mariadb-server-5.3, + mariadb-server-5.5, mysql-server-5.5, + libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0), + mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0 +Description: MariaDB database server binaries + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the server binaries. + +Package: mariadb-server +Section: database +Architecture: all +Depends: mariadb-server-10.0 (= ${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.0), 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. + . + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + +Package: mariadb-client +Section: database +Architecture: all +Depends: mariadb-client-10.0 (= ${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.0), as determined by the MariaDB + maintainers. Install this package if in doubt about which MariaDB version + you want, as this is the one we consider to be in the best shape. + +Package: mariadb-test +Section: database +Architecture: all +Depends: mariadb-test-10.0 (= ${source:Version}) +Description: MariaDB database regression test suite (metapackage depending on the latest version) + This is an empty package that depends on the current "best" version of + mariadb-test (currently mariadb-test-10.0), as determined by the MariaDB + maintainers. + +Package: mariadb-connect-engine-10.0 +Section: database +Architecture: any +Depends: mariadb-server-10.0|mariadb-galera-server-10.0, unixODBC, libxml2 +Build-depends: mariadb-server-10.0|mariadb-galera-server-10.0, unixODBC-dev, libxml2-dev +Description: Connect storage engine for MariaDB + Connect engine supports a number of file formats (dbf, xml, txt, bin, etc), + connections to ODBC tables and remote MySQL tables, as well as a number of + other interesting features. + +Package: mariadb-oqgraph-engine-10.0 +Section: database +Architecture: any +Depends: mariadb-server-10.0|mariadb-galera-server-10.0, libjudydebian1 +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. + diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control deleted file mode 100644 index b3027b3f463..00000000000 --- a/debian/dist/Debian/control +++ /dev/null @@ -1,287 +0,0 @@ -Source: mariadb-10.0 -Section: misc -Priority: optional -Maintainer: MariaDB Developers -XSBC-Original-Maintainer: Maria Developers -Uploaders: MariaDB Developers -Build-Depends: procps | hurd, debhelper, libncurses5-dev (>= 5.0-6), - perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), - zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, - libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, - dpatch, gawk, bison, lsb-release, hardening-wrapper, - ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0) -Standards-Version: 3.8.3 -Homepage: http://mariadb.org/ -Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/10.0/files -Vcs-Bzr: bzr://lp:maria - -Package: libmariadbclient18 -Section: libs -Architecture: any -Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} -Conflicts: mariadb-server-10.0 (<< 10.0.5), mariadb-galera-server-10.0 (<< 10.0.5), - mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33), - mariadb-server-5.1, - mariadb-server-5.2, - mariadb-server-5.3 -Description: MariaDB database client library - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes the client library. - -Package: libmysqlclient18 -Section: libs -Architecture: any -Depends: libmariadbclient18 (= ${source:Version}) -Replaces: libmysqlclient18 (<< ${source:Version}) -Description: Virtual package to satisfy external depends - This is an empty package that provides an updated "best" version of - libmysqlclient18 that does not conflict with the libmariadbclient18 - package. - . - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - -Package: libmariadbd-dev -Architecture: any -Section: libdevel -Depends: libmariadbclient-dev (>= ${source:Version}), ${misc:Depends} -Provides: libmysqld-dev -Conflicts: libmysqld-dev -Replaces: libmysqld-dev -Description: MariaDB embedded database development files - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes the embedded server library and header files. - -Package: libmariadbclient-dev -Architecture: any -Section: libdevel -Depends: libmariadbclient18 (>= ${source:Version}), zlib1g-dev, , ${shlibs:Depends}, ${misc:Depends} -Replaces: libmariadbclient16-dev, libmysqlclient16-dev -Conflicts: libmysqlclient-dev, libmariadbclient16-dev, libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev, libmysqlclient15-dev, libmysqlclient16-dev -Provides: libmysqlclient-dev -Description: MariaDB database development files - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes development libraries and header files. - -Package: mysql-common -Section: database -Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: MariaDB database common files (e.g. /etc/mysql/my.cnf) - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes files needed by all versions of the client library - (e.g. /etc/mysql/my.cnf). - -Package: mariadb-common -Section: database -Architecture: all -Depends: mysql-common, ${shlibs:Depends}, ${misc:Depends} -Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf) - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - 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.0 -Architecture: any -Depends: mariadb-common, libmariadbclient18 (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} -Provides: mysql-client-core, mysql-client-core-5.1, mysql-client-core-5.5 -Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, - mysql-client-5.1 (<< ${source:Version}), mysql-client-5.5 (<< ${source:Version}), - mysql-client-core-5.1, mysql-client-core-5.5, - mariadb-client-5.1, mariadb-client-core-5.1, - mariadb-client-5.2, mariadb-client-core-5.2, - mariadb-client-5.3, mariadb-client-core-5.3, - mariadb-client-5.5, mariadb-client-core-5.5 -Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, - mysql-client-5.1, mysql-client-5.5, - mysql-client-core-5.1, mysql-client-core-5.5, - mariadb-client-5.1, mariadb-client-core-5.1, - mariadb-client-5.2, mariadb-client-core-5.2, - mariadb-client-5.3, mariadb-client-core-5.3, - mariadb-client-5.5, mariadb-client-core-5.5 -Description: MariaDB database core client binaries - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes the core client files, as used by Akonadi. - -Package: mariadb-client-10.0 -Architecture: any -Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), - mariadb-common, libmariadbclient18 (>= ${source:Version}), - mariadb-client-core-10.0 (>= ${source:Version}), ${perl:Depends}, - ${shlibs:Depends}, ${misc:Depends} -Suggests: libterm-readkey-perl -Provides: virtual-mysql-client, mysql-client, - mysql-client-4.1, mysql-client-5.1, mysql-client-5.5 -Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, - mariadb-client (<< ${source:Version}), - mariadb-client-5.1, - mariadb-client-5.2, - mariadb-client-5.3, - mariadb-client-5.5, mysql-client-5.5 -Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, - mariadb-client (<< ${source:Version}), - mariadb-client-5.1, - mariadb-client-5.2, - mariadb-client-5.3, - mariadb-client-5.5, mysql-client-5.5 -Description: MariaDB database client binaries - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes the client binaries and the additional tools - innotop and mysqlreport. - -Package: mariadb-server-core-10.0 -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version}) -Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5 -Conflicts: mysql-server-5.0, mysql-server-core-5.0, - mariadb-server-core-5.1, mysql-server-core-5.1, - mariadb-server-core-5.2, - mariadb-server-core-5.3, - mariadb-server-core-5.5, mysql-server-core-5.5 -Replaces: mysql-server-5.0, mysql-server-core-5.0, - mariadb-server-core-5.1, mysql-server-core-5.1, - mariadb-server-core-5.2, - mariadb-server-core-5.3, - mariadb-server-core-5.5, mysql-server-core-5.5 -Description: MariaDB database core server files - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes the core server files, as used by Akonadi. - -Package: mariadb-test-10.0 -Section: database -Architecture: any -Depends: mariadb-server-10.0 (= ${source:Version}), mariadb-client-10.0 (= ${source:Version}) -Suggests: patch -Conflicts: mariadb-test (<< ${source:Version}), - mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3, - mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33) -Replaces: mariadb-test (<< ${source:Version}), - mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3 -Description: MariaDB database regression test suite - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes the regression test suite. - -Package: mariadb-server-10.0 -Architecture: any -Suggests: tinyca, mailx, mariadb-test -Recommends: libhtml-template-perl -Pre-Depends: mariadb-common, adduser (>= 3.40), debconf -Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, - perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, - passwd, lsb-base (>= 3.0-10), bsdutils, - mariadb-server-core-10.0 (>= ${binary:Version}) -Provides: mariadb-server, mysql-server, virtual-mysql-server -Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), - mysql-server-4.1, mysql-server-5.0, - mariadb-server-5.1, mysql-server-5.1, - mariadb-server-5.2, - mariadb-server-5.3, - mariadb-server-5.5, mysql-server-5.5, - mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0 -Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), - mysql-server-4.1, mysql-server-5.0, - mariadb-server-5.1, mysql-server-5.1, - mariadb-server-5.2, - mariadb-server-5.3, - mariadb-server-5.5, mysql-server-5.5, - libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0), - mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0 -Description: MariaDB database server binaries - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes the server binaries. - -Package: mariadb-server -Section: database -Architecture: all -Depends: mariadb-server-10.0 (= ${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.0), 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. - . - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - -Package: mariadb-client -Section: database -Architecture: all -Depends: mariadb-client-10.0 (= ${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.0), as determined by the MariaDB - maintainers. Install this package if in doubt about which MariaDB version - you want, as this is the one we consider to be in the best shape. - -Package: mariadb-test -Section: database -Architecture: all -Depends: mariadb-test-10.0 (= ${source:Version}) -Description: MariaDB database regression test suite (metapackage depending on the latest version) - This is an empty package that depends on the current "best" version of - mariadb-test (currently mariadb-test-10.0), as determined by the MariaDB - maintainers. - -Package: mariadb-connect-engine-10.0 -Section: database -Architecture: any -Depends: mariadb-server-10.0|mariadb-galera-server-10.0, unixODBC, libxml2 -Build-depends: mariadb-server-10.0|mariadb-galera-server-10.0, unixODBC-dev, libxml2-dev -Description: Connect storage engine for MariaDB - Connect engine supports a number of file formats (dbf, xml, txt, bin, etc), - connections to ODBC tables and remote MySQL tables, as well as a number of - other interesting features. - -Package: mariadb-oqgraph-engine-10.0 -Section: database -Architecture: any -Depends: mariadb-server-10.0|mariadb-galera-server-10.0, libjudydebian1 -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. - diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control deleted file mode 100644 index 7133074b4ec..00000000000 --- a/debian/dist/Ubuntu/control +++ /dev/null @@ -1,287 +0,0 @@ -Source: mariadb-10.0 -Section: misc -Priority: optional -Maintainer: MariaDB Developers -XSBC-Original-Maintainer: Maria Developers -Uploaders: MariaDB Developers -Build-Depends: procps | hurd, debhelper, libncurses5-dev (>= 5.0-6), - perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), - zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, - libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, - dpatch, gawk, bison, lsb-release, hardening-wrapper, - ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0) -Standards-Version: 3.8.2 -Homepage: http://mariadb.org/ -Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/10.0/files -Vcs-Bzr: bzr://lp:maria - -Package: libmariadbclient18 -Section: libs -Architecture: any -Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} -Conflicts: mariadb-server-10.0 (<< 10.0.5), mariadb-galera-server-10.0 (<< 10.0.5), - mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33), - mariadb-server-5.1, - mariadb-server-5.2, - mariadb-server-5.3 -Description: MariaDB database client library - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes the client library. - -Package: libmysqlclient18 -Section: libs -Architecture: any -Depends: libmariadbclient18 (= ${source:Version}) -Replaces: libmysqlclient18 (<< ${source:Version}) -Description: Virtual package to satisfy external depends - This is an empty package that provides an updated "best" version of - libmysqlclient18 that does not conflict with the libmariadbclient18 - package. - . - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - -Package: libmariadbd-dev -Architecture: any -Section: libdevel -Depends: libmariadbclient-dev (>= ${source:Version}), ${misc:Depends} -Provides: libmysqld-dev -Conflicts: libmysqld-dev -Replaces: libmysqld-dev -Description: MariaDB embedded database development files - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes the embedded server library and header files. - -Package: libmariadbclient-dev -Architecture: any -Section: libdevel -Depends: libmariadbclient18 (>= ${source:Version}), zlib1g-dev, , ${shlibs:Depends}, ${misc:Depends} -Replaces: libmariadbclient16-dev, libmysqlclient16-dev -Conflicts: libmysqlclient-dev, libmariadbclient16-dev, libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev, libmysqlclient15-dev, libmysqlclient16-dev -Provides: libmysqlclient-dev -Description: MariaDB database development files - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes development libraries and header files. - -Package: mysql-common -Section: database -Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: MariaDB database common files (e.g. /etc/mysql/my.cnf) - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes files needed by all versions of the client library - (e.g. /etc/mysql/my.cnf). - -Package: mariadb-common -Section: database -Architecture: all -Depends: mysql-common, ${shlibs:Depends}, ${misc:Depends} -Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf) - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - 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.0 -Architecture: any -Depends: mariadb-common, libmariadbclient18 (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} -Provides: mysql-client-core, mysql-client-core-5.1, mysql-client-core-5.5 -Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, - mysql-client-5.1 (<< ${source:Version}), mysql-client-5.5 (<< ${source:Version}), - mysql-client-core-5.1, mysql-client-core-5.5, - mariadb-client-5.1, mariadb-client-core-5.1, - mariadb-client-5.2, mariadb-client-core-5.2, - mariadb-client-5.3, mariadb-client-core-5.3, - mariadb-client-5.5, mariadb-client-core-5.5 -Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, - mysql-client-5.1, mysql-client-5.5, - mysql-client-core-5.1, mysql-client-core-5.5, - mariadb-client-5.1, mariadb-client-core-5.1, - mariadb-client-5.2, mariadb-client-core-5.2, - mariadb-client-5.3, mariadb-client-core-5.3, - mariadb-client-5.5, mariadb-client-core-5.5 -Description: MariaDB database core client binaries - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes the core client files, as used by Akonadi. - -Package: mariadb-client-10.0 -Architecture: any -Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), - mariadb-common, libmariadbclient18 (>= ${source:Version}), - mariadb-client-core-10.0 (>= ${source:Version}), ${perl:Depends}, - ${shlibs:Depends}, ${misc:Depends} -Suggests: libterm-readkey-perl -Provides: virtual-mysql-client, mysql-client, - mysql-client-4.1, mysql-client-5.1, mysql-client-5.5 -Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, - mariadb-client (<< ${source:Version}), - mariadb-client-5.1, - mariadb-client-5.2, - mariadb-client-5.3, - mariadb-client-5.5, mysql-client-5.5 -Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, - mariadb-client (<< ${source:Version}), - mariadb-client-5.1, - mariadb-client-5.2, - mariadb-client-5.3, - mariadb-client-5.5, mysql-client-5.5 -Description: MariaDB database client binaries - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes the client binaries and the additional tools - innotop and mysqlreport. - -Package: mariadb-server-core-10.0 -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version}) -Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5 -Conflicts: mysql-server-5.0, mysql-server-core-5.0, - mariadb-server-core-5.1, mysql-server-core-5.1, - mariadb-server-core-5.2, - mariadb-server-core-5.3, - mariadb-server-core-5.5, mysql-server-core-5.5 -Replaces: mysql-server-5.0, mysql-server-core-5.0, - mariadb-server-core-5.1, mysql-server-core-5.1, - mariadb-server-core-5.2, - mariadb-server-core-5.3, - mariadb-server-core-5.5, mysql-server-core-5.5 -Description: MariaDB database core server files - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes the core server files, as used by Akonadi. - -Package: mariadb-test-10.0 -Section: database -Architecture: any -Depends: mariadb-server-10.0 (= ${source:Version}), mariadb-client-10.0 (= ${source:Version}) -Suggests: patch -Conflicts: mariadb-test (<< ${source:Version}), - mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3, - mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33) -Replaces: mariadb-test (<< ${source:Version}), - mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3 -Description: MariaDB database regression test suite - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes the regression test suite. - -Package: mariadb-server-10.0 -Architecture: any -Suggests: tinyca, mailx, mariadb-test -Recommends: libhtml-template-perl -Pre-Depends: mariadb-common, adduser (>= 3.40), debconf -Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, - perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, - passwd, lsb-base (>= 3.0-10), bsdutils, - mariadb-server-core-10.0 (>= ${binary:Version}) -Provides: mariadb-server, mysql-server, virtual-mysql-server -Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), - mysql-server-4.1, mysql-server-5.0, - mariadb-server-5.1, mysql-server-5.1, - mariadb-server-5.2, - mariadb-server-5.3, - mariadb-server-5.5, mysql-server-5.5, - mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0 -Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), - mysql-server-4.1, mysql-server-5.0, - mariadb-server-5.1, mysql-server-5.1, - mariadb-server-5.2, - mariadb-server-5.3, - mariadb-server-5.5, mysql-server-5.5, - libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0), - mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0 -Description: MariaDB database server binaries - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - . - This package includes the server binaries. - -Package: mariadb-server -Section: database -Architecture: all -Depends: mariadb-server-10.0 (= ${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.0), 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. - . - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database - server. SQL (Structured Query Language) is the most popular database query - language in the world. The main goals of MariaDB are speed, robustness and - ease of use. - -Package: mariadb-client -Section: database -Architecture: all -Depends: mariadb-client-10.0 (= ${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.0), as determined by the MariaDB - maintainers. Install this package if in doubt about which MariaDB version - you want, as this is the one we consider to be in the best shape. - -Package: mariadb-test -Section: database -Architecture: all -Depends: mariadb-test-10.0 (= ${source:Version}) -Description: MariaDB database regression test suite (metapackage depending on the latest version) - This is an empty package that depends on the current "best" version of - mariadb-test (currently mariadb-test-10.0), as determined by the MariaDB - maintainers. - -Package: mariadb-connect-engine-10.0 -Section: database -Architecture: any -Depends: mariadb-server-10.0|mariadb-galera-server-10.0, unixODBC, libxml2 -Build-depends: mariadb-server-10.0|mariadb-galera-server-10.0, unixODBC-dev, libxml2-dev -Description: Connect storage engine for MariaDB - Connect engine supports a number of file formats (dbf, xml, txt, bin, etc), - connections to ODBC tables and remote MySQL tables, as well as a number of - other interesting features. - -Package: mariadb-oqgraph-engine-10.0 -Section: database -Architecture: any -Depends: mariadb-server-10.0|mariadb-galera-server-10.0, libjudydebian1 -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. - -- cgit v1.2.1 From 0d604dd828e9722bd6fc9439cbf4bea72a987d31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Sat, 28 Nov 2015 00:05:46 +0200 Subject: Run wrap-and-sort for debian/* files. No functional changes. --- debian/control | 264 +++++++++++++++++++++++++++++++++++++------------------ debian/copyright | 16 ++-- 2 files changed, 185 insertions(+), 95 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index b3027b3f463..e6e82697d9c 100644 --- a/debian/control +++ b/debian/control @@ -4,12 +4,25 @@ Priority: optional Maintainer: MariaDB Developers XSBC-Original-Maintainer: Maria Developers Uploaders: MariaDB Developers -Build-Depends: procps | hurd, debhelper, libncurses5-dev (>= 5.0-6), - perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), - zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, - libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, - dpatch, gawk, bison, lsb-release, hardening-wrapper, - ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0) +Build-Depends: bison, + chrpath, + debhelper, + dpatch, + gawk, + hardening-wrapper, + libjemalloc-dev (>= 3.0.0), + libncurses5-dev (>= 5.0-6), + libpam0g-dev, + libssl-dev, + libwrap0-dev (>= 7.6-8.3), + lsb-release, + perl (>= 5.6.0), + po-debconf, + procps | hurd, + psmisc, + zlib1g-dev (>= 1:1.1.3-5), + ${CMAKE_DEP}libaio-dev, + ${LIBREADLINE_DEV} Standards-Version: 3.8.3 Homepage: http://mariadb.org/ Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/10.0/files @@ -18,12 +31,17 @@ Vcs-Bzr: bzr://lp:maria Package: libmariadbclient18 Section: libs Architecture: any -Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} -Conflicts: mariadb-server-10.0 (<< 10.0.5), mariadb-galera-server-10.0 (<< 10.0.5), - mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33), +Depends: libmysqlclient18 (= ${source:Version}), + mariadb-common, + ${misc:Depends}, + ${shlibs:Depends} +Conflicts: mariadb-galera-server-10.0 (<< 10.0.5), + mariadb-galera-server-5.5 (<< 5.5.33), + mariadb-server-10.0 (<< 10.0.5), mariadb-server-5.1, mariadb-server-5.2, - mariadb-server-5.3 + mariadb-server-5.3, + mariadb-server-5.5 (<< 5.5.33) Description: MariaDB database client library MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -65,9 +83,18 @@ Description: MariaDB embedded database development files Package: libmariadbclient-dev Architecture: any Section: libdevel -Depends: libmariadbclient18 (>= ${source:Version}), zlib1g-dev, , ${shlibs:Depends}, ${misc:Depends} +Depends: libmariadbclient18 (>= ${source:Version}), + zlib1g-dev, + ${misc:Depends}, + ${shlibs:Depends} Replaces: libmariadbclient16-dev, libmysqlclient16-dev -Conflicts: libmysqlclient-dev, libmariadbclient16-dev, libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev, libmysqlclient15-dev, libmysqlclient16-dev +Conflicts: libmariadbclient16-dev, + libmysqlclient-dev, + libmysqlclient10-dev, + libmysqlclient12-dev, + libmysqlclient14-dev, + libmysqlclient15-dev, + libmysqlclient16-dev Provides: libmysqlclient-dev Description: MariaDB database development files MariaDB is a fast, stable and true multi-user, multi-threaded SQL database @@ -80,7 +107,7 @@ Description: MariaDB database development files Package: mysql-common Section: database Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Description: MariaDB database common files (e.g. /etc/mysql/my.cnf) MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -93,7 +120,7 @@ Description: MariaDB database common files (e.g. /etc/mysql/my.cnf) Package: mariadb-common Section: database Architecture: all -Depends: mysql-common, ${shlibs:Depends}, ${misc:Depends} +Depends: mysql-common, ${misc:Depends}, ${shlibs:Depends} Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf) MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -105,22 +132,39 @@ Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf) Package: mariadb-client-core-10.0 Architecture: any -Depends: mariadb-common, libmariadbclient18 (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: libmariadbclient18 (>= ${source:Version}), + mariadb-common, + ${misc:Depends}, + ${shlibs:Depends} Provides: mysql-client-core, mysql-client-core-5.1, mysql-client-core-5.5 -Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, - mysql-client-5.1 (<< ${source:Version}), mysql-client-5.5 (<< ${source:Version}), - mysql-client-core-5.1, mysql-client-core-5.5, - mariadb-client-5.1, mariadb-client-core-5.1, - mariadb-client-5.2, mariadb-client-core-5.2, - mariadb-client-5.3, mariadb-client-core-5.3, - mariadb-client-5.5, mariadb-client-core-5.5 -Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, - mysql-client-5.1, mysql-client-5.5, - mysql-client-core-5.1, mysql-client-core-5.5, - mariadb-client-5.1, mariadb-client-core-5.1, - mariadb-client-5.2, mariadb-client-core-5.2, - mariadb-client-5.3, mariadb-client-core-5.3, - mariadb-client-5.5, mariadb-client-core-5.5 +Conflicts: mariadb-client-5.1, + mariadb-client-5.2, + mariadb-client-5.3, + mariadb-client-5.5, + mariadb-client-core-5.1, + mariadb-client-core-5.2, + mariadb-client-core-5.3, + mariadb-client-core-5.5, + mysql-client (<< 5.0.51), + mysql-client-5.0, + mysql-client-5.1 (<< ${source:Version}), + mysql-client-5.5 (<< ${source:Version}), + mysql-client-core-5.1, + mysql-client-core-5.5 +Replaces: mariadb-client-5.1, + mariadb-client-5.2, + mariadb-client-5.3, + mariadb-client-5.5, + mariadb-client-core-5.1, + mariadb-client-core-5.2, + mariadb-client-core-5.3, + mariadb-client-core-5.5, + mysql-client (<< 5.0.51), + mysql-client-5.0, + mysql-client-5.1, + mysql-client-5.5, + mysql-client-core-5.1, + mysql-client-core-5.5 Description: MariaDB database core client binaries MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -131,25 +175,39 @@ Description: MariaDB database core client binaries Package: mariadb-client-10.0 Architecture: any -Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), - mariadb-common, libmariadbclient18 (>= ${source:Version}), - mariadb-client-core-10.0 (>= ${source:Version}), ${perl:Depends}, - ${shlibs:Depends}, ${misc:Depends} +Depends: debianutils (>=1.6), + libdbd-mysql-perl (>= 1.2202), + libdbi-perl, + libmariadbclient18 (>= ${source:Version}), + mariadb-client-core-10.0 (>= ${source:Version}), + mariadb-common, + ${misc:Depends}, + ${perl:Depends}, + ${shlibs:Depends} Suggests: libterm-readkey-perl -Provides: virtual-mysql-client, mysql-client, - mysql-client-4.1, mysql-client-5.1, mysql-client-5.5 -Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, - mariadb-client (<< ${source:Version}), - mariadb-client-5.1, - mariadb-client-5.2, - mariadb-client-5.3, - mariadb-client-5.5, mysql-client-5.5 -Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, - mariadb-client (<< ${source:Version}), - mariadb-client-5.1, - mariadb-client-5.2, - mariadb-client-5.3, - mariadb-client-5.5, mysql-client-5.5 +Provides: mysql-client, + mysql-client-4.1, + mysql-client-5.1, + mysql-client-5.5, + virtual-mysql-client +Conflicts: mariadb-client (<< ${source:Version}), + mariadb-client-5.1, + mariadb-client-5.2, + mariadb-client-5.3, + mariadb-client-5.5, + mysql-client (<< 5.0.51), + mysql-client-5.0, + mysql-client-5.1, + mysql-client-5.5 +Replaces: mariadb-client (<< ${source:Version}), + mariadb-client-5.1, + mariadb-client-5.2, + mariadb-client-5.3, + mariadb-client-5.5, + mysql-client (<< 5.0.51), + mysql-client-5.0, + mysql-client-5.1, + mysql-client-5.5 Description: MariaDB database client binaries MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -161,18 +219,26 @@ Description: MariaDB database client binaries Package: mariadb-server-core-10.0 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version}) +Depends: libmariadbclient18 (>= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5 -Conflicts: mysql-server-5.0, mysql-server-core-5.0, - mariadb-server-core-5.1, mysql-server-core-5.1, - mariadb-server-core-5.2, - mariadb-server-core-5.3, - mariadb-server-core-5.5, mysql-server-core-5.5 -Replaces: mysql-server-5.0, mysql-server-core-5.0, - mariadb-server-core-5.1, mysql-server-core-5.1, - mariadb-server-core-5.2, - mariadb-server-core-5.3, - mariadb-server-core-5.5, mysql-server-core-5.5 +Conflicts: mariadb-server-core-5.1, + mariadb-server-core-5.2, + mariadb-server-core-5.3, + mariadb-server-core-5.5, + mysql-server-5.0, + mysql-server-core-5.0, + mysql-server-core-5.1, + mysql-server-core-5.5 +Replaces: mariadb-server-core-5.1, + mariadb-server-core-5.2, + mariadb-server-core-5.3, + mariadb-server-core-5.5, + mysql-server-5.0, + mysql-server-core-5.0, + mysql-server-core-5.1, + mysql-server-core-5.5 Description: MariaDB database core server files MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -184,13 +250,19 @@ Description: MariaDB database core server files Package: mariadb-test-10.0 Section: database Architecture: any -Depends: mariadb-server-10.0 (= ${source:Version}), mariadb-client-10.0 (= ${source:Version}) +Depends: mariadb-client-10.0 (= ${source:Version}), + mariadb-server-10.0 (= ${source:Version}) Suggests: patch -Conflicts: mariadb-test (<< ${source:Version}), - mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3, - mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33) +Conflicts: mariadb-galera-server-5.5 (<< 5.5.33), + mariadb-server-5.5 (<< 5.5.33), + mariadb-test (<< ${source:Version}), + mariadb-test-5.1, + mariadb-test-5.2, + mariadb-test-5.3 Replaces: mariadb-test (<< ${source:Version}), - mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3 + mariadb-test-5.1, + mariadb-test-5.2, + mariadb-test-5.3 Description: MariaDB database regression test suite MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -201,29 +273,46 @@ Description: MariaDB database regression test suite Package: mariadb-server-10.0 Architecture: any -Suggests: tinyca, mailx, mariadb-test +Suggests: mailx, mariadb-test, tinyca Recommends: libhtml-template-perl Pre-Depends: mariadb-common, adduser (>= 3.40), debconf -Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, - perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, - passwd, lsb-base (>= 3.0-10), bsdutils, - mariadb-server-core-10.0 (>= ${binary:Version}) +Depends: bsdutils, + libdbi-perl, + lsb-base (>= 3.0-10), + mariadb-client-10.0 (>= ${source:Version}), + mariadb-server-core-10.0 (>= ${binary:Version}), + passwd, + perl (>= 5.6), + psmisc, + ${misc:Depends}, + ${shlibs:Depends} Provides: mariadb-server, mysql-server, virtual-mysql-server -Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), - mysql-server-4.1, mysql-server-5.0, - mariadb-server-5.1, mysql-server-5.1, - mariadb-server-5.2, - mariadb-server-5.3, - mariadb-server-5.5, mysql-server-5.5, - mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0 -Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), - mysql-server-4.1, mysql-server-5.0, - mariadb-server-5.1, mysql-server-5.1, - mariadb-server-5.2, - mariadb-server-5.3, - mariadb-server-5.5, mysql-server-5.5, - libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0), - mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0 +Conflicts: mariadb-server (<< ${source:Version}), + mariadb-server-5.1, + mariadb-server-5.2, + mariadb-server-5.3, + mariadb-server-5.5, + mariadb-tokudb-engine-10.0, + mariadb-tokudb-engine-5.5, + mysql-server (<< ${source:Version}), + mysql-server-4.1, + mysql-server-5.0, + mysql-server-5.1, + mysql-server-5.5 +Replaces: libmariadbclient-dev (<< 5.5.0), + libmariadbclient16 (<< 5.3.4), + mariadb-server (<< ${source:Version}), + mariadb-server-5.1, + mariadb-server-5.2, + mariadb-server-5.3, + mariadb-server-5.5, + mariadb-tokudb-engine-10.0, + mariadb-tokudb-engine-5.5, + mysql-server (<< ${source:Version}), + mysql-server-4.1, + mysql-server-5.0, + mysql-server-5.1, + mysql-server-5.5 Description: MariaDB database server binaries MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -270,8 +359,10 @@ Description: MariaDB database regression test suite (metapackage depending on th Package: mariadb-connect-engine-10.0 Section: database Architecture: any -Depends: mariadb-server-10.0|mariadb-galera-server-10.0, unixODBC, libxml2 -Build-depends: mariadb-server-10.0|mariadb-galera-server-10.0, unixODBC-dev, libxml2-dev +Depends: libxml2, mariadb-server-10.0|mariadb-galera-server-10.0, unixODBC +Build-depends: libxml2-dev, + mariadb-server-10.0|mariadb-galera-server-10.0, + unixODBC-dev Description: Connect storage engine for MariaDB Connect engine supports a number of file formats (dbf, xml, txt, bin, etc), connections to ODBC tables and remote MySQL tables, as well as a number of @@ -280,8 +371,7 @@ Description: Connect storage engine for MariaDB Package: mariadb-oqgraph-engine-10.0 Section: database Architecture: any -Depends: mariadb-server-10.0|mariadb-galera-server-10.0, libjudydebian1 +Depends: libjudydebian1, mariadb-server-10.0|mariadb-galera-server-10.0 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. - diff --git a/debian/copyright b/debian/copyright index 9c98778b4f8..5207620b411 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,7 +2,7 @@ == MariaDB == The Debian package of MySQL was first debianzed on 1997-04-12 by Christian -Schwarz and ist maintained since 1999-04-20 by +Schwarz and ist maintained since 1999-04-20 by Christian Hammers . The MariaDB packages were initally made by http://ourdelta.org/, and @@ -17,22 +17,22 @@ According to the file "COPYING" all parts of this package are licenced under the terms of the GNU GPL Version 2 of which a copy is available in /usr/share/common-licenses. -To allow free software with other licences than the GPL to link against the +To allow free software with other licences than the GPL to link against the shared library, special terms for "derived works" are granted in the README file of MySQL 5.5, as follows: > MySQL FOSS License Exception > We want free and open source software applications under certain > licenses to be able to use specified GPL-licensed MySQL client > libraries despite the fact that not all such FOSS licenses are -> compatible with version 2 of the GNU General Public License. -> Therefore there are special exceptions to the terms and conditions -> of the GPLv2 as applied to these client libraries, which are -> identified and described in more detail in the FOSS License -> Exception at +> compatible with version 2 of the GNU General Public License. +> Therefore there are special exceptions to the terms and conditions +> of the GPLv2 as applied to these client libraries, which are +> identified and described in more detail in the FOSS License +> Exception at > . The manual had to be removed as it is not free in the sense of the -Debian Free Software Guidelines (DFSG). +Debian Free Software Guidelines (DFSG). == innotop == -- cgit v1.2.1 From c5e7098d0f193726e74ea681dc05385bd82d401f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Tue, 1 Sep 2015 23:01:43 +0300 Subject: Add MySQL 5.6 stanzas next to MySQL 5.5 in debian/control file This should make the provides/breaks/replaces/conflicts lines work properly when upgrading from mysql-5.6 to mariadb-packages. Conflicts: debian/control --- debian/control | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index e6e82697d9c..c699d6cf595 100644 --- a/debian/control +++ b/debian/control @@ -136,7 +136,10 @@ Depends: libmariadbclient18 (>= ${source:Version}), mariadb-common, ${misc:Depends}, ${shlibs:Depends} -Provides: mysql-client-core, mysql-client-core-5.1, mysql-client-core-5.5 +Provides: mysql-client-core, + mysql-client-core-5.1, + mysql-client-core-5.5, + mysql-client-core-5.6 Conflicts: mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3, @@ -150,7 +153,8 @@ Conflicts: mariadb-client-5.1, mysql-client-5.1 (<< ${source:Version}), mysql-client-5.5 (<< ${source:Version}), mysql-client-core-5.1, - mysql-client-core-5.5 + mysql-client-core-5.5, + mysql-client-core-5.6 Replaces: mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3, @@ -164,7 +168,8 @@ Replaces: mariadb-client-5.1, mysql-client-5.1, mysql-client-5.5, mysql-client-core-5.1, - mysql-client-core-5.5 + mysql-client-core-5.5, + mysql-client-core-5.6 Description: MariaDB database core client binaries MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -189,6 +194,7 @@ Provides: mysql-client, mysql-client-4.1, mysql-client-5.1, mysql-client-5.5, + mysql-client-5.6, virtual-mysql-client Conflicts: mariadb-client (<< ${source:Version}), mariadb-client-5.1, @@ -198,7 +204,8 @@ Conflicts: mariadb-client (<< ${source:Version}), mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, - mysql-client-5.5 + mysql-client-5.5, + mysql-client-5.6 Replaces: mariadb-client (<< ${source:Version}), mariadb-client-5.1, mariadb-client-5.2, @@ -207,7 +214,8 @@ Replaces: mariadb-client (<< ${source:Version}), mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, - mysql-client-5.5 + mysql-client-5.5, + mysql-client-5.6 Description: MariaDB database client binaries MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -222,7 +230,10 @@ Architecture: any Depends: libmariadbclient18 (>= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} -Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5 +Provides: mysql-server-core, + mysql-server-core-5.1, + mysql-server-core-5.5, + mysql-server-core-5.6 Conflicts: mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.3, @@ -230,7 +241,8 @@ Conflicts: mariadb-server-core-5.1, mysql-server-5.0, mysql-server-core-5.0, mysql-server-core-5.1, - mysql-server-core-5.5 + mysql-server-core-5.5, + mysql-server-core-5.6 Replaces: mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.3, @@ -238,7 +250,8 @@ Replaces: mariadb-server-core-5.1, mysql-server-5.0, mysql-server-core-5.0, mysql-server-core-5.1, - mysql-server-core-5.5 + mysql-server-core-5.5, + mysql-server-core-5.6 Description: MariaDB database core server files MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -298,7 +311,8 @@ Conflicts: mariadb-server (<< ${source:Version}), mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, - mysql-server-5.5 + mysql-server-5.5, + mysql-server-5.6 Replaces: libmariadbclient-dev (<< 5.5.0), libmariadbclient16 (<< 5.3.4), mariadb-server (<< ${source:Version}), @@ -312,7 +326,8 @@ Replaces: libmariadbclient-dev (<< 5.5.0), mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, - mysql-server-5.5 + mysql-server-5.5, + mysql-server-5.6 Description: MariaDB database server binaries MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query -- cgit v1.2.1 From a60da7358594631872c40d0ea3a8558f9c755e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Wed, 22 Jul 2015 13:45:43 +0300 Subject: Make autobake-deb.sh to omit .git directory from source tar.gz This is useful for developers who run autobake-deb.sh directly from the source tree as the resulting source tar package will be 90% smaller and all operations regarding it consequently 10x faster. --- debian/autobake-deb.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index e263feaef10..bb14057b43b 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -77,8 +77,9 @@ dch -b -D ${CODENAME} -v "${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTR echo "Creating package version ${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}1~${CODENAME} ... " # Build the package. -# -fakeroot dpkg-buildpackage -us -uc +# Pass -I so that .git and other unnecessary temporary and source control files +# will be ignored by dpkg-source when createing the tar.gz source package +fakeroot dpkg-buildpackage -us -uc -I [ -e debian/autorm-file ] && rm -vf `cat debian/autorm-file` -- cgit v1.2.1 From 5908d7ebb81bc2d52c67e519a4643372cb9f08bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Sat, 28 Nov 2015 11:50:57 +0200 Subject: Force installation of MariaDB version of mysql-common Make dependency on mysql-common package in debian/control versioned to force that it is installed together with the other mariadb-* packages. This ensures that the init.d and systemd files for MariaDB mysqld are the ones from MariaDB.org repos. --- debian/control | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index c699d6cf595..93f715f2345 100644 --- a/debian/control +++ b/debian/control @@ -32,7 +32,7 @@ Package: libmariadbclient18 Section: libs Architecture: any Depends: libmysqlclient18 (= ${source:Version}), - mariadb-common, + mariadb-common (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} Conflicts: mariadb-galera-server-10.0 (<< 10.0.5), @@ -120,7 +120,7 @@ Description: MariaDB database common files (e.g. /etc/mysql/my.cnf) Package: mariadb-common Section: database Architecture: all -Depends: mysql-common, ${misc:Depends}, ${shlibs:Depends} +Depends: mysql-common (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf) MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -133,7 +133,7 @@ Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf) Package: mariadb-client-core-10.0 Architecture: any Depends: libmariadbclient18 (>= ${source:Version}), - mariadb-common, + mariadb-common (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} Provides: mysql-client-core, @@ -185,7 +185,7 @@ Depends: debianutils (>=1.6), libdbi-perl, libmariadbclient18 (>= ${source:Version}), mariadb-client-core-10.0 (>= ${source:Version}), - mariadb-common, + mariadb-common (>= ${source:Version}), ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends} @@ -288,7 +288,7 @@ Package: mariadb-server-10.0 Architecture: any Suggests: mailx, mariadb-test, tinyca Recommends: libhtml-template-perl -Pre-Depends: mariadb-common, adduser (>= 3.40), debconf +Pre-Depends: mariadb-common (>= ${source:Version}), adduser (>= 3.40), debconf Depends: bsdutils, libdbi-perl, lsb-base (>= 3.0-10), -- cgit v1.2.1