From 956d93b581b704fa56b0b6469ae35a2e79850ef4 Mon Sep 17 00:00:00 2001 From: Tuukka Pasanen Date: Thu, 19 May 2022 13:26:54 +0300 Subject: [PATCH] MDEV-28587: Remove '-10.9' suffixes entries from Debian control Conflicts/Replaces MariaDB Debian packages does not have version suffix anymore since MariaDB version 10.9. This makes obsolete need for the suffix in debian/control file. Fix Lintian errors: E: mariadb source: version-substvar-for-external-package Conflicts (line 408) ${source:Version} mariadb-client -> mariadb-client-10.9 E: mariadb source: version-substvar-for-external-package Conflicts (line 575) ${source:Version} mariadb-server-core -> mariadb-server-core-10.9 E: mariadb source: version-substvar-for-external-package Conflicts (line 711) ${source:Version} mariadb-server -> mariadb-server-10.9 E: mariadb source: version-substvar-for-external-package Replaces (line 330) ${source:Version} mariadb-client-core -> mariadb-client-10.9 E: mariadb source: version-substvar-for-external-package Replaces (line 330) ${source:Version} mariadb-client-core -> mariadb-server-core-10.9 E: mariadb source: version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-client-10.9 E: mariadb source: version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-client-core-10.9 E: mariadb source: version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-server-10.9 E: mariadb source: version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-server-core-10.9 E: mariadb source: version-substvar-for-external-package Replaces (line 626) ${source:Version} mariadb-server-core -> mariadb-client-10.9 E: mariadb source: version-substvar-for-external-package Replaces (line 626) ${source:Version} mariadb-server-core -> mariadb-server-10.9 E: mariadb source: version-substvar-for-external-package Replaces (line 748) ${source:Version} mariadb-server -> mariadb-client-10.9 E: mariadb source: version-substvar-for-external-package Replaces (line 748) ${source:Version} mariadb-server -> mariadb-server-10.9 --- debian/control | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/debian/control b/debian/control index cf6b0a32199..8d4cc5b164d 100644 --- a/debian/control +++ b/debian/control @@ -337,7 +337,6 @@ Replaces: mariadb-client (<< ${source:Version}), mariadb-client-10.6, mariadb-client-10.7, mariadb-client-10.8, - mariadb-client-10.9 (<< ${source:Version}), mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3, @@ -367,7 +366,6 @@ Replaces: mariadb-client (<< ${source:Version}), mariadb-server-core-10.6, mariadb-server-core-10.7, mariadb-server-core-10.8, - mariadb-server-core-10.9 (<< ${source:Version}), mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, @@ -415,7 +413,6 @@ Conflicts: mariadb-client (<< ${source:Version}), mariadb-client-10.6, mariadb-client-10.7, mariadb-client-10.8, - mariadb-client-10.9 (<< ${source:Version}), mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3, @@ -445,7 +442,6 @@ Breaks: mariadb-client-core (<< ${source:Version}), mariadb-client-core-10.6, mariadb-client-core-10.7, mariadb-client-core-10.8, - mariadb-client-core-10.9 (<< ${source:Version}), mariadb-server (<< ${source:Version}), mariadb-server-10.0, mariadb-server-10.1, @@ -456,7 +452,6 @@ Breaks: mariadb-client-core (<< ${source:Version}), mariadb-server-10.6, mariadb-server-10.7, mariadb-server-10.8, - mariadb-server-10.9 (<< ${source:Version}), mariadb-server-core (<< ${source:Version}), mariadb-server-core-10.0, mariadb-server-core-10.1, @@ -488,7 +483,6 @@ Replaces: mariadb-client (<< ${source:Version}), mariadb-client-10.6, mariadb-client-10.7, mariadb-client-10.8, - mariadb-client-10.9 (<< ${source:Version}), mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3, @@ -503,7 +497,6 @@ Replaces: mariadb-client (<< ${source:Version}), mariadb-client-core-10.6, mariadb-client-core-10.7, mariadb-client-core-10.8, - mariadb-client-core-10.9 (<< ${source:Version}), mariadb-server (<< ${source:Version}), mariadb-server-10.0, mariadb-server-10.1, @@ -514,7 +507,6 @@ Replaces: mariadb-client (<< ${source:Version}), mariadb-server-10.6, mariadb-server-10.7, mariadb-server-10.8, - mariadb-server-10.9 (<< ${source:Version}), mariadb-server-core (<< ${source:Version}), mariadb-server-core-10.0, mariadb-server-core-10.1, @@ -525,7 +517,6 @@ Replaces: mariadb-client (<< ${source:Version}), mariadb-server-core-10.6, mariadb-server-core-10.7, mariadb-server-core-10.8, - mariadb-server-core-10.9 (<< ${source:Version}), mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, @@ -572,7 +563,8 @@ Architecture: any Depends: mariadb-common (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} -Conflicts: mariadb-server-core-10.0, +Conflicts: mariadb-server-core (<< ${source:Version}), + mariadb-server-core-10.0, mariadb-server-core-10.1, mariadb-server-core-10.2, mariadb-server-core-10.3, @@ -581,7 +573,6 @@ Conflicts: mariadb-server-core-10.0, mariadb-server-core-10.6, mariadb-server-core-10.7, mariadb-server-core-10.8, - mariadb-server-core-10.9 (<< ${source:Version}), mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.3, @@ -604,7 +595,6 @@ Breaks: mariadb-client (<< ${source:Version}), mariadb-client-10.6, mariadb-client-10.7, mariadb-client-10.8, - mariadb-client-10.9 (<< ${source:Version}), mariadb-server (<< ${source:Version}), mariadb-server-10.0, mariadb-server-10.1, @@ -614,7 +604,6 @@ Breaks: mariadb-client (<< ${source:Version}), mariadb-server-10.6, mariadb-server-10.7, mariadb-server-10.8, - mariadb-server-10.9 (<< ${source:Version}), mysql-client-5.5, mysql-server-5.5, mysql-server-5.6, @@ -633,7 +622,6 @@ Replaces: mariadb-client (<< ${source:Version}), mariadb-client-10.6, mariadb-client-10.7, mariadb-client-10.8, - mariadb-client-10.9 (<< ${source:Version}), mariadb-server (<< ${source:Version}), mariadb-server-10.0, mariadb-server-10.1, @@ -643,7 +631,6 @@ Replaces: mariadb-client (<< ${source:Version}), mariadb-server-10.6, mariadb-server-10.7, mariadb-server-10.8, - mariadb-server-10.9 (<< ${source:Version}), mariadb-server-core-10.0, mariadb-server-core-10.1, mariadb-server-core-10.2, @@ -718,7 +705,6 @@ Conflicts: mariadb-server (<< ${source:Version}), mariadb-server-10.6, mariadb-server-10.7, mariadb-server-10.8, - mariadb-server-10.9 (<< ${source:Version}), mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3, @@ -753,7 +739,6 @@ Replaces: handlersocket-mysql-5.5, mariadb-client-10.6, mariadb-client-10.7, mariadb-client-10.8, - mariadb-client-10.9 (<< ${source:Version}), mariadb-server (<< ${source:Version}), mariadb-server-10.0, mariadb-server-10.1, @@ -764,7 +749,6 @@ Replaces: handlersocket-mysql-5.5, mariadb-server-10.6, mariadb-server-10.7, mariadb-server-10.8, - mariadb-server-10.9 (<< ${source:Version}), mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,