Accepting request 340214 from X11:XOrg

1

OBS-URL: https://build.opensuse.org/request/show/340214
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xkeyboard-config?expand=0&rev=75

n_suse-ctrl-alt-bksp-terminate.patch

@@ -1,22 +1,21 @@
 -- Add Multi_key to Control_R to get compose.Index: xkeyboard-config-2.1/rules/evdev.m_s.part
 
-diff --git a/rules/evdev.m_s.part b/rules/evdev.m_s.part
+diff -u -r xkeyboard-config-2.16.orig/rules/evdev.m_s.part xkeyboard-config-2.16/rules/evdev.m_s.part
-index 5a6416b..23ce109 100644
+--- xkeyboard-config-2.16.orig/rules/evdev.m_s.part	2015-10-20 16:46:14.666938000 +0200
---- a/rules/evdev.m_s.part
++++ xkeyboard-config-2.16/rules/evdev.m_s.part	2015-10-20 16:47:50.094095000 +0200
-+++ b/rules/evdev.m_s.part
+@@ -1,4 +1,4 @@
-@@ -1,3 +1,3 @@
 -  $evdevkbds    =   +inet(evdev)+inet(%m)
+-  chromebook    =   +inet(evdev)+inet(chromebook)
 -  applealu_jis  =   +inet(evdev)+macintosh_vndr/jp(alujiskeys)
 -  *             =   +inet(evdev)
 +  $evdevkbds    =   +inet(evdev)+inet(%m)+terminate(ctrl_alt_bksp)
++  chromebook    =   +inet(evdev)+inet(chromebook)+terminate(ctrl_alt_bksp)
 +  applealu_jis  =   +inet(evdev)+macintosh_vndr/jp(alujiskeys)+terminate(ctrl_alt_bksp)
 +  *             =   +inet(evdev)+terminate(ctrl_alt_bksp)
-
+diff -u -r xkeyboard-config-2.16.orig/symbols/pc xkeyboard-config-2.16/symbols/pc
-diff --git a/symbols/pc b/symbols/pc
+--- xkeyboard-config-2.16.orig/symbols/pc	2015-10-20 16:46:13.091936000 +0200
-index 996324d..fbbee47 100644
++++ xkeyboard-config-2.16/symbols/pc	2015-10-20 16:46:28.915956000 +0200
---- a/symbols/pc
+@@ -27,8 +27,8 @@
-+++ b/symbols/pc
-@@ -27,8 +27,8 @@ xkb_symbols "pc105" {
      key <LWIN> {	[ Super_L		]	};
  
      key <RTSH> {	[ Shift_R		]	};
@@ -27,4 +26,3 @@ index 996324d..fbbee47 100644
      key <MENU> {	[ Menu			]	};
  
      // Beginning of modifier mappings.
- 

xkeyboard-config-2.15.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0e443cf7ca2f0b40846472c029647a05933fc705d611e1478c4db8a48a6f38bf
-size 958523

xkeyboard-config-2.16.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1e8a1f212c96b7f71ca0b05da361cac1816d27baae1d8e03e7b53049b58d1d58
+size 968663

xkeyboard-config.changes

@@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Tue Oct 20 14:59:44 UTC 2015 - tobias.johannes.klausmann@mni.thm.de
+
+- Rename n_suse.patch -> n_suse-ctrl-alt-bksp-terminate.patch to
+  reflect patch usage
+- Rename disable-2xalt_2xctrl-toggle.diff -> 
+  n_disable-2xalt_2xctrl-toggle.diff to follow X11:XOrg patch 
+  guidelines
+
+-------------------------------------------------------------------
+Tue Oct 20 14:40:37 UTC 2015 - sndirsch@suse.com
+
+- Update to version 2.16
+  * Move apostrophe U+0027 to the first level and add U+02BC one to
+    ua(unicode)
+  * Add support for chromebooks layout
+  * Add missing semicolons in symbols/inet
+  * Undo incompatible us(dvp) layout additions
+  * Define a keyboard layout for the Ol Chiki script
+  * new layout - Russian Phonetic Czech
+  * Correct capitalization and naming of us(dvp) "Programmer Dvorak"
+  * added swap_lalt_lwin
+  * fixed Icelandic Dvorak
+  * Broken xml fixed
+  * Fixed mac file, use utf-8
+  * Added Teck keyboard
+  * added missing Teck file
+  * prerelease translation sync
+  * Added Finnish DAS layout
+- refreshed n_suse.patch
+
 -------------------------------------------------------------------
 Wed May 27 12:10:59 UTC 2015 - sndirsch@suse.com
 

xkeyboard-config.spec

@@ -28,15 +28,15 @@ Url:            http://www.freedesktop.org/Software/XKeyboardConfig
 Provides:       XFree86:/etc/X11/xkb/symbols/us
 Provides:       xorg-x11:/etc/X11/xkb/symbols/us
 PreReq:         /bin/ln /bin/rm
-Version:        2.15
+Version:        2.16
 Release:        0
 Summary:        The X Keyboard Extension
 License:        GPL-2.0+ and LGPL-2.1+ and MIT and CDDL-1.0
 Group:          System/X11/Utilities
 Source:         http://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/xkeyboard-config-%{version}.tar.bz2
-Patch100:       n_suse.patch
+Patch100:       n_suse-ctrl-alt-bksp-terminate.patch
 # PATCH-FIX-OPENSUSE disable-2xalt_2xctrl-toggle.diff fdo#4927 -- This is just a workaround until fdo#4927 is fixed
-Patch109:       disable-2xalt_2xctrl-toggle.diff
+Patch109:       n_disable-2xalt_2xctrl-toggle.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 Recommends:     %{name}-lang