From 0da6d67a3a79742a63e29986b7f76d7c5b130a5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= <otto@kekalainen.net> Date: Thu, 11 Mar 2021 10:21:52 +0200 Subject: [PATCH] Deb: Rename mariadb.init 10.5->10.6 on 10.6 branch Also fix a few other occurences of 10.5 -> 10.6. This commit complements commit 4501c7e875f457d4de7f94b97471ecdb1b99b21a that seem to have missed these changes. --- debian/mariadb-server-10.6.config | 2 +- ...erver-10.5.mariadb.init => mariadb-server-10.6.mariadb.init} | 0 debian/salsa-ci.yml | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename debian/{mariadb-server-10.5.mariadb.init => mariadb-server-10.6.mariadb.init} (100%) diff --git a/debian/mariadb-server-10.6.config b/debian/mariadb-server-10.6.config index ccf9fe94239..27e2e9f4929 100644 --- a/debian/mariadb-server-10.6.config +++ b/debian/mariadb-server-10.6.config @@ -9,6 +9,6 @@ ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 } # Beware that there are two ypwhich one of them needs the 2>/dev/null! if test -n "`which ypwhich 2>/dev/null`" && ypwhich >/dev/null 2>&1; then - db_input high mariadb-server-10.5/nis_warning || true + db_input high mariadb-server-10.6/nis_warning || true db_go fi diff --git a/debian/mariadb-server-10.5.mariadb.init b/debian/mariadb-server-10.6.mariadb.init similarity index 100% rename from debian/mariadb-server-10.5.mariadb.init rename to debian/mariadb-server-10.6.mariadb.init diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml index 8b020a6882f..02f494ef98f 100644 --- a/debian/salsa-ci.yml +++ b/debian/salsa-ci.yml @@ -625,7 +625,7 @@ mysql-8.0 Focal to mariadb-10.6 upgrade: # Installation often fails (not a MariaDB reason), so do not require this test to pass allow_failure: true -mysql-5.7 Bionic to mariadb-10.5 upgrade: +mysql-5.7 Bionic to mariadb-10.6 upgrade: stage: upgrade extras needs: - job: build stretch-backports