[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20230209-63-g8cc4502

[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20230209-63-g8cc4502

[Jon Turney]

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=8cc4502fd8978001437b2f5c182e9d32f8672170

commit 8cc4502fd8978001437b2f5c182e9d32f8672170
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Thu Jan 18 20:25:41 2024 +0000

    Rewrite dependencies on removed python packages
    
    Using the now removed, obsoleted package name causes the solver to want
    to uninstall anything which depends on these, which isn't helpful right
    now.
    
    Theoretically, the information to generate these exists in our "retired
    old-style obsoleting packages" data, but do it manually for speed right
    now.


Diff:
---
 calm/past_mistakes.py | 53 ++++++++++++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/calm/past_mistakes.py b/calm/past_mistakes.py
index 4b44f1d..bd3d844 100644
--- a/calm/past_mistakes.py
+++ b/calm/past_mistakes.py
@@ -172,7 +172,29 @@ nonexistent_provides = historical_provides + [
     'python2-devel',
     'python27',
     'python27-.*',
+    'python-appindicator',
+    'python-gconf2',
+    'python-gnome2',
+    'python-gnomevfs2',
     'python-gtk2.0',
+    'python-keybinder',
+    'python-orbit',
+    'python-pynotify',
+    'python-vte',
+    'python-wnck',
+    'python-zeitgeist',
+    'python2-avahi',
+    'python2-avogadro',
+    'python2-ayatana_appindicator',
+    'python2-fontforge',
+    'python2-gobject',
+    'python2-ipaddr',
+    'python2-libvirt',
+    'python2-magic',
+    'python2-matemenu',
+    'python2-pykde4',
+    'python2-pyqt4',
+    'python2-pyqt5',
     # random build-depends
     'python2-cython',
     'python2-wheel',
@@ -187,58 +209,37 @@ nonexistent_provides = historical_provides + [
 # provides which don't exist, and were obsoleted by something else which we've
 # forgotten about..
 substitute_dependency = {
-    'python-appindicator': 'python27-appindicator',
-    'python-avahi': 'python27-avahi',
+    'python-avahi': 'python2-avahi',
     'python-cairo': 'python27-cairo',
     'python-chardet': 'python27-chardet',
     'python-dbus': 'python27-dbus',
     'python-docutils': 'python27-docutils',
-    'python-fontforge': 'python27-fontforge',
-    'python-gconf2': 'python27-gconf2',
+    'python-fontforge': 'python2-fontforge',
     'python-gi': 'python27-gi',
-    'python-gnome2': 'python27-gnome2',
-    'python-gnomevfs2': 'python27-gnomevfs2',
-    'python-gobject': 'python27-gobject',
+    'python-gobject': 'python2-gobject',
     'python-jinja2': 'python27-jinja2',
-    'python-keybinder': 'python27-keybinder',
     'python-lxml': 'python27-lxml',
     'python-marisa': 'python27-marisa',
     'python-numpy': 'python27-numpy',
-    'python-orbit': 'python27-orbit',
     'python-pygments': 'python27-pygments',
-    'python-pykde4': 'python27-pykde4',
-    'python-pynotify': 'python27-pynotify',
-    'python-pyqt4': 'python27-pyqt4',
+    'python-pykde4': 'python2-pykde4',
+    'python-pyqt4': 'python2-pyqt4',
     'python-rdflib': 'python27-rdflib',
     'python-reportlab': 'python27-reportlab',
     'python-twisted': 'python27-twisted',
-    'python-vte': 'python27-vte',
-    'python-wnck': 'python27-wnck',
     'python-xdg': 'python27-xdg',
-    'python-zeitgeist': 'python27-zeitgeist',
-    'python2-avogadro': 'python27-avogadro',
-    'python2-ayatana_appindicator': 'python27-ayatana_appindicator',
     'python2-clang': 'python27-clang',
     'python2-dbus': 'python27-dbus',
-    'python2-fontforge': 'python27-fontforge',
     'python2-future': 'python27-future',
     'python2-gi': 'python27-gi',
-    'python2-gobject': 'python27-gobject',
     'python2-gv': 'python27-gv',
     'python2-imaging': 'python27-imaging',
-    'python2-ipaddr': 'python27-ipaddr',
     'python2-ipython': 'python27-ipython',
     'python2-jinja2': 'python27-jinja2',
-    'python2-libvirt': 'python27-libvirt',
     'python2-libxml2': 'python27-libxml2',
     'python2-lxml': 'python27-lxml',
-    'python2-magic': 'python27-magic',
-    'python2-matemenu': 'python27-matemenu',
     'python2-nghttp2': 'python27-nghttp2',
     'python2-numpy': 'python27-numpy',
-    'python2-pykde4': 'python27-pykde4',
-    'python2-pyqt4': 'python27-pyqt4',
-    'python2-pyqt5': 'python27-pyqt5',
     'python2-requests': 'python27-requests',
     'python2-setuptools': 'python27-setuptools',
     'python2-six': 'python27-six',