Hello community,
here is the log from the commit of package yast2-country for openSUSE:Factory checked in at 2014-03-01 14:38:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-country (Old)
and /work/SRC/openSUSE:Factory/.yast2-country.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-country"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes 2014-02-16 09:13:12.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-country.new/yast2-country.changes 2014-03-01 14:38:37.000000000 +0100
@@ -1,0 +2,12 @@
+Fri Feb 28 14:13:07 CET 2014 - jsuchome(a)suse.cz
+
+- only KEYMAP belongs to /etc/vconsole.conf (bnc#861819)
+- 3.1.4
+
+-------------------------------------------------------------------
+Fri Feb 28 12:13:31 CET 2014 - jsuchome(a)suse.cz
+
+- move keyboard sysconfig data to /etc/vconsole.conf (bnc#861819)
+- 3.1.3
+
+-------------------------------------------------------------------
Old:
----
yast2-country-3.1.2.tar.bz2
New:
----
yast2-country-3.1.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-country.spec ++++++
--- /var/tmp/diff_new_pack.T8qzp7/_old 2014-03-01 14:38:37.000000000 +0100
+++ /var/tmp/diff_new_pack.T8qzp7/_new 2014-03-01 14:38:37.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-country
-Version: 3.1.2
+Version: 3.1.4
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-country-3.1.2.tar.bz2 -> yast2-country-3.1.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.2/keyboard/src/Makefile.am new/yast2-country-3.1.4/keyboard/src/Makefile.am
--- old/yast2-country-3.1.2/keyboard/src/Makefile.am 2014-02-11 10:40:47.000000000 +0100
+++ new/yast2-country-3.1.4/keyboard/src/Makefile.am 2014-02-28 17:20:50.000000000 +0100
@@ -14,7 +14,8 @@
include/keyboard/dialogs.rb
scrconf_DATA = \
- scrconf/sysconfig_keyboard.scr
+ scrconf/sysconfig_keyboard.scr \
+ scrconf/etc_vconsole_conf.scr
schemafilesdir = $(schemadir)/autoyast/rnc
schemafiles_DATA = \
@@ -30,4 +31,4 @@
EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(schemafiles_DATA) $(ydata_DATA) $(desktop_DATA)
-include $(top_srcdir)/Makefile.am.common
\ No newline at end of file
+include $(top_srcdir)/Makefile.am.common
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.2/keyboard/src/include/keyboard/dialogs.rb new/yast2-country-3.1.4/keyboard/src/include/keyboard/dialogs.rb
--- old/yast2-country-3.1.2/keyboard/src/include/keyboard/dialogs.rb 2014-02-11 10:40:47.000000000 +0100
+++ new/yast2-country-3.1.4/keyboard/src/include/keyboard/dialogs.rb 2014-02-28 17:20:50.000000000 +0100
@@ -61,15 +61,6 @@
"<p>Settings made here apply only to the console keyboard. Configure the keyboard for the graphical user interface with another tool, such as SaX.</p>\n"
)
- # general help trailer
- help_text = Ops.add(
- help_text,
- _(
- "<p>\n" +
- "For <b>Devices for Lock</b>, enter a space-separated list of devices to which to apply the Scroll Lock, Num Lock, and Caps Lock settings.\n" +
- "</p>"
- )
- )
# label text
@@ -124,26 +115,10 @@
]
)
),
- VSpacing(Opt(:vstretch), 1),
- Left(
- # checkbox label
- CheckBox(Id(:capslock), _("Ca&ps Lock On"))
- ),
- Left(
- # checkbox label
- CheckBox(Id(:scrlock), _("&Scroll Lock On"))
- )
+ VSpacing(Opt(:vstretch), 1)
)
),
VSpacing(Opt(:vstretch), 1),
- Left(
- InputField(
- Id(:tty),
- Opt(:hstretch),
- # textentry label
- _("&Devices for Lock")
- )
- ),
VSpacing(Opt(:vstretch), 1),
Left(
# label text
@@ -157,7 +132,8 @@
),
VSpacing(0.5)
)
- )
+ ),
+ HSpacing(1)
)
)
val = Keyboard.GetExpertValues
@@ -171,17 +147,6 @@
tmp = "untouched" if tmp == ""
UI.ChangeWidget(Id(:numlock), :Value, tmp)
UI.ChangeWidget(
- Id(:capslock),
- :Value,
- Ops.get_boolean(val, "capslock", false)
- )
- UI.ChangeWidget(
- Id(:scrlock),
- :Value,
- Ops.get_boolean(val, "scrlock", false)
- )
- UI.ChangeWidget(Id(:tty), :Value, Ops.get_string(val, "tty", ""))
- UI.ChangeWidget(
Id(:discaps),
:Value,
Ops.get_boolean(val, "discaps", false)
@@ -198,9 +163,6 @@
if Builtins.contains(["bios", "yes", "no"], tmp)
Ops.set(val, "numlock", tmp)
end
- Ops.set(val, "capslock", UI.QueryWidget(Id(:capslock), :Value))
- Ops.set(val, "scrlock", UI.QueryWidget(Id(:scrlock), :Value))
- Ops.set(val, "tty", UI.QueryWidget(Id(:tty), :Value))
Ops.set(val, "discaps", UI.QueryWidget(Id(:discaps), :Value))
Builtins.y2milestone("map ok %1", val)
Keyboard.SetExpertValues(val)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.2/keyboard/src/modules/Keyboard.rb new/yast2-country-3.1.4/keyboard/src/modules/Keyboard.rb
--- old/yast2-country-3.1.2/keyboard/src/modules/Keyboard.rb 2014-02-11 10:40:47.000000000 +0100
+++ new/yast2-country-3.1.4/keyboard/src/modules/Keyboard.rb 2014-02-28 17:20:50.000000000 +0100
@@ -100,6 +100,7 @@
Yast.import "Arch"
Yast.import "AsciiFile"
Yast.import "Directory"
+ Yast.import "FileUtils"
Yast.import "Label"
Yast.import "Language"
Yast.import "Linuxrc"
@@ -217,13 +218,9 @@
#
@kbd_descr = []
- @kbd_tty = "tty1 tty2 tty3 tty4 tty5 tty6 tty8 tty9 tty10 tty11 tty12 tty13 tty14 tty15 tty16 tty17 tty18 tty19 tty20"
-
@kbd_rate = ""
@kbd_delay = ""
@kbd_numlock = ""
- @kbd_capslock = ""
- @kbd_scrlock = ""
@kbd_disable_capslock = ""
@keyboardprobelist = [] # List of all probed keyboards
@@ -245,10 +242,6 @@
# Read the the variables not touched by the module to be able to
# store them again on Save().
#
- @kbd_tty = Misc.SysconfigRead(
- path(".sysconfig.keyboard.KBD_TTY"),
- @kbd_tty
- )
@kbd_rate = Misc.SysconfigRead(
path(".sysconfig.keyboard.KBD_RATE"),
@kbd_rate
@@ -261,29 +254,18 @@
path(".sysconfig.keyboard.KBD_NUMLOCK"),
@kbd_numlock
)
- @kbd_capslock = Misc.SysconfigRead(
- path(".sysconfig.keyboard.KBD_CAPSLOCK"),
- @kbd_capslock
- )
- @kbd_scrlock = Misc.SysconfigRead(
- path(".sysconfig.keyboard.KBD_SCRLOCK"),
- @kbd_scrlock
- )
@kbd_disable_capslock = Misc.SysconfigRead(
path(".sysconfig.keyboard.KBD_DISABLE_CAPS_LOCK"),
@kbd_disable_capslock
)
Builtins.y2milestone(
- "rate:%1 delay:%2 numlock:%3 capslock:%4 scrlock:%5 disclock:%6",
+ "rate:%1 delay:%2 numlock:%3 disclock:%4",
@kbd_rate,
@kbd_delay,
@kbd_numlock,
- @kbd_capslock,
- @kbd_scrlock,
@kbd_disable_capslock
)
- Builtins.y2milestone("tty:%1", @kbd_tty)
nil
end
@@ -430,9 +412,6 @@
"rate" => @kbd_rate,
"delay" => @kbd_delay,
"numlock" => @kbd_numlock,
- "capslock" => @kbd_capslock == "yes" ? true : false,
- "scrlock" => @kbd_scrlock == "yes" ? true : false,
- "tty" => @kbd_tty,
"discaps" => @kbd_disable_capslock == "yes" ? true : false
}
deep_copy(ret)
@@ -852,19 +831,14 @@
def Save
if Mode.update
kbd = Misc.SysconfigRead(path(".sysconfig.keyboard.YAST_KEYBOARD"), "")
- if Builtins.size(kbd) == 0
- kmap = Misc.SysconfigRead(path(".sysconfig.keyboard.KEYTABLE"), "")
- if Ops.greater_than(Builtins.size(kmap), 0)
+ if kbd.empty?
+ kmap = Misc.SysconfigRead(path(".etc.vconsole_conf.KEYMAP"), "")
+ # if still nothing found, lets check the obsolete config option:
+ kmap = Misc.SysconfigRead(path(".sysconfig.keyboard.KEYTABLE"), "") if kmap.empty?
+ if !kmap.empty?
data = GetX11KeyData(kmap)
- if Ops.greater_than(
- Builtins.size(Ops.get_string(data, "XkbLayout", "")),
- 0
- )
- kbd = XkblayoutToKeyboard(Ops.get_string(data, "XkbLayout", ""))
- kbd = Ops.add(
- Ops.add(kbd, ","),
- Ops.get_string(data, "XkbModel", "pc104")
- )
+ if (data["XkbLayout"] || "").size > 0
+ kbd = XkblayoutToKeyboard(data["XkbLayout"]) + "," + (data["XkbModel"] || "pc104")
SCR.Write(path(".sysconfig.keyboard.YAST_KEYBOARD"), kbd)
SCR.Write(
path(".sysconfig.keyboard.YAST_KEYBOARD.comment"),
@@ -893,20 +867,19 @@
"#\n"
)
- SCR.Write(path(".sysconfig.keyboard.KEYTABLE"), @keymap)
SCR.Write(path(".sysconfig.keyboard.COMPOSETABLE"), @compose_table)
- SCR.Write(path(".sysconfig.keyboard.KBD_TTY"), @kbd_tty)
SCR.Write(path(".sysconfig.keyboard.KBD_RATE"), @kbd_rate)
SCR.Write(path(".sysconfig.keyboard.KBD_DELAY"), @kbd_delay)
SCR.Write(path(".sysconfig.keyboard.KBD_NUMLOCK"), @kbd_numlock)
- SCR.Write(path(".sysconfig.keyboard.KBD_CAPSLOCK"), @kbd_capslock)
- SCR.Write(path(".sysconfig.keyboard.KBD_SCRLOCK"), @kbd_scrlock)
SCR.Write(
path(".sysconfig.keyboard.KBD_DISABLE_CAPS_LOCK"),
@kbd_disable_capslock
)
SCR.Write(path(".sysconfig.keyboard"), nil) # flush
+ SCR.Write(path(".etc.vconsole_conf.KEYMAP"), @keymap.gsub(/(.*)\.map\.gz/, '\1'))
+ SCR.Write(path(".etc.vconsole_conf"), nil) # flush
+
# As a preliminary step mark all keyboards except the one to be configured
# as configured = no and needed = no. Afterwards this one keyboard will be
# marked as configured = yes and needed = yes. This has to be done to
@@ -1261,16 +1234,6 @@
if Builtins.haskey(val, "numlock")
@kbd_numlock = Ops.get_string(val, "numlock", "")
end
- if Builtins.haskey(val, "capslock")
- @kbd_capslock = Ops.get_boolean(val, "capslock", false) ? "yes" : "no"
- end
- if Builtins.haskey(val, "scrlock")
- @kbd_scrlock = Ops.get_boolean(val, "scrlock", false) ? "yes" : "no"
- end
- if Builtins.haskey(val, "tty") &&
- Ops.greater_than(Builtins.size(Ops.get_string(val, "tty", "")), 0)
- @kbd_tty = Ops.get_string(val, "tty", "")
- end
if Builtins.haskey(val, "discaps")
@kbd_disable_capslock = Ops.get_boolean(val, "discaps", false) ? "yes" : "no"
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.2/keyboard/src/scrconf/etc_vconsole_conf.scr new/yast2-country-3.1.4/keyboard/src/scrconf/etc_vconsole_conf.scr
--- old/yast2-country-3.1.2/keyboard/src/scrconf/etc_vconsole_conf.scr 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-country-3.1.4/keyboard/src/scrconf/etc_vconsole_conf.scr 2014-02-28 17:20:50.000000000 +0100
@@ -0,0 +1,13 @@
+.etc.vconsole_conf
+
+`ag_ini(
+ `IniAgent( "/etc/vconsole.conf",
+ $[
+ "options" : [ "global_values", "flat" ],
+ "comments" : [ "^#.*", "^[ \t]*$", ],
+ "params" : [
+ $[ "match" : [ "^[ \t]*([^=]*[^ \t=])[ \t]*=[ \t]*(.*[^ \t]|)[ \t]*$" , "%s=%s"] ]
+ ]
+ ]
+ )
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.2/package/yast2-country.changes new/yast2-country-3.1.4/package/yast2-country.changes
--- old/yast2-country-3.1.2/package/yast2-country.changes 2014-02-11 10:40:47.000000000 +0100
+++ new/yast2-country-3.1.4/package/yast2-country.changes 2014-02-28 17:20:50.000000000 +0100
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Fri Feb 28 14:13:07 CET 2014 - jsuchome(a)suse.cz
+
+- only KEYMAP belongs to /etc/vconsole.conf (bnc#861819)
+- 3.1.4
+
+-------------------------------------------------------------------
+Fri Feb 28 12:13:31 CET 2014 - jsuchome(a)suse.cz
+
+- move keyboard sysconfig data to /etc/vconsole.conf (bnc#861819)
+- 3.1.3
+
+-------------------------------------------------------------------
Mon Feb 10 17:13:06 CET 2014 - jsuchome(a)suse.cz
- check for nil value of adjtime (bnc#862626)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.2/package/yast2-country.spec new/yast2-country-3.1.4/package/yast2-country.spec
--- old/yast2-country-3.1.2/package/yast2-country.spec 2014-02-11 10:40:47.000000000 +0100
+++ new/yast2-country-3.1.4/package/yast2-country.spec 2014-02-28 17:20:50.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-country
-Version: 3.1.2
+Version: 3.1.4
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org