Commit 0a970083 authored by Otto Kekäläinen's avatar Otto Kekäläinen

Deb: Fix various shortcomings in the control file

- All build-depends should be in one place.
- Library packages should depend on their main package using strict version.
- Most packages should depend on the misc variable, so that debhelper
  can fill in it with various calculated dependencies automatically.
- All packages using dynamic libraries should depend on the shlibs variable
  to include shared libraries as dependencies automatically.
- Essential tools like bsdutils, grep and tar shall not be defined in vain.
parent e2bf4d83
...@@ -16,11 +16,13 @@ Build-Depends: bison, ...@@ -16,11 +16,13 @@ Build-Depends: bison,
libncurses5-dev (>= 5.0-6~), libncurses5-dev (>= 5.0-6~),
libpam0g-dev, libpam0g-dev,
libreadline-gplv2-dev, libreadline-gplv2-dev,
libxml2-dev,
libssl-dev, libssl-dev,
lsb-release, lsb-release,
perl (>= 5.6.0), perl (>= 5.6.0),
po-debconf, po-debconf,
psmisc, psmisc,
unixodbc-dev,
zlib1g-dev (>= 1:1.1.3-5~), zlib1g-dev (>= 1:1.1.3-5~),
${MAYBE_LIBCRACK} ${MAYBE_LIBCRACK}
libjemalloc-dev (>= 3.0.0~) [linux-any] libjemalloc-dev (>= 3.0.0~) [linux-any]
...@@ -32,7 +34,7 @@ Vcs-Browser: https://github.com/MariaDB/server/ ...@@ -32,7 +34,7 @@ Vcs-Browser: https://github.com/MariaDB/server/
Package: libmariadbclient18 Package: libmariadbclient18
Architecture: any Architecture: any
Section: libs Section: libs
Depends: libmysqlclient18 (= ${source:Version}), Depends: libmysqlclient18 (= ${binary:Version}),
mariadb-common, mariadb-common,
${misc:Depends}, ${misc:Depends},
${shlibs:Depends} ${shlibs:Depends}
...@@ -54,7 +56,7 @@ Description: MariaDB database client library ...@@ -54,7 +56,7 @@ Description: MariaDB database client library
Package: libmysqlclient18 Package: libmysqlclient18
Section: libs Section: libs
Architecture: any Architecture: any
Depends: libmariadbclient18 (= ${source:Version}) Depends: libmariadbclient18 (= ${binary:Version}), ${misc:Depends}
Replaces: libmysqlclient18 (<< ${source:Version}) Replaces: libmysqlclient18 (<< ${source:Version})
Description: Virtual package to satisfy external depends Description: Virtual package to satisfy external depends
This is an empty package that provides an updated "best" version of This is an empty package that provides an updated "best" version of
...@@ -69,7 +71,7 @@ Description: Virtual package to satisfy external depends ...@@ -69,7 +71,7 @@ Description: Virtual package to satisfy external depends
Package: libmariadbd-dev Package: libmariadbd-dev
Architecture: any Architecture: any
Section: libdevel Section: libdevel
Depends: libmariadbclient-dev (>= ${source:Version}), ${misc:Depends} Depends: libmariadbclient-dev (>= ${binary:Version}), ${misc:Depends}
Provides: libmysqld-dev Provides: libmysqld-dev
Conflicts: libmysqld-dev Conflicts: libmysqld-dev
Replaces: libmysqld-dev Replaces: libmysqld-dev
...@@ -84,7 +86,7 @@ Description: MariaDB embedded database, development files ...@@ -84,7 +86,7 @@ Description: MariaDB embedded database, development files
Package: libmariadbclient-dev Package: libmariadbclient-dev
Architecture: any Architecture: any
Section: libdevel Section: libdevel
Depends: libmariadbclient18 (>= ${source:Version}), Depends: libmariadbclient18 (= ${binary:Version}),
zlib1g-dev, zlib1g-dev,
${misc:Depends}, ${misc:Depends},
${shlibs:Depends} ${shlibs:Depends}
...@@ -287,7 +289,9 @@ Description: MariaDB database core server files ...@@ -287,7 +289,9 @@ Description: MariaDB database core server files
Package: mariadb-test-10.2 Package: mariadb-test-10.2
Architecture: any Architecture: any
Depends: mariadb-client-10.2 (= ${binary:Version}), Depends: mariadb-client-10.2 (= ${binary:Version}),
mariadb-server-10.2 (= ${binary:Version}) mariadb-server-10.2 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Suggests: patch Suggests: patch
Conflicts: 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-server-5.5 (<< 5.5.33),
...@@ -319,12 +323,8 @@ Architecture: any ...@@ -319,12 +323,8 @@ Architecture: any
Suggests: mailx, mariadb-test, netcat-openbsd, tinyca Suggests: mailx, mariadb-test, netcat-openbsd, tinyca
Recommends: libhtml-template-perl Recommends: libhtml-template-perl
Pre-Depends: mariadb-common, adduser (>= 3.40), debconf Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
Depends: bsdutils, Depends: galera-3 (>=25.3),
coreutils,
findutils,
galera-3 (>=25.3),
gawk, gawk,
grep,
iproute, iproute,
libdbi-perl, libdbi-perl,
lsb-base (>= 3.0-10), lsb-base (>= 3.0-10),
...@@ -336,7 +336,6 @@ Depends: bsdutils, ...@@ -336,7 +336,6 @@ Depends: bsdutils,
psmisc, psmisc,
rsync, rsync,
socat, socat,
tar,
${misc:Depends}, ${misc:Depends},
${shlibs:Depends} ${shlibs:Depends}
Provides: mariadb-server, mysql-server, virtual-mysql-server Provides: mariadb-server, mysql-server, virtual-mysql-server
...@@ -416,12 +415,11 @@ Description: MariaDB database regression test suite (metapackage for the latest ...@@ -416,12 +415,11 @@ Description: MariaDB database regression test suite (metapackage for the latest
Package: mariadb-connect-engine-10.2 Package: mariadb-connect-engine-10.2
Architecture: any Architecture: any
Depends: libxml2, mariadb-server-10.2, unixodbc Depends: libxml2,
Build-Depends: libxml2-dev, mariadb-server-10.2,
mariadb-server-10.2, unixodbc,
unixodbc-dev, ${misc:Depends},
${misc:Depends}, ${shlibs:Depends}
${shlibs:Depends}
Description: Connect storage engine for MariaDB Description: Connect storage engine for MariaDB
Connect engine supports a number of file formats (dbf, xml, txt, bin, etc), 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 connections to ODBC tables and remote MySQL tables, as well as a number of
...@@ -437,25 +435,22 @@ Description: OQGraph storage engine for MariaDB ...@@ -437,25 +435,22 @@ Description: OQGraph storage engine for MariaDB
This package contains the OQGraph plugin for MariaDB. This package contains the OQGraph plugin for MariaDB.
Package: mariadb-cracklib-password-check-10.2 Package: mariadb-cracklib-password-check-10.2
Section: database
Architecture: any Architecture: any
Depends: libcrack2 (>= 2.9.0), mariadb-server-10.2 Depends: libcrack2 (>= 2.9.0), mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
Description: CrackLib Password Validation Plugin for MariaDB Description: CrackLib Password Validation Plugin for MariaDB
This password validation plugin uses cracklib to allow only This password validation plugin uses cracklib to allow only
sufficiently secure (as defined by cracklib) user passwords in MariaDB. sufficiently secure (as defined by cracklib) user passwords in MariaDB.
Package: mariadb-gssapi-server-10.2 Package: mariadb-gssapi-server-10.2
Section: database
Architecture: any Architecture: any
Depends: libgssapi-krb5-2, mariadb-server-10.2 Depends: libgssapi-krb5-2, mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
Conflicts: mariadb-gssapi-server-10.1 Conflicts: mariadb-gssapi-server-10.1
Replaces: mariadb-gssapi-server-10.1 Replaces: mariadb-gssapi-server-10.1
Description: GSSAPI authentication plugin for MariaDB server Description: GSSAPI authentication plugin for MariaDB server
Package: mariadb-gssapi-client-10.2 Package: mariadb-gssapi-client-10.2
Section: database
Architecture: any Architecture: any
Depends: libgssapi-krb5-2, mariadb-client-10.2 Depends: libgssapi-krb5-2, mariadb-client-10.2, ${misc:Depends}, ${shlibs:Depends}
Conflicts: mariadb-gssapi-client-10.1 Conflicts: mariadb-gssapi-client-10.1
Replaces: mariadb-gssapi-client-10.1 Replaces: mariadb-gssapi-client-10.1
Description: GSSAPI authentication plugin for MariaDB client Description: GSSAPI authentication plugin for MariaDB client
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment