[neon/neon/settings/Neon/release] /: add override file for backported packages which have higher version in focal than in jammy

[Jonathan Esk-Riddell]

Git commit 4dfc5327bd09905da82217bca7d2c658d7dcb558 by Jonathan Esk-Riddell.
Committed on 31/08/2022 at 15:49.
Pushed by jriddell into branch 'Neon/release'.

add override file for backported packages which have higher version in focal than in jammy

M  +6    -0    debian/control
M  +4    -0    debian/neon-settings-2.maintscript
D  +0    -74   etc/apt/preferences.d/99-focal-overrides
D  +0    -11   etc/apt/preferences.d/99-neon-qca

https://invent.kde.org/neon/neon/settings/commit/4dfc5327bd09905da82217bca7d2c658d7dcb558

diff --git a/debian/control b/debian/control
index d15dca8..7ff1b46 100644
--- a/debian/control
+++ b/debian/control
@@ -36,6 +36,12 @@ Depends: acpid, neon-settings-2, python3
 Description: Settings and artwork for KDE neon Pinebook
  This package contains settings used by KDE neon Pinebook.
 
+Package: neon-settings-live
+Architecture: all
+Depends: ${misc:Depends}
+Description: Settings and artwork for KDE neon Pinebook
+ This package contains settings used by KDE neon Pinebook.
+
 Package: neon-essentials-desktop
 Architecture: all
 Depends: ${misc:Depends}
diff --git a/debian/neon-settings-2.maintscript b/debian/neon-settings-2.maintscript
index d327d4f..a867676 100644
--- a/debian/neon-settings-2.maintscript
+++ b/debian/neon-settings-2.maintscript
@@ -21,3 +21,7 @@ rm_conffile /etc/apt/preferences.d/50-neon-mariadb
 
 # focal
 rm_conffile /etc/apt/preferences.d/50-kcoreaddons
+
+# jammy
+rm_conffile /etc/apt/preferences.d/99-focal-overrides
+rm_conffile /etc/apt/preferences.d/99-neon-qca
diff --git a/etc/apt/preferences.d/99-focal-overrides b/etc/apt/preferences.d/99-focal-overrides
deleted file mode 100644
index ef53302..0000000
--- a/etc/apt/preferences.d/99-focal-overrides
+++ /dev/null
@@ -1,74 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-# SPDX-FileCopyrightText: 2020 Jonathan Riddell <jr at jriddell.org>
-
-Package: libqtav1
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libqtavwidgets1
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libqtav-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libqtav-private-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: qml-module-qtav
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: qtav-players
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libepub-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libepub0
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: ebook-tools-dbg
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: epub-utils
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: bubblewrap
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: zipmerge
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: ziptool
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: zipcmp
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: python-sip
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libzip-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: python-sip-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libappimage0
-Pin: release o=Ubuntu
-Pin-Priority: 1100
diff --git a/etc/apt/preferences.d/99-neon-qca b/etc/apt/preferences.d/99-neon-qca
deleted file mode 100644
index f80172c..0000000
--- a/etc/apt/preferences.d/99-neon-qca
+++ /dev/null
@@ -1,11 +0,0 @@
-Package: libqca*
-Pin: release o=neon
-Pin-Priority: 1100
-
-Package: qca-qt5*
-Pin: release o=neon
-Pin-Priority: 1100
-
-Package: qca2-utils
-Pin: release o=neon
-Pin-Priority: 1100