Merge ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic

Proposed by Marco Trevisan (Treviño) on 2019-06-26
Status: Merged
Merged at revision: f8d767d89ccc92e958a7fed3ae219c396a345e6d
Proposed branch: ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic
Merge into: ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic
Diff against target: 857 lines (+835/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/osk-layouts-Fix-French-layout.patch (+827/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Ubuntu Desktop 2019-06-26 Pending
Review via email: mp+369345@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 1e6d367..5d4715d 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+gnome-shell (3.28.4-0ubuntu18.04.2) UNRELEASED; urgency=medium
7+
8+ * d/p/osk-layouts-Fix-French-layout.patch:
9+ - osk-layouts: Fix French layout (LP: #1832875)
10+
11+ -- Marco Trevisan (Treviño) <marco@ubuntu.com> Wed, 26 Jun 2019 17:21:31 +0200
12+
13 gnome-shell (3.28.4-0ubuntu18.04.1) bionic; urgency=medium
14
15 * New upstream stable release
16diff --git a/debian/patches/osk-layouts-Fix-French-layout.patch b/debian/patches/osk-layouts-Fix-French-layout.patch
17new file mode 100644
18index 0000000..f8175da
19--- /dev/null
20+++ b/debian/patches/osk-layouts-Fix-French-layout.patch
21@@ -0,0 +1,827 @@
22+From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org>
23+Date: Wed, 27 Feb 2019 20:11:35 +0100
24+Subject: osk-layouts: Fix French layout
25+
26+The script to convert XML keyboard layouts to json has a small bug
27+that causes the French-Canadian layout to end up as French.
28+
29+https://gitlab.gnome.org/GNOME/gnome-shell/issues/997
30+
31+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/161beb71
32+Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/997
33+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1832875
34+Applied-Upstream: 3.28.5
35+
36+(cherry picked from commit 859aef78c4d2472b2545ce9ecc889c00b9893494)
37+---
38+ data/gnome-shell-osk-layouts.gresource.xml | 1 +
39+ data/osk-layouts/ca.json | 599 +++++++++++++++++++++++++++++
40+ data/osk-layouts/fr.json | 89 +++--
41+ 3 files changed, 652 insertions(+), 37 deletions(-)
42+ create mode 100644 data/osk-layouts/ca.json
43+
44+diff --git a/data/gnome-shell-osk-layouts.gresource.xml b/data/gnome-shell-osk-layouts.gresource.xml
45+index 86d6cb9..0fab4e5 100644
46+--- a/data/gnome-shell-osk-layouts.gresource.xml
47++++ b/data/gnome-shell-osk-layouts.gresource.xml
48+@@ -6,6 +6,7 @@
49+ <file>be.json</file>
50+ <file>bg.json</file>
51+ <file>by.json</file>
52++ <file>ca.json</file>
53+ <file>cz.json</file>
54+ <file>de.json</file>
55+ <file>dk.json</file>
56+diff --git a/data/osk-layouts/ca.json b/data/osk-layouts/ca.json
57+new file mode 100644
58+index 0000000..2b2bedc
59+--- /dev/null
60++++ b/data/osk-layouts/ca.json
61+@@ -0,0 +1,599 @@
62++{
63++ "levels": [
64++ {
65++ "level": "",
66++ "mode": "default",
67++ "rows": [
68++ [
69++ [
70++ "q"
71++ ],
72++ [
73++ "w"
74++ ],
75++ [
76++ "e",
77++ "é",
78++ "è",
79++ "ê",
80++ "ë",
81++ "%",
82++ "ę",
83++ "ė",
84++ "ē"
85++ ],
86++ [
87++ "r"
88++ ],
89++ [
90++ "t"
91++ ],
92++ [
93++ "y",
94++ "%",
95++ "ÿ"
96++ ],
97++ [
98++ "u",
99++ "ù",
100++ "û",
101++ "%",
102++ "ü",
103++ "ú",
104++ "ū"
105++ ],
106++ [
107++ "i",
108++ "î",
109++ "%",
110++ "ï",
111++ "ì",
112++ "í",
113++ "į",
114++ "ī"
115++ ],
116++ [
117++ "o",
118++ "ô",
119++ "œ",
120++ "%",
121++ "ö",
122++ "ò",
123++ "ó",
124++ "õ",
125++ "ø",
126++ "ō",
127++ "º"
128++ ],
129++ [
130++ "p"
131++ ]
132++ ],
133++ [
134++ [
135++ "a",
136++ "à",
137++ "â",
138++ "%",
139++ "æ",
140++ "á",
141++ "ä",
142++ "ã",
143++ "å",
144++ "ā",
145++ "ª"
146++ ],
147++ [
148++ "s"
149++ ],
150++ [
151++ "d"
152++ ],
153++ [
154++ "f"
155++ ],
156++ [
157++ "g"
158++ ],
159++ [
160++ "h"
161++ ],
162++ [
163++ "j"
164++ ],
165++ [
166++ "k"
167++ ],
168++ [
169++ "l"
170++ ]
171++ ],
172++ [
173++ [
174++ "z"
175++ ],
176++ [
177++ "x"
178++ ],
179++ [
180++ "c",
181++ "ç",
182++ "ć",
183++ "č"
184++ ],
185++ [
186++ "v"
187++ ],
188++ [
189++ "b"
190++ ],
191++ [
192++ "n"
193++ ],
194++ [
195++ "m"
196++ ]
197++ ],
198++ [
199++ [
200++ ","
201++ ],
202++ [
203++ " "
204++ ],
205++ [
206++ ".",
207++ "#",
208++ "!",
209++ ",",
210++ "?",
211++ "-",
212++ ":",
213++ "'",
214++ "@"
215++ ]
216++ ]
217++ ]
218++ },
219++ {
220++ "level": "shift",
221++ "mode": "latched",
222++ "rows": [
223++ [
224++ [
225++ "Q"
226++ ],
227++ [
228++ "W"
229++ ],
230++ [
231++ "E",
232++ "É",
233++ "È",
234++ "Ê",
235++ "Ë",
236++ "%",
237++ "Ę",
238++ "Ė",
239++ "Ē"
240++ ],
241++ [
242++ "R"
243++ ],
244++ [
245++ "T"
246++ ],
247++ [
248++ "Y",
249++ "%",
250++ "Ÿ"
251++ ],
252++ [
253++ "U",
254++ "Ù",
255++ "Û",
256++ "%",
257++ "Ü",
258++ "Ú",
259++ "Ū"
260++ ],
261++ [
262++ "I",
263++ "Î",
264++ "%",
265++ "Ï",
266++ "Ì",
267++ "Í",
268++ "Į",
269++ "Ī"
270++ ],
271++ [
272++ "O",
273++ "Ô",
274++ "Œ",
275++ "%",
276++ "Ö",
277++ "Ò",
278++ "Ó",
279++ "Õ",
280++ "Ø",
281++ "Ō",
282++ "º"
283++ ],
284++ [
285++ "P"
286++ ]
287++ ],
288++ [
289++ [
290++ "A",
291++ "À",
292++ "Â",
293++ "%",
294++ "Æ",
295++ "Á",
296++ "Ä",
297++ "Ã",
298++ "Å",
299++ "Ā",
300++ "ª"
301++ ],
302++ [
303++ "S"
304++ ],
305++ [
306++ "D"
307++ ],
308++ [
309++ "F"
310++ ],
311++ [
312++ "G"
313++ ],
314++ [
315++ "H"
316++ ],
317++ [
318++ "J"
319++ ],
320++ [
321++ "K"
322++ ],
323++ [
324++ "L"
325++ ]
326++ ],
327++ [
328++ [
329++ "Z"
330++ ],
331++ [
332++ "X"
333++ ],
334++ [
335++ "C",
336++ "Ç",
337++ "Ć",
338++ "Č"
339++ ],
340++ [
341++ "V"
342++ ],
343++ [
344++ "B"
345++ ],
346++ [
347++ "N"
348++ ],
349++ [
350++ "M"
351++ ]
352++ ],
353++ [
354++ [
355++ ","
356++ ],
357++ [
358++ " "
359++ ],
360++ [
361++ ".",
362++ "#",
363++ "!",
364++ ",",
365++ "?",
366++ "-",
367++ ":",
368++ "'",
369++ "@"
370++ ]
371++ ]
372++ ]
373++ },
374++ {
375++ "level": "opt",
376++ "mode": "locked",
377++ "rows": [
378++ [
379++ [
380++ "1",
381++ "¹",
382++ "½",
383++ "⅓",
384++ "¼",
385++ "⅛"
386++ ],
387++ [
388++ "2",
389++ "²",
390++ "⅔"
391++ ],
392++ [
393++ "3",
394++ "³",
395++ "¾",
396++ "⅜"
397++ ],
398++ [
399++ "4",
400++ "⁴"
401++ ],
402++ [
403++ "5",
404++ "⅝"
405++ ],
406++ [
407++ "6"
408++ ],
409++ [
410++ "7",
411++ "⅞"
412++ ],
413++ [
414++ "8"
415++ ],
416++ [
417++ "9"
418++ ],
419++ [
420++ "0",
421++ "ⁿ",
422++ "∅"
423++ ]
424++ ],
425++ [
426++ [
427++ "@"
428++ ],
429++ [
430++ "#"
431++ ],
432++ [
433++ "$",
434++ "¢",
435++ "£",
436++ "€",
437++ "¥",
438++ "₱"
439++ ],
440++ [
441++ "%",
442++ "‰"
443++ ],
444++ [
445++ "&"
446++ ],
447++ [
448++ "-",
449++ "_",
450++ "–",
451++ "—",
452++ "·"
453++ ],
454++ [
455++ "+",
456++ "±"
457++ ],
458++ [
459++ "(",
460++ "<",
461++ "{",
462++ "["
463++ ],
464++ [
465++ ")",
466++ ">",
467++ "}",
468++ "]"
469++ ]
470++ ],
471++ [
472++ [
473++ "*",
474++ "†",
475++ "‡",
476++ "★"
477++ ],
478++ [
479++ "\"",
480++ "“",
481++ "”",
482++ "«",
483++ "»"
484++ ],
485++ [
486++ "'",
487++ "‘",
488++ "’",
489++ "‹",
490++ "›"
491++ ],
492++ [
493++ ":"
494++ ],
495++ [
496++ ";"
497++ ],
498++ [
499++ "!",
500++ "¡"
501++ ],
502++ [
503++ "?",
504++ "¿"
505++ ]
506++ ],
507++ [
508++ [
509++ "_"
510++ ],
511++ [
512++ "/"
513++ ],
514++ [
515++ " "
516++ ],
517++ [
518++ ","
519++ ],
520++ [
521++ ".",
522++ "…"
523++ ]
524++ ]
525++ ]
526++ },
527++ {
528++ "level": "opt+shift",
529++ "mode": "locked",
530++ "rows": [
531++ [
532++ [
533++ "~"
534++ ],
535++ [
536++ "`"
537++ ],
538++ [
539++ "|"
540++ ],
541++ [
542++ "•",
543++ "♪",
544++ "♥",
545++ "♠",
546++ "♦",
547++ "♣"
548++ ],
549++ [
550++ "√"
551++ ],
552++ [
553++ "Π",
554++ "π"
555++ ],
556++ [
557++ "÷"
558++ ],
559++ [
560++ "×"
561++ ],
562++ [
563++ "¶",
564++ "§"
565++ ],
566++ [
567++ "∆"
568++ ]
569++ ],
570++ [
571++ [
572++ "£"
573++ ],
574++ [
575++ "¢"
576++ ],
577++ [
578++ "€"
579++ ],
580++ [
581++ "¥"
582++ ],
583++ [
584++ "^",
585++ "↑",
586++ "↓",
587++ "←",
588++ "→"
589++ ],
590++ [
591++ "°",
592++ "′",
593++ "″"
594++ ],
595++ [
596++ "=",
597++ "≠",
598++ "≈",
599++ "∞"
600++ ],
601++ [
602++ "{"
603++ ],
604++ [
605++ "}"
606++ ]
607++ ],
608++ [
609++ [
610++ "\\"
611++ ],
612++ [
613++ "©"
614++ ],
615++ [
616++ "®"
617++ ],
618++ [
619++ "™"
620++ ],
621++ [
622++ "℅"
623++ ],
624++ [
625++ "["
626++ ],
627++ [
628++ "]"
629++ ]
630++ ],
631++ [
632++ [
633++ "<",
634++ "‹",
635++ "≤",
636++ "«"
637++ ],
638++ [
639++ ">",
640++ "›",
641++ "≥",
642++ "»"
643++ ],
644++ [
645++ " "
646++ ],
647++ [
648++ ","
649++ ],
650++ [
651++ ".",
652++ "…"
653++ ]
654++ ]
655++ ]
656++ }
657++ ],
658++ "locale": "fr-CA",
659++ "name": "French Canada"
660++}
661+\ No newline at end of file
662+diff --git a/data/osk-layouts/fr.json b/data/osk-layouts/fr.json
663+index 2b2bedc..dd572b1 100644
664+--- a/data/osk-layouts/fr.json
665++++ b/data/osk-layouts/fr.json
666+@@ -6,10 +6,20 @@
667+ "rows": [
668+ [
669+ [
670+- "q"
671++ "a",
672++ "à",
673++ "â",
674++ "%",
675++ "æ",
676++ "á",
677++ "ä",
678++ "ã",
679++ "å",
680++ "ā",
681++ "ª"
682+ ],
683+ [
684+- "w"
685++ "z"
686+ ],
687+ [
688+ "e",
689+@@ -71,17 +81,7 @@
690+ ],
691+ [
692+ [
693+- "a",
694+- "à",
695+- "â",
696+- "%",
697+- "æ",
698+- "á",
699+- "ä",
700+- "ã",
701+- "å",
702+- "ā",
703+- "ª"
704++ "q"
705+ ],
706+ [
707+ "s"
708+@@ -106,11 +106,14 @@
709+ ],
710+ [
711+ "l"
712++ ],
713++ [
714++ "m"
715+ ]
716+ ],
717+ [
718+ [
719+- "z"
720++ "w"
721+ ],
722+ [
723+ "x"
724+@@ -131,7 +134,11 @@
725+ "n"
726+ ],
727+ [
728+- "m"
729++ "'",
730++ "‘",
731++ "’",
732++ "‹",
733++ "›"
734+ ]
735+ ],
736+ [
737+@@ -161,10 +168,20 @@
738+ "rows": [
739+ [
740+ [
741+- "Q"
742++ "A",
743++ "À",
744++ "Â",
745++ "%",
746++ "Æ",
747++ "Á",
748++ "Ä",
749++ "Ã",
750++ "Å",
751++ "Ā",
752++ "ª"
753+ ],
754+ [
755+- "W"
756++ "Z"
757+ ],
758+ [
759+ "E",
760+@@ -226,17 +243,7 @@
761+ ],
762+ [
763+ [
764+- "A",
765+- "À",
766+- "Â",
767+- "%",
768+- "Æ",
769+- "Á",
770+- "Ä",
771+- "Ã",
772+- "Å",
773+- "Ā",
774+- "ª"
775++ "Q"
776+ ],
777+ [
778+ "S"
779+@@ -261,11 +268,14 @@
780+ ],
781+ [
782+ "L"
783++ ],
784++ [
785++ "M"
786+ ]
787+ ],
788+ [
789+ [
790+- "Z"
791++ "W"
792+ ],
793+ [
794+ "X"
795+@@ -286,7 +296,11 @@
796+ "N"
797+ ],
798+ [
799+- "M"
800++ "'",
801++ "‘",
802++ "’",
803++ "‹",
804++ "›"
805+ ]
806+ ],
807+ [
808+@@ -369,10 +383,10 @@
809+ "#"
810+ ],
811+ [
812+- "$",
813++ "€",
814+ "¢",
815+ "£",
816+- "€",
817++ "$",
818+ "¥",
819+ "₱"
820+ ],
821+@@ -511,13 +525,14 @@
822+ "£"
823+ ],
824+ [
825+- "¢"
826++ "¥"
827+ ],
828+ [
829+- "€"
830++ "$",
831++ "¢"
832+ ],
833+ [
834+- "¥"
835++ "¢"
836+ ],
837+ [
838+ "^",
839+@@ -594,6 +609,6 @@
840+ ]
841+ }
842+ ],
843+- "locale": "fr-CA",
844+- "name": "French Canada"
845++ "locale": "fr",
846++ "name": "French"
847+ }
848+\ No newline at end of file
849diff --git a/debian/patches/series b/debian/patches/series
850index e9c28b3..da5bfc2 100644
851--- a/debian/patches/series
852+++ b/debian/patches/series
853@@ -25,3 +25,4 @@ CVE-2019-3820-1.patch
854 CVE-2019-3820-2.patch
855 switchMonitor-switch-to-next-config-upon-initial-keypress.patch
856 st-widget-Add-missing-g_return_val_if_fail.patch
857+osk-layouts-Fix-French-layout.patch

Subscribers

People subscribed via source and target branches