← Back to branch summary

~ubuntu-branches/ubuntu/lucid/libx11/lucid

« back to all changes in this revision

Viewing changes to debian/patches/007_iso8859-15_Compose_fix.diff

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2009-01-17 16:34:54 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20090117163454-gaey3cd32xyavueo
Tags: 2:1.1.99.2-1build1
Fakesync with Debian, all previous Ubuntu changes are included
in the new upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/007_iso8859-15_Compose_fix.diff
6
6
 
7
7
http://bugs.debian.org/97433
8
8
 
 
9
Index: libx11/nls/iso8859-15/Compose.pre
 
10
===================================================================
9
11
--- libx11.orig/nls/iso8859-15/Compose.pre
10
12
+++ libx11/nls/iso8859-15/Compose.pre
11
13
@@ -157,8 +157,7 @@
36
38
 <Multi_key> <a> <asterisk>             : "\345"        aring
37
39
 <Multi_key> <asterisk> <a>             : "\345"        aring
38
40
 <Multi_key> <a> <a>                    : "\345"        aring
39
 
@@ -229,8 +224,6 @@
 
41
@@ -233,8 +228,6 @@
40
42
 <Multi_key> <greater> <E>              : "\312"        Ecircumflex
41
43
 <Multi_key> <E> <quotedbl>             : "\313"        Ediaeresis
42
44
 <Multi_key> <quotedbl> <E>             : "\313"        Ediaeresis
45
47
 <Multi_key> <e> <grave>                        : "\350"        egrave
46
48
 <Multi_key> <grave> <e>                        : "\350"        egrave
47
49
 <Multi_key> <e> <acute>                        : "\351"        eacute
48
 
@@ -243,8 +236,6 @@
 
50
@@ -247,8 +240,6 @@
49
51
 <Multi_key> <greater> <e>              : "\352"        ecircumflex
50
52
 <Multi_key> <e> <quotedbl>             : "\353"        ediaeresis
51
53
 <Multi_key> <quotedbl> <e>             : "\353"        ediaeresis
54
56
 <Multi_key> <I> <grave>                        : "\314"        Igrave
55
57
 <Multi_key> <grave> <I>                        : "\314"        Igrave
56
58
 <Multi_key> <I> <acute>                        : "\315"        Iacute
57
 
@@ -257,8 +248,6 @@
 
59
@@ -261,8 +252,6 @@
58
60
 <Multi_key> <greater> <I>              : "\316"        Icircumflex
59
61
 <Multi_key> <I> <quotedbl>             : "\317"        Idiaeresis
60
62
 <Multi_key> <quotedbl> <I>             : "\317"        Idiaeresis
63
65
 <Multi_key> <i> <grave>                        : "\354"        igrave
64
66
 <Multi_key> <grave> <i>                        : "\354"        igrave
65
67
 <Multi_key> <i> <acute>                        : "\355"        iacute
66
 
@@ -271,8 +260,6 @@
 
68
@@ -275,8 +264,6 @@
67
69
 <Multi_key> <greater> <i>              : "\356"        icircumflex
68
70
 <Multi_key> <i> <quotedbl>             : "\357"        idiaeresis
69
71
 <Multi_key> <quotedbl> <i>             : "\357"        idiaeresis
72
74
 <Multi_key> <N> <asciitilde>           : "\321"        Ntilde
73
75
 <Multi_key> <asciitilde> <N>           : "\321"        Ntilde
74
76
 <Multi_key> <N> <minus>                        : "\321"        Ntilde
75
 
@@ -297,8 +284,6 @@
 
77
@@ -301,8 +288,6 @@
76
78
 <Multi_key> <minus> <O>                        : "\325"        Otilde
77
79
 <Multi_key> <O> <quotedbl>             : "\326"        Odiaeresis
78
80
 <Multi_key> <quotedbl> <O>             : "\326"        Odiaeresis
81
83
 <Multi_key> <O> <slash>                        : "\330"        Ooblique
82
84
 <Multi_key> <slash> <O>                        : "\330"        Ooblique
83
85
 <Multi_key> <O> <E>                    : "\274"        OE
84
 
@@ -318,8 +303,6 @@
 
86
@@ -322,8 +307,6 @@
85
87
 <Multi_key> <minus> <o>                        : "\365"        otilde
86
88
 <Multi_key> <o> <quotedbl>             : "\366"        odiaeresis
87
89
 <Multi_key> <quotedbl> <o>             : "\366"        odiaeresis
90
92
 <Multi_key> <o> <slash>                        : "\370"        oslash
91
93
 <Multi_key> <slash> <o>                        : "\370"        oslash
92
94
 <Multi_key> <o> <e>                    : "\275"        oe
93
 
@@ -339,8 +322,6 @@
 
95
@@ -343,8 +326,6 @@
94
96
 <Multi_key> <greater> <U>              : "\333"        Ucircumflex
95
97
 <Multi_key> <U> <quotedbl>             : "\334"        Udiaeresis
96
98
 <Multi_key> <quotedbl> <U>             : "\334"        Udiaeresis
99
101
 <Multi_key> <u> <grave>                        : "\371"        ugrave
100
102
 <Multi_key> <grave> <u>                        : "\371"        ugrave
101
103
 <Multi_key> <u> <acute>                        : "\372"        uacute
102
 
@@ -353,8 +334,6 @@
 
104
@@ -357,8 +338,6 @@
103
105
 <Multi_key> <greater> <u>              : "\373"        ucircumflex
104
106
 <Multi_key> <u> <quotedbl>             : "\374"        udiaeresis
105
107
 <Multi_key> <quotedbl> <u>             : "\374"        udiaeresis
108
110
 <Multi_key> <s> <s>                    : "\337"        ssharp
109
111
 <Multi_key> <T> <H>                    : "\336"        THORN
110
112
 <Multi_key> <t> <h>                    : "\376"        thorn
111
 
@@ -364,16 +343,12 @@
 
113
@@ -368,16 +347,12 @@
112
114
 <Multi_key> <apostrophe> <Y>           : "\335"        Yacute
113
115
 <Multi_key> <Y> <quotedbl>             : "\276"        Ydiaeresis
114
116
 <Multi_key> <quotedbl> <Y>             : "\276"        Ydiaeresis
125
127
 <Multi_key> <Z> <less>                 : "\264"        Zcaron
126
128
 <Multi_key> <less> <Z>                 : "\264"        Zcaron
127
129
 <Multi_key> <z> <less>                 : "\270"        zcaron
128
 
@@ -402,8 +377,7 @@
 
130
@@ -406,8 +381,7 @@
129
131
 <dead_cedilla> <minus>                 : "\254"        notsign
130
132
 <dead_circumflex> <minus>              : "\257"        macron
131
133
 <dead_circumflex> <underscore>         : "\257"        macron