Skip to content

Commit

Permalink
MDEV-32546: Make sure that debian control files are also in order
Browse files Browse the repository at this point in the history 
MariaDB debian control files are slightly in disorder
run wrap-and-sort tool against them shows some minor
changes.
  • Loading branch information
@illuusio @grooverdan
illuusio authored and grooverdan committed Feb 19, 2024
1 parent 88d7953 commit ccee2f0
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 49 deletions.
89 changes: 44 additions & 45 deletions debian/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Build-Depends: bison,
cmake,
cracklib-runtime <!nocheck>,
debhelper (>= 10),
dh-exec,
default-jdk,
dh-exec,
flex [amd64],
gdb <!nocheck>,
libaio-dev [linux-any],
Expand Down Expand Up @@ -594,20 +594,6 @@ Conflicts: mariadb-client (<< 11.0.0),
mariadb-client-core-5.2,
mariadb-client-core-5.3,
mariadb-client-core-5.5,
mysql-client (<< 5.0.51),
mysql-client (<< 5.0.51),
mysql-client-5.0,
mysql-client-5.1,
mysql-client-5.5,
mysql-client-5.6,
mysql-client-5.7,
mysql-client-8.0,
mysql-client-core-5.0,
mysql-client-core-5.1,
mysql-client-core-5.5,
mysql-client-core-5.6,
mysql-client-core-5.7,
mysql-client-core-8.0,
mariadb-server (<< 11.0.0),
mariadb-server-10.0,
mariadb-server-10.1,
Expand All @@ -628,13 +614,26 @@ Conflicts: mariadb-client (<< 11.0.0),
mariadb-server-core-10.6,
mariadb-server-core-10.7,
mariadb-server-core-10.8,
mysql-server-core-8.0,
mysql-client (<< 5.0.51),
mysql-client-5.0,
mysql-client-5.1,
mysql-client-5.5,
mysql-client-5.6,
mysql-client-5.7,
mysql-client-8.0,
mysql-client-core-5.0,
mysql-client-core-5.1,
mysql-client-core-5.5,
mysql-client-core-5.6,
mysql-client-core-5.7,
mysql-client-core-8.0,
mysql-server-5.7,
percona-server-server-5.6,
mysql-server-core-8.0,
percona-server-server,
percona-server-server-5.6,
percona-xtradb-cluster-server,
percona-xtradb-cluster-server-5.6,
percona-xtradb-cluster-server-5.7,
percona-xtradb-cluster-server
percona-xtradb-cluster-server-5.7
Multi-Arch: foreign
Description: MySQL compatibility links to mariadb-client binaries/scripts.
The package contains links and binaries that are needed by MySQL centric
Expand Down Expand Up @@ -759,8 +758,8 @@ Suggests: mailx,
mariadb-test,
netcat-openbsd
Recommends: libhtml-template-perl,
pv,
mariadb-server-compat
mariadb-server-compat,
pv
Pre-Depends: adduser (>= 3.40),
debconf,
mariadb-common (>= ${source:Version})
Expand Down Expand Up @@ -865,22 +864,8 @@ Description: MariaDB database server binaries

Package: mariadb-server-compat
Architecture: all
Depends: mariadb-server (>= ${source:Version}),
Conflicts: mariadb-server-core (<< 11.0.0),
mariadb-server-core-10.0,
mariadb-server-core-10.1,
mariadb-server-core-10.2,
mariadb-server-core-10.3,
mariadb-server-core-10.4,
mariadb-server-core-10.5,
mariadb-server-core-10.6,
mariadb-server-core-10.7,
mariadb-server-core-10.8,
mariadb-server-core-5.1,
mariadb-server-core-5.2,
mariadb-server-core-5.3,
mariadb-server-core-5.5,
mariadb-server (<< 11.0.0),
Depends: mariadb-server (>= ${source:Version})
Conflicts: mariadb-server (<< 11.0.0),
mariadb-server-10.0,
mariadb-server-10.1,
mariadb-server-10.2,
Expand All @@ -894,19 +879,33 @@ Conflicts: mariadb-server-core (<< 11.0.0),
mariadb-server-5.2,
mariadb-server-5.3,
mariadb-server-5.5,
mariadb-server-core (<< 11.0.0),
mariadb-server-core-10.0,
mariadb-server-core-10.1,
mariadb-server-core-10.2,
mariadb-server-core-10.3,
mariadb-server-core-10.4,
mariadb-server-core-10.5,
mariadb-server-core-10.6,
mariadb-server-core-10.7,
mariadb-server-core-10.8,
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,
mysql-server-core-5.6,
mysql-server-core-5.7,
mysql-server-core-8.0,
percona-server-server,
percona-server-server-5.6,
percona-server-server-5.7,
percona-server-server,
percona-xtradb-cluster-server,
percona-xtradb-cluster-server-5.6,
percona-xtradb-cluster-server-5.7,
percona-xtradb-cluster-server
percona-xtradb-cluster-server-5.7
Multi-Arch: foreign
Description: MySQL compatibility links to mariadb-server binaries/scripts.
The package contains links and binaries that are needed by MySQL centric
Expand Down Expand Up @@ -967,10 +966,10 @@ Description: Connect storage engine for MariaDB server
Package: mariadb-plugin-connect-jdbc
Architecture: any
Depends: default-jre-headless
Suggests: libmariadb-java,
libcsvjdbc-java,
libpostgresql-jdbc-java,
Suggests: libcsvjdbc-java,
libmariadb-java,
libpostgis-java,
libpostgresql-jdbc-java,
libxerial-sqlite-jdbc-java
Enhances: mariadb-plugin-connect
Description: Connect storage engine JDBC interface for MariaDB server.
Expand Down Expand Up @@ -1214,11 +1213,11 @@ Description: Snappy compression support in the server and storage engines

Package: mariadb-test
Architecture: any
Depends: mariadb-client (= ${binary:Version}),
Depends: libnet-ssleay-perl,
mariadb-client (= ${binary:Version}),
mariadb-server (= ${server:Version}),
mariadb-test-data (= ${source:Version}),
virtual-mysql-testsuite,
libnet-ssleay-perl,
${misc:Depends},
${perl:Depends},
${shlibs:Depends}
Expand Down
9 changes: 5 additions & 4 deletions debian/tests/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ Tests: smoke
# for its existence (see the list in debian/control), install it if available
# and check in the test if it's functional when it should be.
# The plugin package also already depends on the other one.
Depends: mariadb-plugin-rocksdb | mariadb-server,
mariadb-plugin-provider-bzip2,
Depends: mariadb-plugin-provider-bzip2,
mariadb-plugin-provider-lz4,
mariadb-plugin-provider-lzma,
mariadb-plugin-provider-lzo,
mariadb-plugin-provider-snappy
mariadb-plugin-provider-snappy,
mariadb-plugin-rocksdb | mariadb-server
Restrictions: allow-stderr needs-root isolation-container

Tests: upstream
Depends: mariadb-test, eatmydata
Depends: eatmydata,
mariadb-test
Restrictions: allow-stderr breaks-testbed

0 comments on commit ccee2f0

Please sign in to comment.