summaryrefslogtreecommitdiff
path: root/debian/control
diff options
context:
space:
mode:
authorOtto Kekäläinen <otto@kekalainen.net>2020-02-09 22:27:51 +0200
committerVicențiu-Marian Ciorbaru <vicentiu@mariadb.org>2020-02-13 20:47:23 +0200
commit85d4a45d15078512562d84273f489e8d225c1da7 (patch)
tree39436d36c9c402538de4e9192924be6b3c2603ef /debian/control
parent1f0e72f874bde5096a5c5c22e320a7723ff66b37 (diff)
downloadmariadb-git-85d4a45d15078512562d84273f489e8d225c1da7.tar.gz
Deb: Run 'wrap-and-sort -a' so comparison across releases is easier
No functional changes. Apply this in 10.3 so eventually it is merged to 10.4 and 10.5, which in turn will have separate wrap-and-sort runs but only for new lines, and not affecting badly next merges from 10.3 to 10.4 to 10.5. Also remove a duplicate line that was found thanks to wrap-and-sort.
Diffstat (limited to 'debian/control')
-rw-r--r--debian/control7
1 files changed, 4 insertions, 3 deletions
diff --git a/debian/control b/debian/control
index b4447c71580..18fea70f073 100644
--- a/debian/control
+++ b/debian/control
@@ -234,7 +234,8 @@ Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf)
Package: mariadb-client-core-10.3
Architecture: any
-Depends: mariadb-common (>= ${source:Version}), libmariadb3,
+Depends: libmariadb3,
+ mariadb-common (>= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
Conflicts: mariadb-client-10.0,
@@ -569,8 +570,8 @@ Description: OQGraph storage engine for MariaDB
Package: mariadb-plugin-tokudb
Architecture: amd64
-Depends: mariadb-server-10.3 (= ${binary:Version}),
- libjemalloc1 (>= 3.0.0~) | libjemalloc2,
+Depends: libjemalloc1 (>= 3.0.0~) | libjemalloc2,
+ mariadb-server-10.3 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Breaks: mariadb-server-10.0,