Change-Id: Iac2fe44e5c6d9cee7f0edecf8b9bf5f4befc5a97
Reviewed-on: http://photon-jenkins.eng.vmware.com/350
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: suezzelur <anishs@vmware.com>
1 | 1 |
deleted file mode 100644 |
... | ... |
@@ -1,250 +0,0 @@ |
1 |
-Submitted By: Matt Burgess |
|
2 |
-Date: 2008-12-06 |
|
3 |
-Initial Package Version: 1.15 |
|
4 |
-Upstream Status: Not submitted, possibly incomplete |
|
5 |
-Description: Makes Backspace and Delete keys consistent in all i386 keymaps. |
|
6 |
-Makes the Backspace key send character code 127, and Delete send a well known |
|
7 |
-escape sequence. Obsoletes the /etc/kbd/bs-sends-del file for i386. |
|
8 |
- |
|
9 |
-Original patch for 1.12 by Alexander Patrakov. |
|
10 |
-Updated for 1.13 (drop ru.map, the change is upstream, and add ru_win.map, |
|
11 |
-ru-cp1251.map) by Ken Moffat <ken at linuxfromscratch dot org>. |
|
12 |
-Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>. |
|
13 |
- |
|
14 |
-diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map |
|
15 |
-+++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map 2008-12-03 22:27:55.000000000 +0000 |
|
16 |
-@@ -43,7 +43,7 @@ |
|
17 |
- keycode 11 = three numbersign |
|
18 |
- keycode 12 = two at |
|
19 |
- keycode 13 = one exclam |
|
20 |
-- keycode 14 = BackSpace Delete |
|
21 |
-+ keycode 14 = Delete Delete |
|
22 |
- ! -------------------------------------------------------------------------- |
|
23 |
- ! Row 3 |
|
24 |
- ! -------------------------------------------------------------------------- |
|
25 |
-diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map |
|
26 |
-+++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map 2008-12-03 22:28:13.000000000 +0000 |
|
27 |
-@@ -43,7 +43,7 @@ |
|
28 |
- keycode 11 = slash question |
|
29 |
- keycode 12 = bracketleft braceleft |
|
30 |
- keycode 13 = bracketright braceright |
|
31 |
-- keycode 14 = BackSpace Delete |
|
32 |
-+ keycode 14 = Delete Delete |
|
33 |
- ! -------------------------------------------------------------------------- |
|
34 |
- ! Row 3 |
|
35 |
- ! -------------------------------------------------------------------------- |
|
36 |
-diff -Naur kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map |
|
37 |
-+++ kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map 2008-12-03 22:40:32.000000000 +0000 |
|
38 |
-@@ -51,7 +51,7 @@ |
|
39 |
- alt keycode 12 = Meta_minus |
|
40 |
- keycode 13 = minus underscore |
|
41 |
- alt keycode 13 = Meta_equal |
|
42 |
--keycode 14 = BackSpace Delete |
|
43 |
-+keycode 14 = Delete Delete |
|
44 |
- alt keycode 14 = Meta_Delete |
|
45 |
- keycode 15 = Tab Meta_Tab |
|
46 |
- alt keycode 15 = Meta_Tab |
|
47 |
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map |
|
48 |
-+++ kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map 2008-12-03 22:42:14.000000000 +0000 |
|
49 |
-@@ -205,7 +205,7 @@ |
|
50 |
- # edit this if you want the key above <Enter> to delete symbols above |
|
51 |
- # cursor, not before. |
|
52 |
- keycode 14 = \ |
|
53 |
-- BackSpace BackSpace BackSpace BackSpace \ |
|
54 |
-+ Delete Delete Delete Delete \ |
|
55 |
- Delete Delete Delete Delete \ |
|
56 |
- Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \ |
|
57 |
- Meta_Delete Meta_Delete Meta_Delete Meta_Delete |
|
58 |
-@@ -506,7 +506,7 @@ |
|
59 |
- |
|
60 |
- # Edit this if you want strict VT100 emulation. |
|
61 |
- string F111 = "\033[3$" |
|
62 |
--keycode 111 = Delete F111 Delete F111 \ |
|
63 |
-+keycode 111 = Remove F111 Remove F111 \ |
|
64 |
- Remove Remove Remove Remove \ |
|
65 |
- Meta_Delete Meta_Delete Meta_Delete Meta_Delete \ |
|
66 |
- Boot Boot Boot Boot |
|
67 |
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map kbd-1.15/data/keymaps/i386/qwerty/lt.map |
|
68 |
-+++ kbd-1.15/data/keymaps/i386/qwerty/lt.map 2008-12-03 22:42:58.000000000 +0000 |
|
69 |
-@@ -204,7 +204,7 @@ |
|
70 |
- # edit this if you want the key above <Enter> to delete symbols above |
|
71 |
- # cursor, not before. |
|
72 |
- keycode 14 = \ |
|
73 |
-- BackSpace BackSpace BackSpace BackSpace \ |
|
74 |
-+ Delete Delete Delete Delete \ |
|
75 |
- Delete Delete Delete Delete \ |
|
76 |
- Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \ |
|
77 |
- Meta_Delete Meta_Delete Meta_Delete Meta_Delete |
|
78 |
-@@ -505,7 +505,7 @@ |
|
79 |
- |
|
80 |
- # Edit this if you want strict VT100 emulation. |
|
81 |
- string F111 = "\033[3$" |
|
82 |
--keycode 111 = Delete F111 Delete F111 \ |
|
83 |
-+keycode 111 = Remove F111 Remove F111 \ |
|
84 |
- Remove Remove Remove Remove \ |
|
85 |
- Meta_Delete Meta_Delete Meta_Delete Meta_Delete \ |
|
86 |
- Boot Boot Boot Boot |
|
87 |
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map |
|
88 |
-+++ kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map 2008-12-03 22:44:25.000000000 +0000 |
|
89 |
-@@ -3,7 +3,7 @@ |
|
90 |
- # Send comments to Kjetil T. Homme <kjetilho@ifi.uio.no> |
|
91 |
- include "linux-with-alt-and-altgr" |
|
92 |
- plain keycode 83 = KP_Comma |
|
93 |
-- plain keycode 111 = Delete # "Remove" originally, weird... |
|
94 |
-+ plain keycode 111 = Remove |
|
95 |
- strings as usual |
|
96 |
- |
|
97 |
- keycode 1 = Escape |
|
98 |
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map kbd-1.15/data/keymaps/i386/qwerty/ru1.map |
|
99 |
-+++ kbd-1.15/data/keymaps/i386/qwerty/ru1.map 2008-12-03 22:45:32.000000000 +0000 |
|
100 |
-@@ -143,8 +143,8 @@ |
|
101 |
- |
|
102 |
- # The keycode "0xFF" is too dangerous for many programs (including emacs). |
|
103 |
- # So let it be bracket instead of Hard Sign. |
|
104 |
--# altgr keycode 27 = +0xDF |
|
105 |
--# altgr shift keycode 27 = +0xFF |
|
106 |
-+altgr keycode 27 = +0xDF |
|
107 |
-+altgr shift keycode 27 = +0xFF |
|
108 |
- control keycode 27 = Control_bracketright |
|
109 |
- altgr control keycode 27 = Control_bracketright |
|
110 |
- alt keycode 27 = Meta_bracketright |
|
111 |
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map kbd-1.15/data/keymaps/i386/qwerty/ru2.map |
|
112 |
-+++ kbd-1.15/data/keymaps/i386/qwerty/ru2.map 2008-12-03 22:46:15.000000000 +0000 |
|
113 |
-@@ -46,7 +46,7 @@ |
|
114 |
- alt keycode 12 = Meta_minus |
|
115 |
- keycode 13 = equal plus equal plus |
|
116 |
- alt keycode 13 = Meta_equal |
|
117 |
-- keycode 14 = BackSpace BackSpace BackSpace BackSpace |
|
118 |
-+ keycode 14 = Delete Delete Delete Delete |
|
119 |
- alt keycode 14 = Meta_Delete |
|
120 |
- keycode 15 = Tab Tab Tab Tab |
|
121 |
- alt keycode 15 = Meta_Tab |
|
122 |
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map |
|
123 |
-+++ kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map 2008-12-03 22:47:12.000000000 +0000 |
|
124 |
-@@ -39,7 +39,7 @@ |
|
125 |
- alt keycode 12 = Meta_minus |
|
126 |
- keycode 13 = equal plus equal plus |
|
127 |
- alt keycode 13 = Meta_equal |
|
128 |
-- keycode 14 = BackSpace |
|
129 |
-+ keycode 14 = Delete |
|
130 |
- alt keycode 14 = Meta_Delete |
|
131 |
- keycode 15 = Tab |
|
132 |
- alt keycode 15 = Meta_Tab |
|
133 |
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map |
|
134 |
-+++ kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map 2008-12-03 22:48:10.000000000 +0000 |
|
135 |
-@@ -89,8 +89,8 @@ |
|
136 |
- altgr alt keycode 13 = Meta_equal |
|
137 |
- shift alt keycode 13 = Meta_plus |
|
138 |
- altgr shift alt keycode 13 = Meta_plus |
|
139 |
-- keycode 14 = BackSpace BackSpace BackSpace BackSpace |
|
140 |
--# keycode 14 = Delete Delete Delete Delete |
|
141 |
-+# keycode 14 = BackSpace BackSpace BackSpace BackSpace |
|
142 |
-+ keycode 14 = Delete Delete Delete Delete |
|
143 |
- alt keycode 14 = Meta_Delete |
|
144 |
- altgr alt keycode 14 = Meta_Delete |
|
145 |
- keycode 15 = Tab Tab Tab Tab |
|
146 |
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map kbd-1.15/data/keymaps/i386/qwerty/ru_win.map |
|
147 |
-+++ kbd-1.15/data/keymaps/i386/qwerty/ru_win.map 2008-12-03 22:49:17.000000000 +0000 |
|
148 |
-@@ -42,7 +42,7 @@ |
|
149 |
- alt keycode 12 = Meta_minus |
|
150 |
- keycode 13 = equal plus equal plus |
|
151 |
- alt keycode 13 = Meta_equal |
|
152 |
-- keycode 14 = BackSpace BackSpace BackSpace BackSpace |
|
153 |
-+ keycode 14 = Delete Delete Delete Delete |
|
154 |
- alt keycode 14 = Meta_Delete |
|
155 |
- keycode 15 = Tab Tab Tab Tab |
|
156 |
- alt keycode 15 = Meta_Tab |
|
157 |
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map |
|
158 |
-+++ kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map 2008-12-03 22:50:18.000000000 +0000 |
|
159 |
-@@ -345,7 +345,7 @@ |
|
160 |
- keycode 109 = Next Scroll_Forward |
|
161 |
- keycode 110 = Insert |
|
162 |
- |
|
163 |
-- keycode 111 = Delete # "Remove" originally, weird... |
|
164 |
-+ keycode 111 = Remove |
|
165 |
- control alt keycode 111 = Boot |
|
166 |
- control altgr keycode 111 = Boot |
|
167 |
- |
|
168 |
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map |
|
169 |
-+++ kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map 2008-12-03 22:50:44.000000000 +0000 |
|
170 |
-@@ -374,6 +374,6 @@ |
|
171 |
- keycode 109 = Next Scroll_Forward |
|
172 |
- keycode 110 = Insert |
|
173 |
- |
|
174 |
-- keycode 111 = Delete # "Remove" originally, weird... |
|
175 |
-+ keycode 111 = Remove |
|
176 |
- control alt keycode 111 = Boot |
|
177 |
- control altgr keycode 111 = Boot |
|
178 |
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map |
|
179 |
-+++ kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map 2008-12-03 22:52:09.000000000 +0000 |
|
180 |
-@@ -49,7 +49,7 @@ |
|
181 |
- alt keycode 12 = Meta_minus |
|
182 |
- keycode 13 = minus underscore |
|
183 |
- alt keycode 13 = Meta_equal |
|
184 |
--keycode 14 = BackSpace Delete |
|
185 |
-+keycode 14 = Delete Delete |
|
186 |
- alt keycode 14 = Meta_Delete |
|
187 |
- keycode 15 = Tab Meta_Tab |
|
188 |
- alt keycode 15 = Meta_Tab |
|
189 |
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map kbd-1.15/data/keymaps/i386/qwerty/ua.map |
|
190 |
-+++ kbd-1.15/data/keymaps/i386/qwerty/ua.map 2008-12-03 22:52:52.000000000 +0000 |
|
191 |
-@@ -249,7 +249,7 @@ |
|
192 |
- shift ctrll ctrlr keycode 13 = plus |
|
193 |
- alt ctrll ctrlr keycode 13 = Meta_equal |
|
194 |
- shift alt ctrll ctrlr keycode 13 = Meta_plus |
|
195 |
--keycode 14 = BackSpace Delete |
|
196 |
-+keycode 14 = Delete Delete |
|
197 |
- control keycode 14 = BackSpace |
|
198 |
- alt keycode 14 = Meta_Delete |
|
199 |
- ctrlr keycode 14 = BackSpace |
|
200 |
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map |
|
201 |
-+++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map 2008-12-03 22:53:36.000000000 +0000 |
|
202 |
-@@ -250,7 +250,7 @@ |
|
203 |
- shift ctrll ctrlr keycode 13 = plus |
|
204 |
- alt ctrll ctrlr keycode 13 = Meta_equal |
|
205 |
- shift alt ctrll ctrlr keycode 13 = Meta_plus |
|
206 |
--keycode 14 = BackSpace Delete |
|
207 |
-+keycode 14 = Delete Delete |
|
208 |
- control keycode 14 = BackSpace |
|
209 |
- alt keycode 14 = Meta_Delete |
|
210 |
- ctrlr keycode 14 = BackSpace |
|
211 |
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map |
|
212 |
-+++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map 2008-12-03 22:54:06.000000000 +0000 |
|
213 |
-@@ -260,7 +260,7 @@ |
|
214 |
- shift ctrll ctrlr keycode 13 = plus |
|
215 |
- alt ctrll ctrlr keycode 13 = Meta_equal |
|
216 |
- shift alt ctrll ctrlr keycode 13 = Meta_plus |
|
217 |
--keycode 14 = BackSpace Delete |
|
218 |
-+keycode 14 = Delete Delete |
|
219 |
- control keycode 14 = BackSpace |
|
220 |
- alt keycode 14 = Meta_Delete |
|
221 |
- ctrlr keycode 14 = BackSpace |
|
222 |
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map |
|
223 |
-+++ kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map 2008-12-03 22:54:23.000000000 +0000 |
|
224 |
-@@ -260,7 +260,7 @@ |
|
225 |
- shift ctrll ctrlr keycode 13 = plus |
|
226 |
- alt ctrll ctrlr keycode 13 = Meta_equal |
|
227 |
- shift alt ctrll ctrlr keycode 13 = Meta_plus |
|
228 |
--keycode 14 = BackSpace Delete |
|
229 |
-+keycode 14 = Delete Delete |
|
230 |
- control keycode 14 = BackSpace |
|
231 |
- alt keycode 14 = Meta_Delete |
|
232 |
- ctrlr keycode 14 = BackSpace |
233 | 1 |
new file mode 100644 |
... | ... |
@@ -0,0 +1,250 @@ |
0 |
+Submitted By: Matt Burgess |
|
1 |
+Date: 2008-12-06 |
|
2 |
+Initial Package Version: 1.15 |
|
3 |
+Upstream Status: Not submitted, possibly incomplete |
|
4 |
+Description: Makes Backspace and Delete keys consistent in all i386 keymaps. |
|
5 |
+Makes the Backspace key send character code 127, and Delete send a well known |
|
6 |
+escape sequence. Obsoletes the /etc/kbd/bs-sends-del file for i386. |
|
7 |
+ |
|
8 |
+Original patch for 1.12 by Alexander Patrakov. |
|
9 |
+Updated for 1.13 (drop ru.map, the change is upstream, and add ru_win.map, |
|
10 |
+ru-cp1251.map) by Ken Moffat <ken at linuxfromscratch dot org>. |
|
11 |
+Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>. |
|
12 |
+ |
|
13 |
+diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map |
|
14 |
+--- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map 2008-06-20 12:36:01.000000000 +0100 |
|
15 |
+@@ -43,7 +43,7 @@ |
|
16 |
+ keycode 11 = three numbersign |
|
17 |
+ keycode 12 = two at |
|
18 |
+ keycode 13 = one exclam |
|
19 |
+- keycode 14 = BackSpace Delete |
|
20 |
++ keycode 14 = Delete Delete |
|
21 |
+ ! -------------------------------------------------------------------------- |
|
22 |
+ ! Row 3 |
|
23 |
+ ! -------------------------------------------------------------------------- |
|
24 |
+diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map |
|
25 |
+--- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map 2008-06-20 12:36:01.000000000 +0100 |
|
26 |
+@@ -43,7 +43,7 @@ |
|
27 |
+ keycode 11 = slash question |
|
28 |
+ keycode 12 = bracketleft braceleft |
|
29 |
+ keycode 13 = bracketright braceright |
|
30 |
+- keycode 14 = BackSpace Delete |
|
31 |
++ keycode 14 = Delete Delete |
|
32 |
+ ! -------------------------------------------------------------------------- |
|
33 |
+ ! Row 3 |
|
34 |
+ ! -------------------------------------------------------------------------- |
|
35 |
+diff -Naur kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map |
|
36 |
+--- kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map 2008-10-23 20:03:58.000000000 +0100 |
|
37 |
+@@ -51,7 +51,7 @@ |
|
38 |
+ alt keycode 12 = Meta_minus |
|
39 |
+ keycode 13 = minus underscore |
|
40 |
+ alt keycode 13 = Meta_equal |
|
41 |
+-keycode 14 = BackSpace Delete |
|
42 |
++keycode 14 = Delete Delete |
|
43 |
+ alt keycode 14 = Meta_Delete |
|
44 |
+ keycode 15 = Tab Meta_Tab |
|
45 |
+ alt keycode 15 = Meta_Tab |
|
46 |
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map |
|
47 |
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map 2008-10-23 20:03:59.000000000 +0100 |
|
48 |
+@@ -205,7 +205,7 @@ |
|
49 |
+ # edit this if you want the key above <Enter> to delete symbols above |
|
50 |
+ # cursor, not before. |
|
51 |
+ keycode 14 = \ |
|
52 |
+- BackSpace BackSpace BackSpace BackSpace \ |
|
53 |
++ Delete Delete Delete Delete \ |
|
54 |
+ Delete Delete Delete Delete \ |
|
55 |
+ Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \ |
|
56 |
+ Meta_Delete Meta_Delete Meta_Delete Meta_Delete |
|
57 |
+@@ -506,7 +506,7 @@ |
|
58 |
+ |
|
59 |
+ # Edit this if you want strict VT100 emulation. |
|
60 |
+ string F111 = "\033[3$" |
|
61 |
+-keycode 111 = Delete F111 Delete F111 \ |
|
62 |
++keycode 111 = Remove F111 Remove F111 \ |
|
63 |
+ Remove Remove Remove Remove \ |
|
64 |
+ Meta_Delete Meta_Delete Meta_Delete Meta_Delete \ |
|
65 |
+ Boot Boot Boot Boot |
|
66 |
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map kbd-1.15/data/keymaps/i386/qwerty/lt.map |
|
67 |
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map 2008-10-23 20:03:59.000000000 +0100 |
|
68 |
+@@ -204,7 +204,7 @@ |
|
69 |
+ # edit this if you want the key above <Enter> to delete symbols above |
|
70 |
+ # cursor, not before. |
|
71 |
+ keycode 14 = \ |
|
72 |
+- BackSpace BackSpace BackSpace BackSpace \ |
|
73 |
++ Delete Delete Delete Delete \ |
|
74 |
+ Delete Delete Delete Delete \ |
|
75 |
+ Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \ |
|
76 |
+ Meta_Delete Meta_Delete Meta_Delete Meta_Delete |
|
77 |
+@@ -505,7 +505,7 @@ |
|
78 |
+ |
|
79 |
+ # Edit this if you want strict VT100 emulation. |
|
80 |
+ string F111 = "\033[3$" |
|
81 |
+-keycode 111 = Delete F111 Delete F111 \ |
|
82 |
++keycode 111 = Remove F111 Remove F111 \ |
|
83 |
+ Remove Remove Remove Remove \ |
|
84 |
+ Meta_Delete Meta_Delete Meta_Delete Meta_Delete \ |
|
85 |
+ Boot Boot Boot Boot |
|
86 |
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map |
|
87 |
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map 2008-06-20 12:36:00.000000000 +0100 |
|
88 |
+@@ -3,7 +3,7 @@ |
|
89 |
+ # Send comments to Kjetil T. Homme <kjetilho@ifi.uio.no> |
|
90 |
+ include "linux-with-alt-and-altgr" |
|
91 |
+ plain keycode 83 = KP_Comma |
|
92 |
+- plain keycode 111 = Delete # "Remove" originally, weird... |
|
93 |
++ plain keycode 111 = Remove |
|
94 |
+ strings as usual |
|
95 |
+ |
|
96 |
+ keycode 1 = Escape |
|
97 |
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map kbd-1.15/data/keymaps/i386/qwerty/ru1.map |
|
98 |
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map 2008-10-23 20:03:59.000000000 +0100 |
|
99 |
+@@ -143,8 +143,8 @@ |
|
100 |
+ |
|
101 |
+ # The keycode "0xFF" is too dangerous for many programs (including emacs). |
|
102 |
+ # So let it be bracket instead of Hard Sign. |
|
103 |
+-# altgr keycode 27 = +0xDF |
|
104 |
+-# altgr shift keycode 27 = +0xFF |
|
105 |
++altgr keycode 27 = +0xDF |
|
106 |
++altgr shift keycode 27 = +0xFF |
|
107 |
+ control keycode 27 = Control_bracketright |
|
108 |
+ altgr control keycode 27 = Control_bracketright |
|
109 |
+ alt keycode 27 = Meta_bracketright |
|
110 |
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map kbd-1.15/data/keymaps/i386/qwerty/ru2.map |
|
111 |
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map 2008-10-23 20:03:59.000000000 +0100 |
|
112 |
+@@ -46,7 +46,7 @@ |
|
113 |
+ alt keycode 12 = Meta_minus |
|
114 |
+ keycode 13 = equal plus equal plus |
|
115 |
+ alt keycode 13 = Meta_equal |
|
116 |
+- keycode 14 = BackSpace BackSpace BackSpace BackSpace |
|
117 |
++ keycode 14 = Delete Delete Delete Delete |
|
118 |
+ alt keycode 14 = Meta_Delete |
|
119 |
+ keycode 15 = Tab Tab Tab Tab |
|
120 |
+ alt keycode 15 = Meta_Tab |
|
121 |
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map |
|
122 |
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map 2008-10-23 20:03:59.000000000 +0100 |
|
123 |
+@@ -39,7 +39,7 @@ |
|
124 |
+ alt keycode 12 = Meta_minus |
|
125 |
+ keycode 13 = equal plus equal plus |
|
126 |
+ alt keycode 13 = Meta_equal |
|
127 |
+- keycode 14 = BackSpace |
|
128 |
++ keycode 14 = Delete |
|
129 |
+ alt keycode 14 = Meta_Delete |
|
130 |
+ keycode 15 = Tab |
|
131 |
+ alt keycode 15 = Meta_Tab |
|
132 |
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map |
|
133 |
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map 2008-10-23 20:03:59.000000000 +0100 |
|
134 |
+@@ -89,8 +89,8 @@ |
|
135 |
+ altgr alt keycode 13 = Meta_equal |
|
136 |
+ shift alt keycode 13 = Meta_plus |
|
137 |
+ altgr shift alt keycode 13 = Meta_plus |
|
138 |
+- keycode 14 = BackSpace BackSpace BackSpace BackSpace |
|
139 |
+-# keycode 14 = Delete Delete Delete Delete |
|
140 |
++# keycode 14 = BackSpace BackSpace BackSpace BackSpace |
|
141 |
++ keycode 14 = Delete Delete Delete Delete |
|
142 |
+ alt keycode 14 = Meta_Delete |
|
143 |
+ altgr alt keycode 14 = Meta_Delete |
|
144 |
+ keycode 15 = Tab Tab Tab Tab |
|
145 |
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map kbd-1.15/data/keymaps/i386/qwerty/ru_win.map |
|
146 |
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map 2008-10-23 20:03:59.000000000 +0100 |
|
147 |
+@@ -42,7 +42,7 @@ |
|
148 |
+ alt keycode 12 = Meta_minus |
|
149 |
+ keycode 13 = equal plus equal plus |
|
150 |
+ alt keycode 13 = Meta_equal |
|
151 |
+- keycode 14 = BackSpace BackSpace BackSpace BackSpace |
|
152 |
++ keycode 14 = Delete Delete Delete Delete |
|
153 |
+ alt keycode 14 = Meta_Delete |
|
154 |
+ keycode 15 = Tab Tab Tab Tab |
|
155 |
+ alt keycode 15 = Meta_Tab |
|
156 |
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map |
|
157 |
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map 2008-10-23 20:03:59.000000000 +0100 |
|
158 |
+@@ -345,7 +345,7 @@ |
|
159 |
+ keycode 109 = Next Scroll_Forward |
|
160 |
+ keycode 110 = Insert |
|
161 |
+ |
|
162 |
+- keycode 111 = Delete # "Remove" originally, weird... |
|
163 |
++ keycode 111 = Remove |
|
164 |
+ control alt keycode 111 = Boot |
|
165 |
+ control altgr keycode 111 = Boot |
|
166 |
+ |
|
167 |
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map |
|
168 |
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map 2008-10-23 20:03:59.000000000 +0100 |
|
169 |
+@@ -374,6 +374,6 @@ |
|
170 |
+ keycode 109 = Next Scroll_Forward |
|
171 |
+ keycode 110 = Insert |
|
172 |
+ |
|
173 |
+- keycode 111 = Delete # "Remove" originally, weird... |
|
174 |
++ keycode 111 = Remove |
|
175 |
+ control alt keycode 111 = Boot |
|
176 |
+ control altgr keycode 111 = Boot |
|
177 |
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map |
|
178 |
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map 2008-10-23 20:03:59.000000000 +0100 |
|
179 |
+@@ -49,7 +49,7 @@ |
|
180 |
+ alt keycode 12 = Meta_minus |
|
181 |
+ keycode 13 = minus underscore |
|
182 |
+ alt keycode 13 = Meta_equal |
|
183 |
+-keycode 14 = BackSpace Delete |
|
184 |
++keycode 14 = Delete Delete |
|
185 |
+ alt keycode 14 = Meta_Delete |
|
186 |
+ keycode 15 = Tab Meta_Tab |
|
187 |
+ alt keycode 15 = Meta_Tab |
|
188 |
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map kbd-1.15/data/keymaps/i386/qwerty/ua.map |
|
189 |
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map 2008-10-23 20:03:59.000000000 +0100 |
|
190 |
+@@ -249,7 +249,7 @@ |
|
191 |
+ shift ctrll ctrlr keycode 13 = plus |
|
192 |
+ alt ctrll ctrlr keycode 13 = Meta_equal |
|
193 |
+ shift alt ctrll ctrlr keycode 13 = Meta_plus |
|
194 |
+-keycode 14 = BackSpace Delete |
|
195 |
++keycode 14 = Delete Delete |
|
196 |
+ control keycode 14 = BackSpace |
|
197 |
+ alt keycode 14 = Meta_Delete |
|
198 |
+ ctrlr keycode 14 = BackSpace |
|
199 |
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map |
|
200 |
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map 2008-10-23 20:03:59.000000000 +0100 |
|
201 |
+@@ -250,7 +250,7 @@ |
|
202 |
+ shift ctrll ctrlr keycode 13 = plus |
|
203 |
+ alt ctrll ctrlr keycode 13 = Meta_equal |
|
204 |
+ shift alt ctrll ctrlr keycode 13 = Meta_plus |
|
205 |
+-keycode 14 = BackSpace Delete |
|
206 |
++keycode 14 = Delete Delete |
|
207 |
+ control keycode 14 = BackSpace |
|
208 |
+ alt keycode 14 = Meta_Delete |
|
209 |
+ ctrlr keycode 14 = BackSpace |
|
210 |
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map |
|
211 |
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map 2008-10-23 20:03:59.000000000 +0100 |
|
212 |
+@@ -260,7 +260,7 @@ |
|
213 |
+ shift ctrll ctrlr keycode 13 = plus |
|
214 |
+ alt ctrll ctrlr keycode 13 = Meta_equal |
|
215 |
+ shift alt ctrll ctrlr keycode 13 = Meta_plus |
|
216 |
+-keycode 14 = BackSpace Delete |
|
217 |
++keycode 14 = Delete Delete |
|
218 |
+ control keycode 14 = BackSpace |
|
219 |
+ alt keycode 14 = Meta_Delete |
|
220 |
+ ctrlr keycode 14 = BackSpace |
|
221 |
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map |
|
222 |
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map 2008-10-23 20:03:59.000000000 +0100 |
|
223 |
+@@ -260,7 +260,7 @@ |
|
224 |
+ shift ctrll ctrlr keycode 13 = plus |
|
225 |
+ alt ctrll ctrlr keycode 13 = Meta_equal |
|
226 |
+ shift alt ctrll ctrlr keycode 13 = Meta_plus |
|
227 |
+-keycode 14 = BackSpace Delete |
|
228 |
++keycode 14 = Delete Delete |
|
229 |
+ control keycode 14 = BackSpace |
|
230 |
+ alt keycode 14 = Meta_Delete |
|
231 |
+ ctrlr keycode 14 = BackSpace |
... | ... |
@@ -1,15 +1,15 @@ |
1 | 1 |
Summary: Key table files, console fonts, and keyboard utilities |
2 | 2 |
Name: kbd |
3 |
-Version: 2.0.1 |
|
3 |
+Version: 2.0.3 |
|
4 | 4 |
Release: 1%{?dist} |
5 | 5 |
License: GPLv2 |
6 | 6 |
URL: http://ftp.altlinux.org/pub/people/legion/kbd |
7 | 7 |
Group: Applications/System |
8 | 8 |
Vendor: VMware, Inc. |
9 | 9 |
Distribution: Photon |
10 |
-Source0: http://ftp.altlinux.org/pub/people/legion/kbd/%{name}-%{version}.tar.gz |
|
11 |
-%define sha1 kbd=8d7d6f9fc95d8abb80156da0713a4cbc0dbfda97 |
|
12 |
-Patch0: kbd-2.0.1-backspace-1.patch |
|
10 |
+Source0: http://ftp.altlinux.org/pub/people/legion/kbd/%{name}-%{version}.tar.xz |
|
11 |
+%define sha1 kbd=0a58dc928386f0f9c981fbefd24f05fc0b8226d7 |
|
12 |
+Patch0: kbd-2.0.3-backspace-1.patch |
|
13 | 13 |
BuildRequires: check >= 0.9.4 |
14 | 14 |
%description |
15 | 15 |
The Kbd package contains key-table files, console fonts, and keyboard utilities. |
... | ... |
@@ -44,5 +44,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck} |
44 | 44 |
%{_datarootdir}/unimaps/* |
45 | 45 |
%{_mandir}/*/* |
46 | 46 |
%changelog |
47 |
+* Wed Jan 13 2016 Xiaolin Li <xiaolinl@vmware.com> 2.0.3-1 |
|
48 |
+- Updated to version 2.0.3 |
|
47 | 49 |
* Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 2.0.1-1 |
48 | 50 |
- Initial build. First version |
... | ... |
@@ -1,6 +1,6 @@ |
1 | 1 |
Summary: Utilities for loading kernel modules |
2 | 2 |
Name: kmod |
3 |
-Version: 16 |
|
3 |
+Version: 21 |
|
4 | 4 |
Release: 1%{?dist} |
5 | 5 |
License: GPLv2+ |
6 | 6 |
URL: http://www.kernel.org/pub/linux/utils/kernel/kmod |
... | ... |
@@ -8,7 +8,7 @@ Group: Applications/System |
8 | 8 |
Vendor: VMware, Inc. |
9 | 9 |
Distribution: Photon |
10 | 10 |
Source0: http://www.kernel.org/pub/linux/utils/kernel/kmod/%{name}-%{version}.tar.xz |
11 |
-%define sha1 kmod=1b3e8066208098b3b9593b63bff5838a41bbdfb0 |
|
11 |
+%define sha1 kmod=b2c1a0a1f2979fd29c7b0825ed19254c332246b4 |
|
12 | 12 |
BuildRequires: xz-devel |
13 | 13 |
Requires: xz |
14 | 14 |
%description |
... | ... |
@@ -48,5 +48,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck} |
48 | 48 |
%{_includedir}/* |
49 | 49 |
%{_datadir}/bash-completion/completions/kmod |
50 | 50 |
%changelog |
51 |
+* Wed Jan 13 2016 Xiaolin Li <xiaolinl@vmware.com> 21-1 |
|
52 |
+- Updated to version 21 |
|
51 | 53 |
* Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 16-1 |
52 | 54 |
- Initial build. First version |
... | ... |
@@ -1,14 +1,14 @@ |
1 | 1 |
Summary: Shared libraries, portable interface |
2 | 2 |
Name: libtool |
3 |
-Version: 2.4.2 |
|
3 |
+Version: 2.4.6 |
|
4 | 4 |
Release: 1%{?dist} |
5 | 5 |
License: GPLv2 |
6 | 6 |
URL: http://www.gnu.org/software/libtool |
7 | 7 |
Group: Development/Tools |
8 | 8 |
Vendor: VMware, Inc. |
9 | 9 |
Distribution: Photon |
10 |
-Source0: http://ftp.gnu.org/gnu/libtool/%{name}-%{version}.tar.gz |
|
11 |
-%define sha1 libtool=22b71a8b5ce3ad86e1094e7285981cae10e6ff88 |
|
10 |
+Source0: http://ftp.gnu.org/gnu/libtool/%{name}-%{version}.tar.xz |
|
11 |
+%define sha1 libtool=3e7504b832eb2dd23170c91b6af72e15b56eb94e |
|
12 | 12 |
%description |
13 | 13 |
It wraps the complexity of using shared libraries in a |
14 | 14 |
consistent, portable interface. |
... | ... |
@@ -52,20 +52,15 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck} |
52 | 52 |
%{_bindir}/libtool |
53 | 53 |
%{_datadir}/aclocal/ltoptions.m4 |
54 | 54 |
%{_datadir}/aclocal/libtool.m4 |
55 |
-%{_datadir}/aclocal/argz.m4 |
|
56 | 55 |
%{_datadir}/aclocal/ltversion.m4 |
57 | 56 |
%{_datadir}/aclocal/lt~obsolete.m4 |
58 | 57 |
%{_datadir}/aclocal/ltdl.m4 |
59 | 58 |
%{_datadir}/aclocal/ltsugar.m4 |
59 |
+%{_datadir}/aclocal/ltargz.m4 |
|
60 | 60 |
%{_mandir}/man1/libtool.1.gz |
61 | 61 |
%{_mandir}/man1/libtoolize.1.gz |
62 |
-%{_datadir}/libtool/config/compile |
|
63 |
-%{_datadir}/libtool/config/config.sub |
|
64 |
-%{_datadir}/libtool/config/ltmain.sh |
|
65 |
-%{_datadir}/libtool/config/depcomp |
|
66 |
-%{_datadir}/libtool/config/missing |
|
67 |
-%{_datadir}/libtool/config/install-sh |
|
68 |
-%{_datadir}/libtool/config/config.guess |
|
62 |
+%{_datadir}/libtool/* |
|
63 |
+ |
|
69 | 64 |
%files -n libltdl-devel |
70 | 65 |
%{_includedir}/libltdl/lt_dlloader.h |
71 | 66 |
%{_includedir}/libltdl/lt_system.h |
... | ... |
@@ -74,10 +69,11 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck} |
74 | 74 |
%{_libdir}/libltdl.a |
75 | 75 |
%{_libdir}/libltdl.so |
76 | 76 |
%files -n libltdl |
77 |
-%{_datadir}/libtool/libltdl/* |
|
78 | 77 |
%{_libdir}/libltdl.so.7 |
79 |
-%{_libdir}/libltdl.so.7.3.0 |
|
78 |
+%{_libdir}/libltdl.so.7.3.1 |
|
80 | 79 |
|
81 | 80 |
%changelog |
81 |
+* Wed Jan 13 2016 Xiaolin Li <xiaolinl@vmware.com> 2.4.6-1 |
|
82 |
+- Updated to version 2.4.6 |
|
82 | 83 |
* Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 2.4.2-1 |
83 | 84 |
- Initial build. First version |