[neon/neon/settings/Neon/unstable] /: myql override moved to neon/masks

[Jonathan Riddell]

Git commit 48f96aeaa1dd8a9faa8c8a9c09ba615af1835ead by Jonathan Riddell.
Committed on 29/01/2021 at 11:54.
Pushed by jriddell into branch 'Neon/unstable'.

myql override moved to neon/masks

M  +2    -0    debian/neon-settings-2.maintscript
D  +0    -15   etc/apt/preferences.d/50-neon-mariadb

https://invent.kde.org/neon/neon/settings/commit/48f96aeaa1dd8a9faa8c8a9c09ba615af1835ead

diff --git a/debian/neon-settings-2.maintscript b/debian/neon-settings-2.maintscript
index 3d74934..ba30487 100644
--- a/debian/neon-settings-2.maintscript
+++ b/debian/neon-settings-2.maintscript
@@ -15,3 +15,5 @@ rm_conffile /etc/apt/preferences.d/99-xenial-overrides
 
 # bionic -> focal consistency overrides (may be lingering from upgrade to focal)
 rm_conffile /etc/apt/preferences.d/98-focal-overrides
+
+rm_conffile /etc/apt/preferences.d/50-neon-mariadb
diff --git a/etc/apt/preferences.d/50-neon-mariadb b/etc/apt/preferences.d/50-neon-mariadb
deleted file mode 100644
index 377e1ae..0000000
--- a/etc/apt/preferences.d/50-neon-mariadb
+++ /dev/null
@@ -1,15 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-# SPDX-FileCopyrightText: 2020 Harald Sitter <sitter at kde.org>
-
-# Pin our mysql dummy packages, akonadi breaks on mysql 8 in focal but
-# the bionic -> focal upgrade has apt insisting on installing mysql
-# (or uninstalling akonadi) so we make a dummy package.  If you want
-# mysql you can remove this file but it'll break akonadi.
-
-Package: mysql-client-core-8.0
-Pin: origin "archive.neon.kde.org"
-Pin-Priority: 1100
-
-Package: mysql-server-core-8.0
-Pin: origin "archive.neon.kde.org"
-Pin-Priority: 1100