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

xkeyboard-config.br.abnt2_inet.patch

@@ -1,42 +0,0 @@
---- symbols/br.orig	2009-04-25 04:56:17.000000000 +0200
-+++ symbols/br	2009-04-25 04:56:19.000000000 +0200
-@@ -320,3 +320,8 @@
-     key <AB06> { [  gcircumflex,     Gcircumflex,                    q,                Q ] };
- 
- };
-+
-+partial alphanumeric_keys
-+xkb_symbols "abnt2_inet" {
-+    include "br(abnt2)"
-+};
-diff -u -r rules.orig//base.m_g.part rules/base.m_g.part
---- rules.orig//base.m_g.part	2009-04-25 03:19:33.000000000 +0200
-+++ rules/base.m_g.part	2009-04-25 03:21:21.000000000 +0200
-@@ -8,6 +8,7 @@
-   omnikey101	=	northgate(omnikey101)
-  $pcmodels	=	pc(%m)
-  $pcgeometries	=	pc(%m)
-+  abnt2_inet	=	pc(abnt2)
-   everex	=	everex(STEPnote)
-   thinkpad	=	thinkpad(intl)
-   thinkpad60	=	thinkpad(60)
-diff -u -r rules.orig//base.m_k.part rules/base.m_k.part
---- rules.orig//base.m_k.part	2009-04-25 03:19:33.000000000 +0200
-+++ rules/base.m_k.part	2009-04-25 03:20:23.000000000 +0200
-@@ -5,6 +5,7 @@
-   sun6		=	sun(type6_usb)
-   pc98		=	xfree98(pc98)
-   abnt2		=	xfree86(abnt2)
-+  abnt2_inet	=	xfree86(abnt2)
-   jp106		=	xfree86(jp106)
-   evdev		=	evdev
-   microsoftnek4k =	evdev+nek4k(nek4k)
---- rules/base.m_s.part.orig	2009-04-25 13:21:27.000000000 +0200
-+++ rules/base.m_s.part	2009-04-25 13:23:47.000000000 +0200
-@@ -43,5 +43,6 @@
-   thinkpadz60   =       +inet(thinkpad60)
-   vsonku306     =       +inet(microsoftprooem)
-   $inetkbds     =       +inet(%m)
-+  abnt2_inet    =       +inet(microsoftpro)
-   $maclaptop    =       +inet(apple)+level3(enter_switch)
-   $macs	        =       +inet(apple)

xkeyboard-config.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Apr 27 22:41:57 CEST 2009 - sndirsch@suse.de
+
+- removed tp-menu.diff 
+
+-------------------------------------------------------------------
+Mon Apr 27 17:45:03 CEST 2009 - sndirsch@suse.de
+
+- xkeyboard-config.inet.microsoftpro.patch (bnc #497647)
+  * adds microsoftpro internet keyboard keys to any keyboard when
+    adding the line: Option "XkbOptions" "inet:microsoftpro" to the
+    keybaord input device section of xorg.conf.
+  * obsoletes xkeyboard-config.jp.jp106_inet.patch, 
+    xkeyboard-config.br.abnt2_inet.patch
+
 -------------------------------------------------------------------
 Sat Apr 25 16:37:27 CEST 2009 - sndirsch@suse.de
 

xkeyboard-config.inet.microsoftpro.patch

@@ -0,0 +1,10 @@
+--- rules/base.o_s.part.orig	2009-04-27 17:42:13.000000000 +0200
++++ rules/base.o_s.part	2009-04-27 17:43:16.000000000 +0200
+@@ -99,4 +99,7 @@
+   shift:breaks_caps     =	+shift(breaks_caps)
+   esperanto:qwerty      =	+epo(qwerty)
+   esperanto:dvorak      =	+epo(dvorak)
++  inet:microsoftpro     =	+inet(microsoftpro)
++  inet:media_common 	=	+inet(nav_common)
++  inet:nav_common	=	+inet(nav_common)
+ 

xkeyboard-config.jp.jp106_inet.patch

@@ -1,43 +0,0 @@
-diff -u -r ../xkeyboard-config-1.3.orig//rules/base.m_g.part ./rules/base.m_g.part
---- ../xkeyboard-config-1.3.orig//rules/base.m_g.part	2009-04-25 16:26:53.000000000 +0200
-+++ ./rules/base.m_g.part	2009-04-25 16:30:58.000000000 +0200
-@@ -9,6 +9,7 @@
-  $pcmodels	=	pc(%m)
-  $pcgeometries	=	pc(%m)
-   abnt2_inet	=	pc(abnt2)
-+  jp106_inet	=	pc(jp106)
-   everex	=	everex(STEPnote)
-   thinkpad	=	thinkpad(intl)
-   thinkpad60	=	thinkpad(60)
-diff -u -r ../xkeyboard-config-1.3.orig//rules/base.m_k.part ./rules/base.m_k.part
---- ../xkeyboard-config-1.3.orig//rules/base.m_k.part	2009-04-25 16:26:53.000000000 +0200
-+++ ./rules/base.m_k.part	2009-04-25 16:33:07.000000000 +0200
-@@ -7,6 +7,7 @@
-   abnt2		=	xfree86(abnt2)
-   abnt2_inet	=	xfree86(abnt2)
-   jp106		=	xfree86(jp106)
-+  jp106_inet	=	xfree86(jp106)
-   evdev		=	evdev
-   microsoftnek4k =	evdev+nek4k(nek4k)
-   olpc		=	evdev
-diff -u -r ../xkeyboard-config-1.3.orig//symbols/jp ./symbols/jp
---- ../xkeyboard-config-1.3.orig//symbols/jp	2009-04-25 16:26:53.000000000 +0200
-+++ ./symbols/jp	2009-04-25 16:32:08.000000000 +0200
-@@ -211,3 +211,8 @@
-     key <AC12> { [ Escape               ] };
-     key <AB11> { [ at, grave            ] };
- };
-+
-+partial alphanumeric_keys
-+xkb_symbols "jp106_inet" {
-+    include "jp(106)"
-+};
---- rules/base.m_s.part.orig	2009-04-25 16:38:35.000000000 +0200
-+++ rules/base.m_s.part	2009-04-25 16:39:36.000000000 +0200
-@@ -44,5 +44,6 @@
-   vsonku306     =       +inet(microsoftprooem)
-   $inetkbds     =       +inet(%m)
-   abnt2_inet    =       +inet(microsoftpro)
-+  jp106_inet    =       +inet(microsoftpro)
-   $maclaptop    =       +inet(apple)+level3(enter_switch)
-   $macs	        =       +inet(apple)

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.5
-Release:        3
+Release:        4
 Summary:        The X Keyboard Extension
 Source:         %name-%version.tar.bz2
 Patch4:         xkeyboard-config.mainline-cvs.mac-es.patch
@@ -44,8 +44,7 @@ Patch110:       MDSW-change-keycode.diff
 Patch112:       ucw_suse.diff
 Patch113:       xkeyboard-config.sr@latin.diff
 Patch114:       cs.po.diff
-Patch115:       xkeyboard-config.br.abnt2_inet.patch
+Patch115:       xkeyboard-config.inet.microsoftpro.patch
-Patch116:       xkeyboard-config.jp.jp106_inet.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -80,7 +79,6 @@ Authors:
 %patch113 -p0
 %patch114 -p0
 %patch115 -p0
-%patch116 -p0
 mv po/sr@{Latn,latin}.po
 
 %build
@@ -111,6 +109,15 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/X11/xkb/
 
 %changelog
+* Mon Apr 27 2009 sndirsch@suse.de
+- removed tp-menu.diff
+* Mon Apr 27 2009 sndirsch@suse.de
+- xkeyboard-config.inet.microsoftpro.patch (bnc #497647)
+  * adds microsoftpro internet keyboard keys to any keyboard when
+  adding the line: Option "XkbOptions" "inet:microsoftpro" to the
+  keybaord input device section of xorg.conf.
+  * obsoletes xkeyboard-config.jp.jp106_inet.patch,
+  xkeyboard-config.br.abnt2_inet.patch
 * Sat Apr 25 2009 sndirsch@suse.de
 - xkeyboard-config.jp.jp106_inet.patch
   * new jp106_inet xkbmodel required for jp layout (bnc #497647)