[neon/forks/ubuntu-release-upgrader/Neon/release_jammy] DistUpgrade: Revert "Update 4 files"

Jonathan Riddell null at kde.org
Mon Sep 9 09:09:19 BST 2024 

Git commit f758a7d07b66bb213bc63401309bd79885817924 by Jonathan Riddell.
Committed on 09/09/2024 at 08:07.
Pushed by jriddell into branch 'Neon/release_jammy'.

Revert "Update 4 files"

This reverts commit 64a406b4dcfdad72f383c837993ec1d8cc591bce.

A  +274  -0    DistUpgrade/98-jammy-overrides
D  +0    -1341 DistUpgrade/98-noble-overrides
M  +3    -3    DistUpgrade/DistUpgradeQuirks.py
M  +3    -3    DistUpgrade/DistUpgradeViewKDE.py

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

diff --git a/DistUpgrade/98-jammy-overrides b/DistUpgrade/98-jammy-overrides
new file mode 100644
index 000000000..aafda8dcc
--- /dev/null
+++ b/DistUpgrade/98-jammy-overrides
@@ -0,0 +1,274 @@
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2022 Jonathan Esk-Riddell <jr at jriddell.org>
+
+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-xmlb-2.0
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: gpgme-json
+Pin: release o=jammy
+Pin-Priority: 1100
+
+Package: highway-doc
+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=jammy
+Pin-Priority: 1100
+
+Package: libgpgme-dev
+Pin: release o=jammy
+Pin-Priority: 1100
+
+Package: libgpgmepp6
+Pin: release o=jammy
+Pin-Priority: 1100
+
+Package: libgpgmepp-dev
+Pin: release o=jammy
+Pin-Priority: 1100
+
+Package: libgpgmepp-doc
+Pin: release o=jammy
+Pin-Priority: 1100
+
+Package: libhwy0
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libhwy-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: libqgpgme15
+Pin: release o=jammy
+Pin-Priority: 1100
+
+Package: libseccomp2
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libseccomp-dev
+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: python3-cec
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: python3-gpg
+Pin: release o=jammy
+Pin-Priority: 1100
+
+Package: python3-pyassimp
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: python3-seccomp
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: seccomp
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+# Debian ships an unstable higher version kbibtex
+
+Package: kbibtex
+Pin: origin "archive.neon.kde.org"
+Pin-Priority: 1100
+
+Package: kbibtex-data
+Pin: origin "archive.neon.kde.org"
+Pin-Priority: 1100
+
+# Neon focal shipped qtfeedback with 5.15 while jammy has 5.0
+
+Package: libqt5feedback5
+Pin: release a=jammy
+Pin-Priority: 1100
+
+Package: qml-module-qtfeedback
+Pin: release a=jammy
+Pin-Priority: 1100
+
+Package: qtfeedback5-dev
+Pin: release a=jammy
+Pin-Priority: 1100
+
+Package: qtfeedback5-examples
+Pin: release a=jammy
+Pin-Priority: 1100
+
+Package: qt6
+Pin: release a=jammy
+Pin-Priority: 1100
+
+Package: mygnuhealth
+Pin: release a=jammy
+Pin-Priority: 1100
+
+# the following packages are pinned to fix the libjpeg-turbo backport debacle
+
+Package: libjpeg-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libjpeg8
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libjpeg8-dev
+Pin: release o=Ubuntu
+Pin-Priority: 1100
+
+Package: libjpeg-turbo8
+Pin: release o=jammy
+Pin: version 2.*
+Pin-Priority: 1100
+
+Package: libjpeg-turbo8-dev
+Pin: release o=jammy
+Pin: version 2.*
+Pin-Priority: 1100
+
+Package: libjpeg-turbo-progs
+Pin: release o=jammy
+Pin: version 2.*
+Pin-Priority: 1100
+
+Package: libturbojpeg
+Pin: release o=jammy
+Pin: version 2.*
+Pin-Priority: 1100
+
+Package: libturbojpeg0-dev
+Pin: release o=jammy
+Pin: version 2.*
+Pin-Priority: 1100
+
+Package: libturbojpeg-java
+Pin: release o=jammy
+Pin: version 2.*
+Pin-Priority: 1100
diff --git a/DistUpgrade/98-noble-overrides b/DistUpgrade/98-noble-overrides
deleted file mode 100644
index 383ac9373..000000000
--- a/DistUpgrade/98-noble-overrides
+++ /dev/null
@@ -1,1341 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-# SPDX-FileCopyrightText: 2022 Jonathan Esk-Riddell <jr at jriddell.org>
-
-Package: kbibtex
-Pin: origin "archive.neon.kde.org"
-Pin-Priority: 1100
-
-## Debian ships an unstable higher version kbibtex
-Package: kbibtex-data
-Pin: origin "archive.neon.kde.org"
-Pin-Priority: 1100
-
-## a few casualties from plasma 6 transitions
-Package: libpolkit-qt6-1-dev
-Pin: version 0.*
-Pin-Priority: 1100
-
-Package: libpolkit-qt6-1-1
-Pin: version 0.*
-Pin-Priority: 1100
-
-Package: print-manager
-Pin: version 5.*
-Pin-Priority: 1100
-
-Package: print-manager
-Pin: version 6.*
-Pin-Priority: 1100
-
-##### list of the noble pins
-## the following are listed by alphabetical source package
-## then packages in alphabetical order within each source
-
-##booth
-Package: booth
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##choqok
-Package: choqok
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##cppdap
-Package: cppdap
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libcppdap-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##debuerreotype
-Package: debuerreotype
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##fcitx5
-Package: fcitx5
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-data
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-modules
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-modules-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libfcitx5config6
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libfcitx5config-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libfcitx5core7
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libfcitx5core-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libfcitx5utils2
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libfcitx5utils-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##fcit5-anthy
-Package: fcitx5-anthy
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##fcitx5-bamboo
-Package: fcitx5-bamboo
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-# fcitx5-breeze
-Package: fcitx5-breeze
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-theme-breeze
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##fcitx5-chewing
-Package: fcitx5-chewing
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##fcitx5-chinese-addons
-Package: fcitx5-chinese-addons
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-chinese-addons-bin
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-chinese-addons-data
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-module-chttrans
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-module-cloudpinyin
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-module-cloudpinyin-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-module-fullwidth
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-module-pinyinhelper
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-module-pinyinhelper-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-module-punctuation
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-module-punctuation-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-pinyin
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-pinyin-gui
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##fcitx5-configtool source package
-Package: fcitx5-config-qt
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: kde-config-fcitx5
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##fcitx5-fbterm
-Package: fcitx5-fbterm
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-frontend-fbterm
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##fcitx5-gtk
-Package: fcitx5-gtk
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-frontend-gtk2
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-frontend-gtk3
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-frontend-gtk4
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: gir1.2-fcitxg-1.0
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libfcitx5gclient-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libfcitx5gclient2
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##fcitx5-hangul
-Package: fcitx5-hangul
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##fcitx5-keyman
-Package: fcitx5-keyman
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##fcitx5-kkc
-Package: fcitx5-kkc
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##fcitx5-libthai
-Package: fcitx5-libthai
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##fcitx5-lua
-Package: fcitx5-lua
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-module-lua-common
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-module-lua-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-module-lua
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##fcitx5-m17n
-Package: fcitx5-m17n
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##fcitx5-material-color
-Package: fcitx5-material-color
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##fcitx5-mcbopomofo
-Package: fcitx5-mcbopomofo
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-nord
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##fcitx5-nord
-Package: fcitx5-skin-nord
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-###fcitx5-qt actually built for qt6 and qt5 for binary compat
-#Package: fcitx5-qt
-#Pin: release o=Ubuntu
-#Pin-Priority: 1100
-#
-#Package: fcitx5-frontend-qt5
-#Pin: release o=Ubuntu
-#Pin-Priority: 1100
-#
-#Package: fcitx5-frontend-qt6
-#Pin: release o=Ubuntu
-#Pin-Priority: 1100
-#
-#Package: fcitx5-qt1
-#Pin: release o=Ubuntu
-#Pin-Priority: 1100
-#
-#Package: fcitx5-qt6-1
-#Pin: release o=Ubuntu
-#Pin-Priority: 1100
-#
-#Package: fcitx5-qt6-dev
-#Pin: release o=Ubuntu
-#Pin-Priority: 1100
-#
-#Package: fcitx5-qt-data
-#Pin: release o=Ubuntu
-#Pin-Priority: 1100
-#
-#Package: fcitx5-qt-dev
-#Pin: release o=Ubuntu
-#Pin-Priority: 1100
-
-##fcitx5-quwei
-Package: fcitx5-quwei
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##fcitx5-rime
-Package: fcitx5-rime
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##fcitx5-sayura
-Package: fcitx5-sayura
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##fcitx5-skk
-Package: fcitx5-skk
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##fcitx5-solarized
-Package: fcitx5-solarized
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##fcitx5-table-extra
-Package: fcitx5-table-extra
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-array30
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-array30-large
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-boshiamy
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-cangjie3
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-cangjie5
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-cangjie-large
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-cantonese
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-cantonhk
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-easy-large
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-jyutping
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-quick3
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-quick5
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-quick-classic
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-scj6
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-stroke5
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-t9
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-wu
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-wubi98
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-wubi98-pinyin
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-wubi98-single
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-wubi-large
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-zhengma
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-zhengma-large
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-zhengma-pinyin
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##fcitx5-table-other
-Package: fcitx5-table-other
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-amharic
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-arabic
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-cns11643
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-compose
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-emoji
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-ipa-x-sampa
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-latex
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-malayalam-phonetic
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-rustrad
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-tamil-remington
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-thai
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-translit
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-translit-ua
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-viqr
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-table-yawerty
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##fcitx5-tmux
-Package: fcitx5-tmux
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: fcitx5-frontend-tmux
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##fcitx5-unikey
-Package: fcitx5-unikey
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##fcitx5-zhuyin
-Package: fcitx5-zhuyin
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##jpeg-xl
-Package: jpeg-xl-doc
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: jpeg-xl
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libjpeg-xl-java
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libjxl-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libjxl-devtools
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libjxl-gdk-pixbuf
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libjxl-tools
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libjxl0.9
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##kjots
-Package: kjots
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##knotes
-Package: knotes
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##kseexpr
-Package: kseexpr-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: kseexpr
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libkseexpr-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libkseexpr3
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libkseexpr4
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libkseexpr4.0.2.0
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libkseexpr4010
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libkseexprui3
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libkseexprui4
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libkseexprui4.0.2.0
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libkseexprui4010
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: seexpr
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-####kde-telepathy/ktp-* EOL
-##ktp-accounts-kcm
-Package: kde-config-telepathy-accounts
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: ktp-accounts-kcm
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##ktp-approver
-Package: kde-telepathy-approver
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: ktp-approver
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##ktp-auth-handler
-Package: kde-telepathy-auth-handler
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: ktp-auth-handler
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##ktp-call-ui
-Package: kde-telepathy-call-ui
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: ktp-call-ui
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##ktp-common-internals
-Package: kde-telepathy-data
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: kde-telepathy-debugger
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: kde-telepathy-kaccounts
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: kde-telepathy-kpeople
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: ktp-common-internals
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libktp-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libktpcommoninternals9
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libktplogger9
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libktpmodels9
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libktpotr9
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libktpwidgets9
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: qml-module-org-kde-telepathy
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##ktp-contact-list
-Package: kde-telepathy-contact-list
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: ktp-contact-list
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##ktp-contact-runner
-Package: ktp-contact-runner
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: plasma-runner-telepathy-contact
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##ktp-desktop-applets
-Package: kde-telepthy-desktop-applets
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: ktp-desktop-applets
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##ktp-kded-integration-module
-Package: kded-telepathy-integration-module
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: ktp-kded-integration-module
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##ktp-send-file
-Package: kde-telepathy-send-file
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: ktp-send-file
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##ktp-text-ui
-Package: kde-telepathy-text-ui
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: ktp-text-ui
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##keyman
-Package: keyman-ubuntu
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: ibus-keyman
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: keyman
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: keyman-system-service
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libkeymancore-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libkeymancore1
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: python3-keyman-config
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##latte-dock
-Package: latte-dock
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##lcms2
-Package: lcms2
-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
-
-##libgwenhywfar
-
-Package: gwenhywfar-tools
-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: libgwenhywfar
-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
-
-## libime
-Package: libime-bin
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libime-data-language-model
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libime-data
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libime
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libimecore-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libimecore0
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libimepinyin-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libimepinyin0
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libimetable-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libimetable0
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-## libjpeg-turbo
-Package: libjpeg-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libjpeg8
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libjpeg8-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libjpeg-turbo8
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libjpeg-turbo8-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libjpeg-turbo-progs
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libjpegxl-java
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libturbojpeg
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libturbojpeg0-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libturbojpeg-java
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##libpinyin
-Package: libpinyin
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libpinyin-common-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libpinyin-data
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libpinyin-utils
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libpinyin15-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libpinyin15
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libzhuyin-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libzhuyin15
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##librime
-Package: librime
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: librime-bin
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: librime-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: librime-plugin-charcode
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: librime-plugin-lua
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: librime-plugin-octogram
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: librime1
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##libm17n
-Package: libm17n-0
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libm17n-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: m17n-lib-bin
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: m17n-lib-mimx
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libm17n-lib
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##libqalculate
-Package: libqalculate
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libqalculate-data
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libqalculate-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libqalculate-doc
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libqalculate20-data
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libqalculate23
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: qalc
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##libqapt
-Package: libqapt
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: gstreamer-qapt
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: gstreamer0.10-qapt
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: kde-thumbnailer-deb
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libqapt-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libqapt3
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libqapt3-runtime
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: plasma-runner-installer
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: qapt-batch
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: qapt
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: qapt-deb-installer
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: qapt-utils
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##libei
-Package: libei
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libei-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libei1
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libeis-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libeis1
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: liboeffis-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: liboeffis1
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##litehtml
-Package: liblitehtml-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: liblitehtml0
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: litehtml
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-## meson
-Package: meson
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-## openexr
-Package: libopenexr-3-1-30
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libopenexr-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: openexr
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##qcustomplot
-Package: libqcustomplot-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libqcustomplot-doc
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libqcustomplot2.1-qt6
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libqcustomplot2.1
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: qcustomplot
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##qt-advanced-docking-system
-Package: qt-advanced-docking-system
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libqt-advanced-docking-system-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libqt-advanced-docking-system3.8.3
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##stellarsolver
-Package: libstellarsolver2
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libstellarsolver-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##taglib
-Package: libtag1-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libtag1-doc
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libtag1v5
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libtag1v5-vanilla
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libtagc0
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libtagc0-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##telepathy-qt
-Package: telepathy-qt
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libtelepathy-qt5-0
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libtelepathy-qt5-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libtelepathy-qt5-farstream0
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-## xcb-imdkit
-Package: xcb-imdkit
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libxcb-imdkit-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: libxcb-imdkit1
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##xorgproto
-Package: xorgproto
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: x11proto-core-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: x11proto-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: x11proto-dri2-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: x11proto-fonts-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: x11proto-gl-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: x11proto-input-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: x11proto-kb-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: x11proto-present-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: x11proto-randr-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: x11proto-record-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: x11proto-render-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: x11proto-scrnsaver-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: x11proto-video-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: x11proto-xext-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: x11proto-xf86dri-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: x11proto-xf86vidmode-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-Package: x11proto-xinerama-dev
-Pin: release o=Ubuntu
-Pin-Priority: 1100
-
-##xdg-user-dirs
-Package: xdg-user-dirs
-Pin: release o=Ubuntu
-Pin-Priority: 1100
diff --git a/DistUpgrade/DistUpgradeQuirks.py b/DistUpgrade/DistUpgradeQuirks.py
index 7811ad254..de8033596 100644
--- a/DistUpgrade/DistUpgradeQuirks.py
+++ b/DistUpgrade/DistUpgradeQuirks.py
@@ -145,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-noble-overrides']:
+        for old_pin in ['98-jammy-overrides']:
             path = '/etc/apt/preferences.d/' + old_pin
             if os.path.exists(path):
                 os.remove(path)
@@ -189,12 +189,12 @@ class DistUpgradeQuirks(object):
         logging.debug("running Quirks.PreDistUpgradeCache")
         # self._install_python_is_python2()
         # neon packages with versions < in focal
-        copyfile('98-noble-overrides', '/etc/apt/preferences.d/98-noble-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', '98-focal-overrides', '99-focal-overrides', '98-jammy-overrides']:
+        for old_pin in ['98-xenial-overrides', '99-xenial-overrides', '98-focal-overrides', '99-focal-overrides']:
             path = '/etc/apt/preferences.d/' + old_pin
             if os.path.exists(path):
                 os.remove(path)
diff --git a/DistUpgrade/DistUpgradeViewKDE.py b/DistUpgrade/DistUpgradeViewKDE.py
index fb140937c..e98c54b93 100644
--- a/DistUpgrade/DistUpgradeViewKDE.py
+++ b/DistUpgrade/DistUpgradeViewKDE.py
@@ -591,7 +591,7 @@ class DistUpgradeViewKDE(DistUpgradeView):
         os.environ["KDE_FULL_SESSION"] = "TRUE"
         # We also need to indicate version as otherwise KDElibs3 compatibility
         # might kick in such as in QIconLoader.cpp:QString fallbackTheme.
-        os.environ["KDE_SESSION_VERSION"] = "6"
+        os.environ["KDE_SESSION_VERSION"] = "5"
         # Pretty much all of the above but for Qt5
         os.environ["QT_QPA_PLATFORMTHEME"] = "kde"
 
@@ -601,9 +601,9 @@ class DistUpgradeViewKDE(DistUpgradeView):
         # QStandardButton translations.
         translator = QTranslator(self.app)
         if type(PYQT_VERSION) == int:
-            translator.load(QLocale.system(), 'qt', '_', '/usr/share/qt6/translations')
-        else:
             translator.load(QLocale.system(), 'qt', '_', '/usr/share/qt5/translations')
+        else:
+            translator.load(QLocale.system(), 'qt', '_', '/usr/share/qt4/translations')
         self.app.installTranslator(translator)
 
         QUrlOpener().setupUrlHandles()

More information about the Neon-commits mailing list