[neon/forks/ubuntu-release-upgrader/Neon/unstable_focal] DistUpgrade: add jammy overrides for focal backports which are not in jammy

Fri Sep 2 11:11:16 BST 2022

Git commit aefb8bc9a77394dd5a64554dc0aadd89eab8207c by Jonathan Esk-Riddell.
Committed on 02/09/2022 at 10:09.
Pushed by jriddell into branch 'Neon/unstable_focal'.

add jammy overrides for focal backports which are not in jammy

D  +0    -99   DistUpgrade/98-focal-overrides
A  +394  -0    DistUpgrade/98-jammy-overrides
M  +2    -2    DistUpgrade/DistUpgradeQuirks.py

https://invent.kde.org/neon/forks/ubuntu-release-upgrader/commit/aefb8bc9a77394dd5a64554dc0aadd89eab8207c

diff --git a/DistUpgrade/98-focal-overrides b/DistUpgrade/98-focal-overrides
deleted file mode 100644
index c2eb982e..00000000
--- a/DistUpgrade/98-focal-overrides
+++ /dev/null
@@ -1,99 +0,0 @@
-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: libgwenhywfar79-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libgwenhywfar-core-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libgwengui-fox16-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libgwengui-gtk3-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libgwengui-qt5-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libgwenhywfar-doc
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libgwenhywfar79
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libgwenhywfar-data
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: gwenhywfar-tools
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libgwengui-cpp0
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libgwengui-fox16-0
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libgwengui-qt5-0
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libgwengui-gtk3-0
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: iio-sensor-proxy
-Pin: release o=Ubuntu
-Pin-Priority: 1100
diff --git a/DistUpgrade/98-jammy-overrides b/DistUpgrade/98-jammy-overrides
new file mode 100644
index 00000000..cb9f2d88
--- /dev/null
+++ b/DistUpgrade/98-jammy-overrides
@@ -0,0 +1,394 @@
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2022 Jonathan Esk-Riddell <jr at jriddell.org>
+
+Package: libqtav1
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: assimp-testmodels
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: assimp-utils
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: cec-utils
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: cmake
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: cmake-curses-gui
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: cmake-data
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: cmake-doc
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: cmake-qt-gui
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: fuse
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: fuse3
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: gir1.2-poppler-0.18
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: gir1.2-xmlb-2.0
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: gpgme-json
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: gwenhywfar-tools
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: highway-doc
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: labplot
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: labplot-data
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libaccounts-qt5-1
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libaccounts-qt5-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libaccounts-qt-doc
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libassimp5
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libassimp-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libassimp-doc
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libcec6
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libcec-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libfuse3-3
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libfuse3-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libgpgme11
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libgpgme-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libgpgmepp6
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libgpgmepp-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libgpgmepp-doc
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libgwengui-fox16-79
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libgwengui-fox16-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libgwengui-gtk3-79
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libgwengui-gtk3-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libgwengui-qt5-79
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libgwengui-qt5-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libgwenhywfar79
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libgwenhywfar-core-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libgwenhywfar-data
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libgwenhywfar-doc
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libhwy0
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libhwy-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libkdb3-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libkdb3-driver-mysql
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libkdb3-driver-postgresql
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libkdb3-driver-sqlite
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libkdb-data
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: liblcms2-2
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: liblcms2-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: liblcms2-utils
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: liblitehtml0
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: liblitehtml-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libmd4c0
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libmd4c-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libmd4c-html0
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libmd4c-html0-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libpoppler-cpp0v5
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libpoppler-cpp-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libpoppler-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libpoppler-glib8
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libpoppler-glib-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libpoppler-glib-doc
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libpoppler-private-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libpoppler-qt5-1
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libpoppler-qt5-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libqgpgme7
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libqofono-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libqofono-qt5-0
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libqt5feedback5
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libseccomp2
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libseccomp-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libwayland-bin
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libwayland-client0
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libwayland-cursor0
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libwayland-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libwayland-doc
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libwayland-egl1
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libwayland-egl-backend-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libwayland-server0
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libxcvt0
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libxcvt-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libxmlb2
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libxmlb-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libxmlb-tests
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libyuv-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: meson
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: poppler-utils
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: python3-cec
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: python3-gpg
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: python3-pyassimp
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: python3-seccomp
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: qml-module-ofono
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: qml-module-qtfeedback
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: qtfeedback5-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: seccomp
+Pin: release o=Ubuntu
+Pin-Priority: 1100
diff --git a/DistUpgrade/DistUpgradeQuirks.py b/DistUpgrade/DistUpgradeQuirks.py
index 053e0eda..81979b54 100644
--- a/DistUpgrade/DistUpgradeQuirks.py
+++ b/DistUpgrade/DistUpgradeQuirks.py
@@ -133,12 +133,12 @@ class DistUpgradeQuirks(object):
         if self._snapstore_reachable:
             self._calculateSnapSizeRequirements()
         # neon packages with versions < in focal
-        copyfile('98-focal-overrides', '/etc/apt/preferences.d/98-focal-overrides')
+        copyfile('98-jammy-overrides', '/etc/apt/preferences.d/98-jammy-overrides')
         # Make sure legacy pins are cleaned up before doing anything to prevent
         # dependency resolution problems caused by old pins.
         # This includes the neon-settings pin. The future package shouldn't include
         # the legacy pin in its neon-settings!
-        for old_pin in ['98-xenial-overrides', '99-xenial-overrides']:
+        for old_pin in ['98-xenial-overrides', '99-xenial-overrides', '98-focal-overrides']:
             path = '/etc/apt/preferences.d/' + old_pin
             if os.path.exists(path):
                 os.remove(path)
