summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--upgrade.py2
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0c9a12677..1b976d69a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
+2004-11-04 Jeremy Katz <katzj@redhat.com>
+
+ * upgrade.py (upgradeFindPackages): Key iiimf-le-canna off of
+ kinput2-canna-wnn6 instead of just kinput2 (#129218)
+
2004-11-03 Jeremy Katz <katzj@redhat.com>
+ * iw/network_gui.py (NetworkWindow.setupDevices):
+ * textw/network_text.py (NetworkDeviceWindow.runScreen):
+ Sync behavior of onboot between gui/text (#138011)
+
* autopart.py (getAutopartitionBoot): Use
iutil.hasiSeriesNativeStorage instead of iutil.hasIbmSis()
* partitions.py (Partitions.sanityCheckAllRequests): Likewise.
diff --git a/upgrade.py b/upgrade.py
index 68376146a..a59ea2b15 100644
--- a/upgrade.py
+++ b/upgrade.py
@@ -685,7 +685,7 @@ def upgradeFindPackages(intf, method, id, instPath, dir):
# input methods all changed. hooray!
imupg = ( ("ami", "iiimf-le-hangul"),
- ("kinput2", "iiimf-le-canna"),
+ ("kinput2-canna-wnn6", "iiimf-le-canna"),
("miniChinput", "iiimf-le-chinput"),
("xcin", "iiimf-le-xcin") )
iiimf = 0