[neon/forks/ubuntu-release-upgrader/Neon/unstable_jammy] DistUpgrade: sync dist upgrade pin. move pin to before cache is opened. delete pin after upgrade as it will by then have the same pin from neon-settings-2

[Jonathan Esk-Riddell]

Git commit 3017aec639b6d1093bfc09b6013112f460ada4b6 by Jonathan Esk-Riddell.
Committed on 23/09/2022 at 13:47.
Pushed by jriddell into branch 'Neon/unstable_jammy'.

sync dist upgrade pin.  move pin to before cache is opened.  delete pin after upgrade as it will by then have the same pin from neon-settings-2

M  +5    -79   DistUpgrade/98-jammy-overrides
M  +3    -3    DistUpgrade/DistUpgradeQuirks.py

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

diff --git a/DistUpgrade/98-jammy-overrides b/DistUpgrade/98-jammy-overrides
index 3d71655f..e5a5a25c 100644
--- a/DistUpgrade/98-jammy-overrides
+++ b/DistUpgrade/98-jammy-overrides
@@ -45,10 +45,6 @@ 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
@@ -65,14 +61,6 @@ 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
@@ -237,42 +225,6 @@ 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
@@ -285,10 +237,6 @@ 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
@@ -353,14 +301,6 @@ 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
@@ -381,30 +321,16 @@ 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
 
-Package: libqca-qt5-2-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
+# Debian ships an unstable higher version kbibtex
 
-Package: libqca-qt5-2-plugins
-Pin: release o=Ubuntu
+Package: kbibtex
+Pin: origin "archive.neon.kde.org"
 Pin-Priority: 1100
 
-Package: libqca-qt5-2
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: qca-qt5-2-utils
-Pin: release o=Ubuntu
+Package: kbibtex-data
+Pin: origin "archive.neon.kde.org"
 Pin-Priority: 1100
diff --git a/DistUpgrade/DistUpgradeQuirks.py b/DistUpgrade/DistUpgradeQuirks.py
index bbf20d5a..42691782 100644
--- a/DistUpgrade/DistUpgradeQuirks.py
+++ b/DistUpgrade/DistUpgradeQuirks.py
@@ -138,8 +138,6 @@ class DistUpgradeQuirks(object):
         # the snaps-to-install list for the actual upgrade.
         if self._snapstore_reachable:
             self._calculateSnapSizeRequirements()
-        # neon packages with versions < in focal
-        copyfile('98-jammy-overrides', '/etc/apt/preferences.d/98-jammy-overrides')
 
     def jammyPostUpgrade(self):
         logging.debug("running Quirks.jammyPostUpgrade")
@@ -147,7 +145,7 @@ class DistUpgradeQuirks(object):
         # 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', '98-focal-overrides']:
+        for old_pin in ['98-xenial-overrides', '99-xenial-overrides', '98-focal-overrides', '98-jammy-overrides']:
             path = '/etc/apt/preferences.d/' + old_pin
             if os.path.exists(path):
                 os.remove(path)
@@ -190,6 +188,8 @@ class DistUpgradeQuirks(object):
         """ run right before calculating the dist-upgrade """
         logging.debug("running Quirks.PreDistUpgradeCache")
         # self._install_python_is_python2()
+        # neon packages with versions < in focal
+        copyfile('98-jammy-overrides', '/etc/apt/preferences.d/98-jammy-overrides')
 
     # individual quirks handler that run *after* the dist-upgrade was
     # calculated in the cache