Hello community,
here is the log from the commit of package xkeyboard-config for
openSUSE:Factory checked in at 2020-07-28 17:22:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xkeyboard-config (Old)
and /work/SRC/openSUSE:Factory/.xkeyboard-config.new.3592 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xkeyboard-config"
Tue Jul 28 17:22:19 2020 rev:89 rq:822702 version:2.30
Changes:
--------
--- /work/SRC/openSUSE:Factory/xkeyboard-config/xkeyboard-config.changes
2020-06-05 20:04:04.384700072 +0200
+++
/work/SRC/openSUSE:Factory/.xkeyboard-config.new.3592/xkeyboard-config.changes
2020-07-28 17:22:26.297702967 +0200
@@ -1,0 +2,7 @@
+Fri Jul 24 19:08:33 UTC 2020 - Stefan Dirsch <[email protected]>
+
+- U_Fix-symbols-in-syntax-error-spurious-git-conflict-ma.patch
+ * Fix symbols/in syntax error: spurious git conflict marker
+ (boo#1174483)
+
+-------------------------------------------------------------------
New:
----
U_Fix-symbols-in-syntax-error-spurious-git-conflict-ma.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xkeyboard-config.spec ++++++
--- /var/tmp/diff_new_pack.6sRrkE/_old 2020-07-28 17:22:27.273704263 +0200
+++ /var/tmp/diff_new_pack.6sRrkE/_new 2020-07-28 17:22:27.273704263 +0200
@@ -27,6 +27,7 @@
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: n_disable-2xalt_2xctrl-toggle.diff
+Patch110: U_Fix-symbols-in-syntax-error-spurious-git-conflict-ma.patch
BuildRequires: fdupes
BuildRequires: intltool
BuildRequires: pkgconfig
@@ -54,6 +55,7 @@
#translation-update-upstream
%patch100 -p1
%patch109 -p1
+%patch110 -p1
%build
%configure \
++++++ U_Fix-symbols-in-syntax-error-spurious-git-conflict-ma.patch ++++++
>From c8d68304c826567f27f5a913dd38f6e045b81483 Mon Sep 17 00:00:00 2001
From: Pritam Baral <[email protected]>
Date: Thu, 11 Jun 2020 04:02:27 +0000
Subject: [PATCH] Fix symbols/in syntax error: spurious git conflict marker
Introduced in
https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/93ea944c2599584a4dd1add1725fafd19fef2535#904fcb1a2ae93630fa2905a7fd0ced3f8e50a6e8_2329_2329
---
symbols/in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/symbols/in b/symbols/in
index 3ca78a2..b3a5ca9 100644
--- a/symbols/in
+++ b/symbols/in
@@ -2326,7 +2326,7 @@ xkb_symbols "marathi" {
key <AB09> { [ period, U0964, U0965, U093d ] };
key <AB10> { [ U092f, question, slash, question ] };
};
-=======
+
// EXTRAS:
// Modi is an ancient Indian script that is used to write texts in
Marathi, Hindi and Sanskrit.
--
2.16.4
