Hello community,

here is the log from the commit of package linuxrc for openSUSE:Factory checked 
in at 2016-09-17 14:31:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/linuxrc (Old)
 and      /work/SRC/openSUSE:Factory/.linuxrc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "linuxrc"

Changes:
--------
--- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes  2016-07-20 
09:16:00.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes     2016-09-17 
14:31:48.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Sep 13 13:15:23 UTC 2016 - snw...@suse.com
+
+- Don't enforce keymap conversion to unicode
+- Unify keymaps with YaST after recent changes in yast2-country
+- 5.0.85
+
+-------------------------------------------------------------------

Old:
----
  linuxrc-5.0.84.tar.xz

New:
----
  linuxrc-5.0.85.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ linuxrc.spec ++++++
--- /var/tmp/diff_new_pack.2XOOH1/_old  2016-09-17 14:31:49.000000000 +0200
+++ /var/tmp/diff_new_pack.2XOOH1/_new  2016-09-17 14:31:49.000000000 +0200
@@ -25,7 +25,7 @@
 Summary:        SUSE Installation Program
 License:        GPL-3.0+
 Group:          System/Boot
-Version:        5.0.84
+Version:        5.0.85
 Release:        0
 Source:         %{name}-%{version}.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ linuxrc-5.0.84.tar.xz -> linuxrc-5.0.85.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-5.0.84/VERSION new/linuxrc-5.0.85/VERSION
--- old/linuxrc-5.0.84/VERSION  2016-07-13 14:51:26.000000000 +0200
+++ new/linuxrc-5.0.85/VERSION  2016-09-13 15:10:49.000000000 +0200
@@ -1 +1 @@
-5.0.84
+5.0.85
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-5.0.84/changelog new/linuxrc-5.0.85/changelog
--- old/linuxrc-5.0.84/changelog        2016-07-13 14:51:26.000000000 +0200
+++ new/linuxrc-5.0.85/changelog        2016-09-13 15:10:49.000000000 +0200
@@ -1,3 +1,7 @@
+2016-09-13:    5.0.85
+       - Don't enforce keymap conversion to unicode
+       - Unify keymaps with YaST after recent changes in yast2-country
+
 2016-07-13:    5.0.84
        - fix reading instsys id (related to bsc #974601)
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/linuxrc-5.0.84/settings.c 
new/linuxrc-5.0.85/settings.c
--- old/linuxrc-5.0.84/settings.c       2016-07-13 14:51:26.000000000 +0200
+++ new/linuxrc-5.0.85/settings.c       2016-09-13 15:10:49.000000000 +0200
@@ -26,66 +26,34 @@
 #include "url.h"
 #include "net.h"
 
-
-#define KM_L1 "iso-8859-15"
-#define KM_L2 "iso-8859-2"
-#define KM_L7 "iso-8859-7"
-#define KM_KOI "koi8-r"
-
-
-/* keymap encodings */
-struct {
-  char *map;
-  char *enc;
-} km_enc[] = {
-  { "Pl02",         KM_L2  },
-  { "be-latin1",    KM_L1  },
-  { "br-abnt2",     KM_L1  },
-  { "cz-us-qwertz", KM_L2  },
-  { "de-latin1-nodeadkeys",   KM_L1  },
-  { "es",           KM_L1  },
-  { "fr-latin1",    KM_L1  },
-  { "gr",           KM_L7  },
-  { "hu",           KM_L2  },
-  { "it",           KM_L1  },
-  { "no-latin1",    KM_L1  },
-  { "pt-latin1",    KM_L1  },
-  { "fi-latin1",    KM_L1  },
-  { "sv-latin1",    KM_L1  },
-  { "ru1",          KM_KOI },
-  { "sk-qwerty",    KM_L2  },
-  { "slovene",      KM_L2  }
-};
-
-
 #define LANG_DEFAULT lang_en
 static language_t set_languages_arm[] = {
   { lang_af, "Afrikaans", "us", "af_ZA", "af" },
   { lang_bg, "Bulgarian", "us", "bg_BG", "bg" },
   { lang_ca, "Catala", "us", "ca_ES", "ca" },
-  { lang_cs, "Cestina", "cz-us-qwertz", "cs_CZ", "cs" },
+  { lang_cs, "Cestina", "cz", "cs_CZ", "cs" },
   { lang_da, "Dansk", "dk", "da_DK", "da" },
-  { lang_de, "Deutsch", "de-latin1-nodeadkeys", "de_DE", "de" },
+  { lang_de, "Deutsch", "de-nodeadkeys", "de_DE", "de" },
   { lang_en, "English", "us", "en_US", "en_US" },
   { lang_es, "Espanol", "es", "es_ES", "es" },
-  { lang_fr, "Francais", "fr-latin1", "fr_FR", "fr" },
+  { lang_fr, "Francais", "fr", "fr_FR", "fr" },
   { lang_el, "Greek", "gr", "el_GR", "el" },
   { lang_it, "Italiano", "it", "it_IT", "it" },
-  { lang_ja, "Japanese", "jp106", "ja_JP", "ja" },
+  { lang_ja, "Japanese", "jp", "ja_JP", "ja" },
   { lang_hu, "Magyar", "hu", "hu_HU", "hu" },
-  { lang_nl, "Nederlands", "us", "nl_NL", "nl" },
-  { lang_nb, "Norsk", "no-latin1", "nb_NO", "nb" },
-  { lang_pl, "Polski", "Pl02", "pl_PL", "pl" },
-  { lang_pt, "Portugues", "pt-latin1", "pt_PT", "pt" },
-  { lang_pt_BR, "Portugues brasileiro", "br-abnt2", "pt_BR", "pt_BR" },
-  { lang_ru, "Russian", "ru1", "ru_RU", "ru" },
+  { lang_nl, "Nederlands", "nl", "nl_NL", "nl" },
+  { lang_nb, "Norsk", "no", "nb_NO", "nb" },
+  { lang_pl, "Polski", "pl", "pl_PL", "pl" },
+  { lang_pt, "Portugues", "pt", "pt_PT", "pt" },
+  { lang_pt_BR, "Portugues brasileiro", "br", "pt_BR", "pt_BR" },
+  { lang_ru, "Russian", "ruwin_alt-UTF-8", "ru_RU", "ru" },
   { lang_zh_CN, "Simplified Chinese", "us", "zh_CN", "zh_CN" },
-  { lang_sk, "Slovencina", "sk-qwerty", "sk_SK", "sk" },
-  { lang_sl, "Slovenscina", "slovene", "sl_SI", "sl" },
-  { lang_fi, "Suomi", "fi-latin1", "fi_FI", "fi" },
-  { lang_sv, "Svenska", "sv-latin1", "sv_SE", "sv" },
+  { lang_sk, "Slovencina", "sk", "sk_SK", "sk" },
+  { lang_sl, "Slovenscina", "si", "sl_SI", "sl" },
+  { lang_fi, "Suomi", "fi-kotoistus", "fi_FI", "fi" },
+  { lang_sv, "Svenska", "se", "sv_SE", "sv" },
   { lang_zh_TW, "Traditional Chinese", "us", "zh_TW", "zh_TW" },
-  { lang_uk, "Ukrainian", "us", "uk_UA", "uk" },
+  { lang_uk, "Ukrainian", "ua-utf", "uk_UA", "uk" },
   { lang_xh, "isiXhosa", "us", "xh_ZA", "xh" },
   { lang_zu, "isiZulu", "us", "zu_ZA", "zu" },
   // entry for unknown language
@@ -94,65 +62,31 @@
 
 #define KEYMAP_DEFAULT "us"
 
-#if !defined(__sparc__)
 static keymap_t set_keymaps_arm [] =
 {
-{ "Belgian",              "be-latin1"    },
-{ "Ceske",                "cz-us-qwertz" },
+{ "Belgian",              "be"           },
+{ "Ceske",                "cz"           },
 { "Dansk",                "dk"           },
-{ "Deutsch",              "de-latin1-nodeadkeys"   },
+{ "Deutsch",              "de-nodeadkeys"},
 { "English (UK)",         "uk"           },
 { "English (US)",         "us"           },
 { "Español",              "es"           },
-{ "Français",             "fr-latin1"    },
+{ "Français",             "fr"           },
 { "Hellenic",             "gr"           },
 { "Italiano",             "it"           },
-{ "Japanese",             "jp106"        },
+{ "Japanese",             "jp"           },
 { "Magyar",               "hu"           },
 { "Nederlands",           "nl"           },
-{ "Norsk",                "no-latin1"    },
-{ "Polski",               "Pl02"         },
-{ "Português Brasileiro", "br-abnt2"     },
-{ "Português",            "pt-latin1"    },
-{ "Russian",              "ru1"          },
-{ "Slovak",               "sk-qwerty"    },
-{ "Slovene",              "slovene"      },
-{ "Suomi",                "fi-latin1"    },
-{ "Svensk",               "sv-latin1"    }
-};
-#else          /* defined(__sparc__) */
-static keymap_t set_keymaps_arm [] =
-{
-{ "Ceske (PS/2)",                "cz-us-qwertz"    },
-{ "Dansk (PS/2)",                "dk"              },
-{ "Deutsch (PS/2)",              "de-latin1-nodeadkeys"      },
-{ "Deutsch (Sun Type5)",         "sunt5-de-latin1" },
-{ "English/UK (PS/2)",           "uk"              },
-{ "English/UK (Sun)",            "sunt5-uk"        },
-{ "English/US (PS/2)",           "us"              },
-{ "English/US (Sun)",            "sunkeymap"       },
-{ "Español (PS/2)",              "es"              },
-{ "Español (Sun Type4)",         "sunt4-es"        },
-{ "Español (Sun Type5)",         "sunt5-es"        },
-{ "Français (PS/2)",             "fr-latin1"       },
-{ "Français (Sun Type5)",        "sunt5-fr-latin1" },
-{ "Hellenic (PS/2)",             "gr"              },
-{ "Italiano (PS/2)",             "it"              },
-{ "Magyar (PS/2)",               "hu"              },
-{ "Nederlands (PS/2)",           "nl"              },
-{ "Norsk (PS/2)",                "no-latin1"       },
-{ "Norsk (Sun Type5)",           "sunt4-no-latin1" },
-{ "Polski (PS/2)",               "Pl02"            },
-{ "Português (PS/2)",            "pt-latin1"       },
-{ "Português Brasileiro (PS/2)", "br-abnt2"        },
-{ "Russian (PS/2)",              "ru1"             },
-{ "Russian (Sun Type5)",         "sunt5-ru"        },
-{ "Slovak",                      "sk-qwerty"       },
-{ "Suomi/Svensk (PS/2)",         "fi"              },
-{ "Suomi/Svensk (Sun Type4)",    "sunt4-fi-latin1" },
-{ "Suomi/Svensk (Sun Type5)",    "sunt5-fi-latin1" }
+{ "Norsk",                "no"           },
+{ "Polski",               "pl"           },
+{ "Português Brasileiro", "br"           },
+{ "Português",            "pt"           },
+{ "Russian",              "ruwin_alt-UTF-8" },
+{ "Slovak",               "sk"           },
+{ "Slovene",              "si"           },
+{ "Suomi",                "fi-kotoistus" },
+{ "Svensk",               "se"           }
 };
-#endif
 
 #define NR_LANGUAGES (sizeof(set_languages_arm)/sizeof(set_languages_arm[0]))
 #define NR_KEYMAPS (sizeof(set_keymaps_arm)/sizeof(set_keymaps_arm[0]))
@@ -161,19 +95,19 @@
 #define KEYMAP_DEFAULT "mac-us"
 static keymap_t set_keymaps_arm_mac [] =
 {
-{ "Dansk",                "mac-dk-latin1"            },
-{ "Deutsch (CH)",         "mac-de_CH"                },
-{ "Deutsch",              "mac-de-latin1-nodeadkeys" },
-{ "English (UK)",         "mac-uk"                   },
-{ "English (US)",         "mac-us"                   },
-{ "Español",              "mac-es"                   },
-{ "Flamish",              "mac-be"                   },
-{ "Français (CH)",        "mac-fr_CH"                },
-{ "Français",             "mac-fr-latin1"            },
-{ "Italiano",             "mac-it"                   },
-{ "Português",            "mac-pt"                   },
-{ "Suomi/Svensk",         "mac-fi"                   },
-{ "Svenska",              "mac-se"                   }
+{ "Dansk",                "dk-mac"                   },
+{ "Deutsch (CH)",         "ch-de_mac"                },
+{ "Deutsch",              "de-mac"                   },
+{ "English (UK)",         "gb-mac"                   },
+{ "English (US)",         "us-mac"                   },
+{ "Español",              "es-mac"                   },
+{ "Flamish",              "us-mac"                   },
+{ "Français (CH)",        "ch-fr_mac"                },
+{ "Français",             "fr-mac"                   },
+{ "Italiano",             "it-mac"                   },
+{ "Português",            "pt-mac"                   },
+{ "Suomi/Svensk",         "fi-mac"                   },
+{ "Svenska",              "se-mac"                   }
 };
 /* !!! ***MUST NOT*** be bigger than NR_KEYMAPS !!! */
 #define NR_KEYMAPS_MAC (sizeof set_keymaps_arm_mac / sizeof 
*set_keymaps_arm_mac)
@@ -192,7 +126,6 @@
 static int  set_settings_cb          (dia_item_t di);
 static int  set_expert_cb            (dia_item_t di);
 static int  set_get_current_language (enum langid_t lang);
-static char *keymap_encoding(char *map);
 
 /*
  *
@@ -468,7 +401,7 @@
 void set_activate_keymap(char *keymap)
 {
   char cmd[MAX_FILENAME];
-  char *s, enc[64];
+  char *s;
 
   /* keymap might be config.keymap, so be careful... */
   keymap = keymap ? strdup(keymap) : NULL;
@@ -477,14 +410,7 @@
 
   if((config.keymap = keymap)) {
     kbd_unimode();
-    *enc = 0;
-    if((s = keymap_encoding(config.keymap))) {
-      sprintf(enc, " -c %s", s);
-    }
-    sprintf(cmd,
-      "loadkeys -q %s ; dumpkeys%s >/tmp/dk ; loadkeys -q --unicode </tmp/dk",
-      keymap, enc
-    );
+    sprintf(cmd, "loadkeys -q %s", keymap);
     if(!config.test) {
       lxrc_run_console(cmd);
     }
@@ -632,19 +558,3 @@
   return set_languages_arm + set_get_current_language(lang_undef) - 1;
 }
 
-
-/* look up keymap encoding */
-char *keymap_encoding(char *map)
-{
-  int i;
-
-  if(map) {
-    for(i = 0; i < sizeof km_enc / sizeof *km_enc; i++) {
-      if(!strcmp(km_enc[i].map, map)) return km_enc[i].enc;
-    }
- }
-
-  return NULL;
-}
-
-


Reply via email to