NEWS

+2.26	Bugzilla moved to gitlab as well
+	19 commits
+	Translations updated
+2.25	Moving to gitlab
+	16 commits
+	Translations updated
+2.24	21 commits
+	Translations updated
 2.23.1  Fixed build
 2.23	10 commits
 	Translations updated

configure.ac

-AC_INIT(xkeyboard-config, 2.23.1)
+AC_INIT(xkeyboard-config, 2.26)
 AC_CONFIG_SRCDIR(rules/base.xml.in)
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 

debian/changelog

+xkeyboard-config (2.26-1) unstable; urgency=medium
+
+  * New upstream release.
+    - Map evdev keycodes KEY_RFKILL and KEY_WWAN to XF86RFKill and
+      XF86WWAN (Closes: #917157).
+    - allowMultipleSelection is wrong in korean data (Closes: #902234).
+  * Drop fix-typo.diff, upstreamed.
+  * Cherry-pick af6c0f29 (Fixed broken pt layout) from upstream.
+  * Let uscan check upstream tarball signatures.
+  * Update Vcs-* URLs to point to salsa.debian.org.
+  * Bump debhelper compat to 10.
+  * Raise Priority to optional.
+  * Set source format to 1.0.
+  * Bump standards version to 4.3.0.
+
+ -- Andreas Boll <aboll@debian.org>  Fri, 08 Feb 2019 22:27:41 +0100
+
 xkeyboard-config (2.23.1-1) unstable; urgency=medium
 
   * New upstream release. (Closes: #884822)

debian/compat

-9
+10

debian/control

 Source: xkeyboard-config
 Section: x11
-Priority: extra
+Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Build-Depends:
- debhelper (>= 9),
- dh-autoreconf,
+ debhelper (>= 10),
  quilt,
 Build-Depends-Indep:
  libxml-parser-perl,
@@ -13,9 +12,9 @@ Build-Depends-Indep:
  intltool,
  xsltproc,
  xutils-dev (>= 1:7.6+2),
-Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/data/xkb-data.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/data/xkb-data.git
+Standards-Version: 4.3.0
+Vcs-Git: https://salsa.debian.org/xorg-team/data/xkb-data.git
+Vcs-Browser: https://salsa.debian.org/xorg-team/data/xkb-data
 Homepage: https://www.freedesktop.org/Software/XKeyboardConfig
 
 Package: xkb-data

debian/patches/fix-typo.diff

-From 0a340cbe164fe8072ed768319230a284e32d2a3f Mon Sep 17 00:00:00 2001
-From: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
-Date: Thu, 1 Feb 2018 15:37:46 +0100
-Subject: [PATCH] Fix typo in Polish symbols file
-
-https://bugs.freedesktop.org/show_bug.cgi?id=104904
----
- symbols/pl | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/symbols/pl b/symbols/pl
-index 52e7959..800cb85 100644
---- a/symbols/pl
-+++ b/symbols/pl
-@@ -497,7 +497,6 @@ partial alphanumeric_keys
-        include "sun_vndr/pl(sun_type6)"
- };
- 
--------------------------------
- //Glagolica
- partial alphanumeric_keys
- xkb_symbols "glagolica"
--- 
-2.15.1
-

debian/patches/series

 docs.diff
 revert-goodmap-badmap-for-apple.diff
-fix-typo.diff

debian/rules

@@ -35,4 +35,4 @@ override_dh_quilt_unpatch:
 	touch rules/base.o_k.part
 
 %:
-	dh $@ --with quilt,autoreconf --builddirectory=build/
+	dh $@ --with quilt --builddirectory=build/

debian/source/format

+1.0

debian/upstream/signing-key.asc

+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBEg0emwBCAC20CffvhbZ3Msx6WUNtWdhc+Qs8slsSUijQwwGuI34ieNsY2TS
+CN21xf7zyyBq+rMgvL5dXqq0Prspd8Bk4OwcuvN1WHpBRvW5AY7yDMhOtupvBIoC
+yhNcy1uZGqAztHoQzXPE/0Zm+RmkRUKvmcfRsxaZSAkC0y68OaJmBaHHfw5ErywF
+tKsWjMmap2NOVS5M1nf2gy61Gcq9jeK350OTmbbFtrAhVitvMv/9x6kqhkZ9Tzd3
+FSCJVnJBcqfosKYuqTsaEsoijIJPgThe+7tz6isa56Fu2zGrLotekWzx4AUZj1CH
+r0J3Wl6xAftsVsJie04jftLwruMNTbuFqMVpABEBAAG0K1NlcmdleSBVZGFsdHNv
+diA8c2VyZ2V5LnVkYWx0c292QGdtYWlsLmNvbT6JATYEEwECACAFAkg0emwCGwMG
+CwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAGYdmPyTOhRQacB/9NVmYJ75krL1HV
+n/A64hWCOSdnd3dKL4sv4FY9ukWI3B3e1WWAGAmQsrc8W+VCDq6WgYT6hRShncpz
+LtRIDMDl7tgr+6yTXh8llkaYaIqehBOmtcmuaHHwn881uEEJLbOUouGwuXGLJACK
+9yU7wSJME2xHtSYAiU8cbh5Iwac3aXYQ1wvVm8RyZS8MAJYI9fYdZXXegKfOPx8n
+a5lMEFxKZjS2VPZt10KTaLwjpremAGiu2vLCGZPdhedXpZXyORq3gAkGGpkIHsKW
+wiCTGHnk2aqmDV0j+1kw8YV3rkta335SHCl44mDGSm/kI+mnqXbNmRlgRBPYQ3zW
+e9PvsR7F
+=IXKf
+-----END PGP PUBLIC KEY BLOCK-----

debian/watch

 #git=git://anongit.freedesktop.org/xkeyboard-config
 version=3
+opts=pgpsigurlmangle=s/$/.sig/ \
 https://xorg.freedesktop.org/releases/individual/data/xkeyboard-config/xkeyboard-config-(.*)\.tar\.gz

keycodes/evdev

@@ -281,6 +281,11 @@ default xkb_keycodes "evdev" {
 	<I251> = 251;	// #define KEY_BRIGHTNESS_CYCLE    243
 	<I252> = 252;	// #define KEY_BRIGHTNESS_ZERO     244
 	<I253> = 253;	// #define KEY_DISPLAY_OFF         245
+	<I254> = 254;	// #define KEY_WWAN                246
+	<I255> = 255;	// #define KEY_RFKILL              247
+
+	<I372> = 372;   // #define KEY_FAVORITES           364
+	<I374> = 374;   // #define KEY_KEYBOARD            366
 
 	// Fake keycodes for virtual keys
 	<LVL3> =   92;