Skip to content

Commit f18b140

Browse files
author
Sergei Golubchik
committed
debian: require jemalloc >= 3.0.0, because 2.2.5 (on precise) crashes
1 parent e3deed4 commit f18b140

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

debian/dist/Debian/control

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Priority: optional
44
Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
55
XSBC-Original-Maintainer: Maria Developers <maria-developers@lists.launchpad.net>
66
Uploaders: MariaDB Developers <maria-developers@lists.launchpad.net>
7-
Build-Depends: libtool (>= 1.4.2-7), procps | hurd, debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libevent-dev, libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper, ${CMAKE_DEP}libaio-dev, libjemalloc-dev
7+
Build-Depends: libtool (>= 1.4.2-7), procps | hurd, debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libevent-dev, libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper, ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0)
88
Standards-Version: 3.8.3
99
Homepage: http://mariadb.org/
1010
Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/5.5/files
@@ -146,7 +146,7 @@ Description: MariaDB database client binaries
146146

147147
Package: mariadb-server-core-5.5
148148
Architecture: any
149-
Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version}), libjemalloc1
149+
Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version}), libjemalloc1 (>= 3.0.0)
150150
Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5
151151
Conflicts: mariadb-server-5.1 (<< 5.1.60),
152152
mariadb-server-5.2 (<< 5.2.10),
@@ -191,7 +191,7 @@ Architecture: any
191191
Suggests: tinyca, mailx, mariadb-test
192192
Recommends: libhtml-template-perl
193193
Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
194-
Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-5.5 (>= ${binary:Version}), libjemalloc1
194+
Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-5.5 (>= ${binary:Version}), libjemalloc1 (>= 3.0.0)
195195
Provides: mariadb-server, mysql-server, virtual-mysql-server
196196
Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
197197
mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,

debian/dist/Ubuntu/control

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Priority: optional
44
Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
55
XSBC-Original-Maintainer: Maria Developers <maria-developers@lists.launchpad.net>
66
Uploaders: MariaDB Developers <maria-developers@lists.launchpad.net>
7-
Build-Depends: libtool (>= 1.4.2-7), procps | hurd, debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libevent-dev, libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper, ${CMAKE_DEP}libaio-dev, libjemalloc-dev
7+
Build-Depends: libtool (>= 1.4.2-7), procps | hurd, debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libevent-dev, libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper, ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0)
88
Standards-Version: 3.8.2
99
Homepage: http://mariadb.org/
1010
Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/5.5/files
@@ -146,7 +146,7 @@ Description: MariaDB database client binaries
146146

147147
Package: mariadb-server-core-5.5
148148
Architecture: any
149-
Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version}), libjemalloc1
149+
Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version}), libjemalloc1 (>= 3.0.0)
150150
Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5
151151
Conflicts: mysql-server-5.0,
152152
mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
@@ -185,7 +185,7 @@ Architecture: any
185185
Suggests: tinyca, mailx, mariadb-test
186186
Recommends: libhtml-template-perl
187187
Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
188-
Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-5.5 (>= ${binary:Version}), libjemalloc1
188+
Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-5.5 (>= ${binary:Version}), libjemalloc1 (>= 3.0.0)
189189
Provides: mariadb-server, mysql-server, virtual-mysql-server
190190
Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
191191
mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,

0 commit comments

Comments
 (0)