diff options
| author | Otto Kekäläinen <otto@kekalainen.net> | 2021-03-11 10:21:52 +0200 |
|---|---|---|
| committer | Otto Kekäläinen <otto@kekalainen.net> | 2021-03-11 10:21:52 +0200 |
| commit | 0da6d67a3a79742a63e29986b7f76d7c5b130a5a (patch) | |
| tree | f2843149f5746b2a658768588758d00d3eaf0b1b | |
| parent | f386fdd70e05504902a1945d01320ffeccb75a34 (diff) | |
| download | mariadb-git-0da6d67a3a79742a63e29986b7f76d7c5b130a5a.tar.gz | |
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.
| -rw-r--r-- | debian/mariadb-server-10.6.config | 2 | ||||
| -rw-r--r-- | debian/mariadb-server-10.6.mariadb.init (renamed from debian/mariadb-server-10.5.mariadb.init) | 0 | ||||
| -rw-r--r-- | debian/salsa-ci.yml | 2 |
3 files changed, 2 insertions, 2 deletions
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 index a16e9f88edb..a16e9f88edb 100644 --- a/debian/mariadb-server-10.5.mariadb.init +++ b/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 |