Accepting request 555068 from Base:System

- Drop from some fill-up templates, a couple of sysconfig variables no
  more read by systemd (fate#319454)
  So the relevant settings can be defined in only one place.
Fix version typo:
- Version update to 2.0.4:

OBS-URL: https://build.opensuse.org/request/show/555068
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kbd?expand=0&rev=86

kbd.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Dec  6 13:30:49 UTC 2017 - fbui@suse.com
+
+- Drop from some fill-up templates, a couple of sysconfig variables no
+  more read by systemd (fate#319454)
+
+  So the relevant settings can be defined in only one place.
+
 -------------------------------------------------------------------
 Thu Nov 23 13:40:21 UTC 2017 - rbrown@suse.com
 
@@ -13,7 +21,7 @@ Fri Oct 13 14:53:41 CEST 2017 - sbrabec@suse.com
 -------------------------------------------------------------------
 Fri Sep 22 15:51:51 CEST 2017 - sbrabec@suse.com
 
-- Version update to 2.0.6:
+- Version update to 2.0.4:
   * translation updates
   * support for U+202F
   * minor fixes and code cleanup

sysconfig.console

@@ -1,43 +1,5 @@
 ## Path:        Hardware/Console
 ## Description: Text console settings (see also Hardware/Keyboard)
-## Type:	string
-## Default:	""
-## ServiceRestart: kbd
-#
-# Console settings.
-# Note: The KBD_TTY setting from Hardware/Keyboard (sysconfig/keyboard)
-# also applies for the settings here.
-#
-# Load this console font on bootup:
-# (/usr/share/kbd/consolefonts/)
-# 
-CONSOLE_FONT=""
-
-## Type:	string
-## Default:	""
-#
-# Some fonts come without a unicode map.
-# (.psfu fonts supposedly have it, others often not.)
-# You can then specify the unicode mapping of your font 
-# explicitly. (/usr/share/kbd/unimaps/)
-# Normally not needed.
-#
-CONSOLE_UNICODEMAP=""
-
-## Type:	string
-## Default:	""
-#
-# Most programs output 8 bit characters, so you need a table to
-# translate those characters into unicode. That one can be specified
-# here. (/usr/share/kbd/consoletrans/)
-# (Note: If your console is in utf-8 mode you don't need this.)
-# If your code does not use a unicode mapping at all (because you
-# e.g. explicitly specified UNICODEMAP="none") you may circumvent
-# the translation via unicode, but load a map which directly maps
-# 8 bit output of your program to a font position.
-#
-CONSOLE_SCREENMAP=""
-
 ## Type:	string
 ## Default:	""
 #

sysconfig.keyboard

@@ -1,17 +1,5 @@
 ## Path:        Hardware/Keyboard
 ## Description: Keyboard settings
-## Type:        string
-## Default:     ""
-## ServiceRestart: kbd
-#
-# Keyboard settings for the text console
-#
-# Keyboard mapping
-# (/usr/share/kbd/keymaps/)
-# e.g. KEYTABLE="de-latin1-nodeadkeys", "us" or empty for US settings
-#
-KEYTABLE=""
-
 ## Type:        integer
 ## Default:
 #