Update debian packaging for 10.7

Conflicts/Replaces mariadb-client-core mariadb-client, cover 10.6 Also update salsa-ci to appropriately name tests as upgrades to 10.7

Author: cvicentiu

debian/changelog

@@ -2,4 +2,4 @@ mariadb-10.7 (1:10.7.0) unstable; urgency=medium
 
  * Initial Release
 
- -- Otto Kekäläinen <otto@debian.org> Thu, 14 May 2020 18:00:57 +0300
+ -- Vicențiu Ciorbaru <vicentiu@mariadb.org> Thu, 18 Jun 2021 16:08:00 +0300

debian/control

@@ -283,6 +283,7 @@ Conflicts: mariadb-client-10.0,
  mariadb-client-core-10.3,
  mariadb-client-core-10.4,
  mariadb-client-core-10.5,
+ mariadb-client-core-10.6,
  mariadb-client-core-5.1,
  mariadb-client-core-5.2,
  mariadb-client-core-5.3,
@@ -332,6 +333,7 @@ Replaces: mariadb-client-10.0,
  mariadb-client-core-10.3,
  mariadb-client-core-10.4,
  mariadb-client-core-10.5,
+ mariadb-client-core-10.6,
  mariadb-client-core-5.1,
  mariadb-client-core-5.2,
  mariadb-client-core-5.3,
@@ -451,6 +453,7 @@ Replaces: mariadb-client (<< ${source:Version}),
  mariadb-client-10.3,
  mariadb-client-10.4,
  mariadb-client-10.5,
+ mariadb-client-10.6,
  mariadb-client-5.1,
  mariadb-client-5.2,
  mariadb-client-5.3,

debian/salsa-ci.yml

@@ -224,15 +224,15 @@ fresh install:
  script:
  - *test-prepare-container
  - *test-install
- - service mariadb status # There is no init.d/mysql in MariaDB 10.6
+ - service mariadb status # There is no init.d/mysql in MariaDB 10.7
  - *test-verify-final
  variables:
  GIT_STRATEGY: none
  except:
  variables:
  - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
 
-mariadb-10.6 Sid upgrade:
+mariadb-10.7 Sid upgrade:
  stage: upgrade in Sid
  needs:
  - job: build
@@ -246,15 +246,15 @@ mariadb-10.6 Sid upgrade:
  script:
  - *test-prepare-container
  - *test-install
- - service mariadb status # There is no init.d/mysql in MariaDB 10.6
+ - service mariadb status # There is no init.d/mysql in MariaDB 10.7
  - *test-verify-final
  variables:
  GIT_STRATEGY: none
  except:
  variables:
  - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
 
-mariadb-10.3 Buster to mariadb-10.6 upgrade:
+mariadb-10.3 Buster to mariadb-10.7 upgrade:
  stage: upgrade from Buster/Stretch
  needs:
  - job: build
@@ -281,7 +281,7 @@ mariadb-10.3 Buster to mariadb-10.6 upgrade:
  variables:
  - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
 
-mariadb-10.1 Stretch to mariadb-10.6 upgrade:
+mariadb-10.1 Stretch to mariadb-10.7 upgrade:
  stage: upgrade from Buster/Stretch
  needs:
  - job: build
@@ -323,7 +323,7 @@ test basic features:
  script:
  - *test-prepare-container
  - *test-install
- - service mariadb status # There is no init.d/mysql in MariaDB 10.6
+ - service mariadb status # There is no init.d/mysql in MariaDB 10.7
  - *test-verify-final
  - |
  # Print info about server
@@ -538,7 +538,7 @@ mariadb-connector-c Stretch upgrade:
 
 # Upgrading from MySQL 8.0 with datadir in place is not possible. Users need to do a data dump.
 # The Debian maintainer scripts detect this situation and simply moves old datadir aside and start fresh.
-mysql-8.0 Sid to mariadb-10.6 upgrade:
+mysql-8.0 Sid to mariadb-10.7 upgrade:
  stage: upgrade in Sid
  needs:
  - job: build
@@ -566,7 +566,7 @@ mysql-8.0 Sid to mariadb-10.6 upgrade:
 
 # Upgrading from MySQL 8.0 with datadir in place is not possible. Users need to do a data dump.
 # The Debian maintainer scripts detect this situation and simply moves old datadir aside and start fresh.
-mysql-8.0 Focal to mariadb-10.6 upgrade:
+mysql-8.0 Focal to mariadb-10.7 upgrade:
  stage: upgrade extras
  needs:
  - job: build buster-backports
@@ -600,7 +600,8 @@ mysql-8.0 Focal to mariadb-10.6 upgrade:
  variables:
  - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
 
-mariadb.org-10.5 to mariadb-10.6 upgrade:
+
+mariadb.org-10.5 to mariadb-10.7 upgrade:
  stage: upgrade extras
  needs:
  - job: build
@@ -639,7 +640,7 @@ mariadb.org-10.5 to mariadb-10.6 upgrade:
  variables:
  - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
 
-mariadb.org-10.4 to mariadb-10.6 upgrade:
+mariadb.org-10.4 to mariadb-10.7 upgrade:
  stage: upgrade extras
  needs:
  - job: build
@@ -672,7 +673,7 @@ mariadb.org-10.4 to mariadb-10.6 upgrade:
  variables:
  - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
 
-mariadb.org-10.3 to mariadb-10.6 upgrade:
+mariadb.org-10.3 to mariadb-10.7 upgrade:
  stage: upgrade extras
  needs:
  - job: build
@@ -708,7 +709,7 @@ mariadb.org-10.3 to mariadb-10.6 upgrade:
  variables:
  - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
 
-mariadb.org-10.2 to mariadb-10.6 upgrade:
+mariadb.org-10.2 to mariadb-10.7 upgrade:
  stage: upgrade extras
  needs:
  - job: build
@@ -744,7 +745,7 @@ mariadb.org-10.2 to mariadb-10.6 upgrade:
  variables:
  - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
 
-mysql.com-5.7 to mariadb-10.6 upgrade:
+mysql.com-5.7 to mariadb-10.7 upgrade:
  stage: upgrade extras
  needs:
  - job: build buster-backports
@@ -776,7 +777,7 @@ mysql.com-5.7 to mariadb-10.6 upgrade:
  variables:
  - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
 
-percona-xtradb-5.7 to mariadb-10.6 upgrade (MDEV-22679):
+percona-xtradb-5.7 to mariadb-10.7 upgrade (MDEV-22679):
  stage: upgrade extras
  needs:
  - job: build buster-backports