From a0b11410a1ab62ebb53aef1d0cbce90db4d4228f32954818c2820b3dc7cd706e Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 15 May 2010 22:34:08 +0000 Subject: [PATCH 1/3] - xkeyboard-config-commit-dc87d0c.diff * Enhancement to hu keymap (bnc #599318, bfo #28091) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xkeyboard-config?expand=0&rev=52 --- xkeyboard-config-commit-dc87d0c.diff | 40 ++++++++++++++++++++++++++++ xkeyboard-config.changes | 6 +++++ xkeyboard-config.spec | 2 ++ 3 files changed, 48 insertions(+) create mode 100644 xkeyboard-config-commit-dc87d0c.diff diff --git a/xkeyboard-config-commit-dc87d0c.diff b/xkeyboard-config-commit-dc87d0c.diff new file mode 100644 index 0000000..d204e22 --- /dev/null +++ b/xkeyboard-config-commit-dc87d0c.diff @@ -0,0 +1,40 @@ +commit dc87d0c1b7b1f3d44554164bd71cf603c35596ce +Author: Sergey V. Udaltsov +Date: Thu May 13 20:58:26 2010 +0100 + + Enhancement to hu keymap + + https://bugs.freedesktop.org/show_bug.cgi?id=28091 + +diff --git a/symbols/hu b/symbols/hu +index e5abdf2..b12eac1 100644 +--- a/symbols/hu ++++ b/symbols/hu +@@ -4,6 +4,7 @@ + // + // $XKeyboardConfig$ + // (C) 2002-2004 Soós Péter ++// (C) 2010 Andras Timar + // + // Permission is granted to anyone to use, distribute and modify + // this file in any way, provided that the above copyright notice +@@ -18,6 +19,10 @@ + // - Fixed abovedot + // - Added adiaeresis + // - Added EuroSign and cent symbol ++// 2010-04-23 - Added doublelowquotemark ++// - Added rightdoublequotemark ++// - Added endash ++// 2010-05-13 - Added ellipsis + + + // Default layout +@@ -421,7 +426,7 @@ xkb_symbols "def_common" { + key { [ n, N, braceright ] }; + key { [ m, M, less ] }; + key { [ comma, question, semicolon ] }; +- key { [ period, colon, greater ] }; ++ key { [ period, colon, ellipsis ] }; + key { [ minus, underscore, asterisk ] }; + + }; diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes index 725a3ee..9e40df5 100644 --- a/xkeyboard-config.changes +++ b/xkeyboard-config.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun May 16 00:29:57 CEST 2010 - sndirsch@suse.de + +- xkeyboard-config-commit-dc87d0c.diff + * Enhancement to hu keymap (bnc #599318, bfo #28091) + ------------------------------------------------------------------- Thu May 6 06:58:38 CEST 2010 - sndirsch@suse.de diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index d21bee8..9ed787b 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -43,6 +43,7 @@ Patch109: disable-2xalt_2xctrl-toggle.diff Patch110: MDSW-change-keycode.diff Patch115: xkeyboard-config.inet.microsoftpro.patch Patch116: xkeyboard-config-commit-81d9313.diff +Patch117: xkeyboard-config-commit-dc87d0c.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -75,6 +76,7 @@ Authors: %patch110 %patch115 -p0 %patch116 -p1 +%patch117 -p1 %build %configure --with-xkb-rules-symlink=xfree86,xorg \ From ecd31a31710f23fa07370dd0a72c763b56b4a74a29d2a7743797befd040bf289 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Sun, 16 May 2010 18:15:47 +0000 Subject: [PATCH 2/3] Accepting request 40087 from X11:XOrg checked in (request 40087) OBS-URL: https://build.opensuse.org/request/show/40087 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xkeyboard-config?expand=0&rev=53 --- xkeyboard-config-commit-dc87d0c.diff | 40 ---------------------------- xkeyboard-config.changes | 6 ----- xkeyboard-config.spec | 2 -- 3 files changed, 48 deletions(-) delete mode 100644 xkeyboard-config-commit-dc87d0c.diff diff --git a/xkeyboard-config-commit-dc87d0c.diff b/xkeyboard-config-commit-dc87d0c.diff deleted file mode 100644 index d204e22..0000000 --- a/xkeyboard-config-commit-dc87d0c.diff +++ /dev/null @@ -1,40 +0,0 @@ -commit dc87d0c1b7b1f3d44554164bd71cf603c35596ce -Author: Sergey V. Udaltsov -Date: Thu May 13 20:58:26 2010 +0100 - - Enhancement to hu keymap - - https://bugs.freedesktop.org/show_bug.cgi?id=28091 - -diff --git a/symbols/hu b/symbols/hu -index e5abdf2..b12eac1 100644 ---- a/symbols/hu -+++ b/symbols/hu -@@ -4,6 +4,7 @@ - // - // $XKeyboardConfig$ - // (C) 2002-2004 Soós Péter -+// (C) 2010 Andras Timar - // - // Permission is granted to anyone to use, distribute and modify - // this file in any way, provided that the above copyright notice -@@ -18,6 +19,10 @@ - // - Fixed abovedot - // - Added adiaeresis - // - Added EuroSign and cent symbol -+// 2010-04-23 - Added doublelowquotemark -+// - Added rightdoublequotemark -+// - Added endash -+// 2010-05-13 - Added ellipsis - - - // Default layout -@@ -421,7 +426,7 @@ xkb_symbols "def_common" { - key { [ n, N, braceright ] }; - key { [ m, M, less ] }; - key { [ comma, question, semicolon ] }; -- key { [ period, colon, greater ] }; -+ key { [ period, colon, ellipsis ] }; - key { [ minus, underscore, asterisk ] }; - - }; diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes index 9e40df5..725a3ee 100644 --- a/xkeyboard-config.changes +++ b/xkeyboard-config.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Sun May 16 00:29:57 CEST 2010 - sndirsch@suse.de - -- xkeyboard-config-commit-dc87d0c.diff - * Enhancement to hu keymap (bnc #599318, bfo #28091) - ------------------------------------------------------------------- Thu May 6 06:58:38 CEST 2010 - sndirsch@suse.de diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index 9ed787b..d21bee8 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -43,7 +43,6 @@ Patch109: disable-2xalt_2xctrl-toggle.diff Patch110: MDSW-change-keycode.diff Patch115: xkeyboard-config.inet.microsoftpro.patch Patch116: xkeyboard-config-commit-81d9313.diff -Patch117: xkeyboard-config-commit-dc87d0c.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -76,7 +75,6 @@ Authors: %patch110 %patch115 -p0 %patch116 -p1 -%patch117 -p1 %build %configure --with-xkb-rules-symlink=xfree86,xorg \ From 2edba712e2ff8401d1535e0c2aceac9611f7e7598e1cdda7b4b610e58e0d4ff2 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sun, 16 May 2010 18:15:48 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/xkeyboard-config revision 34.0 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xkeyboard-config?expand=0&rev=776c19b8adf2fa9ff2e253fbcb6746ca --- xkeyboard-config-commit-dc87d0c.diff | 40 ++++++++++++++++++++++++++++ xkeyboard-config.changes | 6 +++++ xkeyboard-config.spec | 4 ++- 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 xkeyboard-config-commit-dc87d0c.diff diff --git a/xkeyboard-config-commit-dc87d0c.diff b/xkeyboard-config-commit-dc87d0c.diff new file mode 100644 index 0000000..d204e22 --- /dev/null +++ b/xkeyboard-config-commit-dc87d0c.diff @@ -0,0 +1,40 @@ +commit dc87d0c1b7b1f3d44554164bd71cf603c35596ce +Author: Sergey V. Udaltsov +Date: Thu May 13 20:58:26 2010 +0100 + + Enhancement to hu keymap + + https://bugs.freedesktop.org/show_bug.cgi?id=28091 + +diff --git a/symbols/hu b/symbols/hu +index e5abdf2..b12eac1 100644 +--- a/symbols/hu ++++ b/symbols/hu +@@ -4,6 +4,7 @@ + // + // $XKeyboardConfig$ + // (C) 2002-2004 Soós Péter ++// (C) 2010 Andras Timar + // + // Permission is granted to anyone to use, distribute and modify + // this file in any way, provided that the above copyright notice +@@ -18,6 +19,10 @@ + // - Fixed abovedot + // - Added adiaeresis + // - Added EuroSign and cent symbol ++// 2010-04-23 - Added doublelowquotemark ++// - Added rightdoublequotemark ++// - Added endash ++// 2010-05-13 - Added ellipsis + + + // Default layout +@@ -421,7 +426,7 @@ xkb_symbols "def_common" { + key { [ n, N, braceright ] }; + key { [ m, M, less ] }; + key { [ comma, question, semicolon ] }; +- key { [ period, colon, greater ] }; ++ key { [ period, colon, ellipsis ] }; + key { [ minus, underscore, asterisk ] }; + + }; diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes index 725a3ee..9e40df5 100644 --- a/xkeyboard-config.changes +++ b/xkeyboard-config.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun May 16 00:29:57 CEST 2010 - sndirsch@suse.de + +- xkeyboard-config-commit-dc87d0c.diff + * Enhancement to hu keymap (bnc #599318, bfo #28091) + ------------------------------------------------------------------- Thu May 6 06:58:38 CEST 2010 - sndirsch@suse.de diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index d21bee8..5c6074d 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -28,7 +28,7 @@ Provides: xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us PreReq: /bin/ln /bin/rm AutoReqProv: on Version: 1.7 -Release: 3 +Release: 4 Summary: The X Keyboard Extension Source: %name-%version.tar.bz2 Patch4: xkeyboard-config.mainline-cvs.mac-es.patch @@ -43,6 +43,7 @@ Patch109: disable-2xalt_2xctrl-toggle.diff Patch110: MDSW-change-keycode.diff Patch115: xkeyboard-config.inet.microsoftpro.patch Patch116: xkeyboard-config-commit-81d9313.diff +Patch117: xkeyboard-config-commit-dc87d0c.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -75,6 +76,7 @@ Authors: %patch110 %patch115 -p0 %patch116 -p1 +%patch117 -p1 %build %configure --with-xkb-rules-symlink=xfree86,xorg \