← Back to branch summary

~ubuntu-branches/ubuntu/raring/xkeyboard-config/raring

« back to all changes in this revision

Viewing changes to rules/base.extras.xml.in

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2011-08-11 22:01:46 UTC
  • mfrom: (12.2.9 experimental)
  • Revision ID: james.westby@ubuntu.com-20110811220146-8y9xgnbyxmro7d08
Tags: 2.3-1ubuntu1
* Merge from Debian experimental.  Remaining Ubuntu changes:
    + xkb-data-i18n.install, xkb-data.install, rules: Split out
      xkb-data-i18n to be used by console-setup.
    + 105_intelligent_keyboard.patch: Add support for the Intelligent
      Keyboard K04
    + 108_fix_intltool_make_check.diff: Fix make check in the presence
      of the quilt patch system.
    + xkb-data.postinst.in: Migrate console-setup/keyboard-configuration
      settings from dvorak-intl to dvorak-alt-intl to match rename in
      xkeyboard-config 1.9. (LP: 742683)
* No need to build the pot file anymore, upstream version is used.
* Fix dh_autoreconf override in rules (FTBFS).

Show diffs side-by-side

added added

removed removed

Lines of Context:
rules/base.extras.xml.in
6
6
    <layout>
7
7
      <configItem>
8
8
        <name>apl</name>
9
 
        <_shortDescription>APL</_shortDescription>
10
 
        <_description>APL</_description>
 
9
        <_shortDescription>apl</_shortDescription>
 
10
        <_description>APL Keyboard Symbols</_description>
11
11
        <languageList><iso639Id>eng</iso639Id></languageList>
12
12
      </configItem>
13
13
      <variantList/>
14
14
    </layout>
15
15
    <layout>
16
16
      <configItem>
 
17
        <name>ca</name>
 
18
        <_shortDescription>fr</_shortDescription>
 
19
        <_description>French (Canada)</_description>
 
20
        <languageList><iso639Id>fr</iso639Id></languageList>
 
21
      </configItem>
 
22
      <variantList>
 
23
        <variant>
 
24
          <configItem>
 
25
            <name>kut</name>
 
26
            <_shortDescription>kut</_shortDescription>
 
27
            <_description>Kutenai</_description>
 
28
          </configItem>
 
29
        </variant>
 
30
        <variant>
 
31
          <configItem>
 
32
            <name>shs</name>
 
33
            <_shortDescription>shs</_shortDescription>
 
34
            <_description>Secwepemctsin</_description>
 
35
          </configItem>
 
36
        </variant>
 
37
      </variantList>
 
38
    </layout>
 
39
    <layout>
 
40
      <configItem>
17
41
        <name>ir</name>
18
 
        <_shortDescription>Iran</_shortDescription>
19
 
        <_description>Iran</_description>
 
42
        <_shortDescription>fa</_shortDescription>
 
43
        <_description>Persian</_description>
20
44
        <languageList><iso639Id>per</iso639Id></languageList>
21
45
      </configItem>
22
46
      <variantList>
23
47
        <variant>
24
48
          <configItem>
25
49
            <name>ave</name>
26
 
            <_description>Iran - Avestan</_description>
 
50
            <_description>Avestan</_description>
27
51
            <languageList><iso639Id>ave</iso639Id></languageList>
28
52
          </configItem>
29
53
        </variant>
32
56
    <layout>
33
57
      <configItem>
34
58
        <name>lt</name>
35
 
        <_shortDescription>Ltu</_shortDescription>
36
 
        <_description>Lithuania</_description>
 
59
        <_shortDescription>lt</_shortDescription>
 
60
        <_description>Lithuanian</_description>
37
61
        <languageList><iso639Id>lit</iso639Id></languageList>
38
62
      </configItem>
39
63
      <variantList>
40
64
        <variant>
41
65
          <configItem>
 
66
            <name>us_dvorak</name>
 
67
            <_description>Lithuanian (US Dvorak with Lithuanian letters)</_description>
 
68
          </configItem>
 
69
        </variant>
 
70
      </variantList>
 
71
    </layout>
 
72
    <layout>
 
73
      <configItem>
 
74
        <name>lv</name>
 
75
        <_shortDescription>lv</_shortDescription>
 
76
        <_description>Latvian</_description>
 
77
        <languageList>
 
78
          <iso639Id>lav</iso639Id>
 
79
        </languageList>
 
80
      </configItem>
 
81
      <variantList>
 
82
        <variant>
 
83
          <configItem>
42
84
            <name>dvorak</name>
43
 
            <_description>Lithuania - Dvorak</_description>
 
85
            <_description>Latvian (US Dvorak)</_description>
 
86
          </configItem>
 
87
        </variant>
 
88
        <variant>
 
89
          <configItem>
 
90
            <name>ykeydvorak</name>
 
91
            <_description>Latvian (US Dvorak, Y variant)</_description>
 
92
          </configItem>
 
93
        </variant>
 
94
        <variant>
 
95
          <configItem>
 
96
            <name>minuskeydvorak</name>
 
97
            <_description>Latvian (US Dvorak, minus variant)</_description>
 
98
          </configItem>
 
99
        </variant>
 
100
        <variant>
 
101
          <configItem>
 
102
            <name>dvorakprogr</name>
 
103
            <_description>Latvian (programmer US Dvorak)</_description>
 
104
          </configItem>
 
105
        </variant>
 
106
        <variant>
 
107
          <configItem>
 
108
            <name>ykeydvorakprogr</name>
 
109
            <_description>Latvian (programmer US Dvorak, Y variant)</_description>
 
110
          </configItem>
 
111
        </variant>
 
112
        <variant>
 
113
          <configItem>
 
114
            <name>minuskeydvorakprogr</name>
 
115
            <_description>Latvian (programmer US Dvorak, minus variant)</_description>
 
116
          </configItem>
 
117
        </variant>
 
118
        <variant>
 
119
          <configItem>
 
120
            <name>colemak</name>
 
121
            <_description>Latvian (US Colemak)</_description>
 
122
          </configItem>
 
123
        </variant>
 
124
        <variant>
 
125
          <configItem>
 
126
            <name>apostrophecolemak</name>
 
127
            <_description>Latvian (US Colemak, apostrophe variant)</_description>
44
128
          </configItem>
45
129
        </variant>
46
130
      </variantList>
48
132
    <layout>
49
133
      <configItem>
50
134
        <name>us</name>
51
 
        <_shortDescription>USA</_shortDescription>
52
 
        <_description>USA</_description>
 
135
        <_shortDescription>en</_shortDescription>
 
136
        <_description>English (US)</_description>
53
137
        <languageList><iso639Id>eng</iso639Id></languageList>
54
138
      </configItem>
55
139
      <variantList>
56
140
        <variant>
57
141
          <configItem>
58
142
            <name>intl-unicode</name>
59
 
            <_description>USA - International (AltGr Unicode combining)</_description>
 
143
            <_description>English (US, international AltGr Unicode combining)</_description>
60
144
          </configItem>
61
145
        </variant>
62
146
        <variant>
63
147
          <configItem>
64
148
            <name>alt-intl-unicode</name>
65
 
            <_description>USA - International (AltGr Unicode combining, alternative)</_description>
 
149
            <_description>English (US, international AltGr Unicode combining, alternative)</_description>
66
150
          </configItem>
67
151
        </variant>
68
152
        <variant>
69
153
          <configItem>
70
154
            <name>ats</name>
71
 
            <_description>USA - Atsina</_description>
 
155
            <_description>Atsina</_description>
72
156
            <!-- No ISO code in ISO639-2, only draft ISO693-3 -->
73
157
          </configItem>
74
158
        </variant>
75
159
        <variant>
76
160
          <configItem>
77
161
            <name>crd</name>
78
 
            <_description>USA - Couer D'alene Salish</_description>
 
162
            <_description>Couer D'alene Salish</_description>
79
163
            <languageList><iso639Id>crd</iso639Id></languageList>
80
164
          </configItem>
81
165
        </variant>
83
167
    </layout>
84
168
    <layout>
85
169
      <configItem>
 
170
        <name>pl</name>
 
171
        <_shortDescription>pl</_shortDescription>
 
172
        <_description>Polish</_description>
 
173
        <languageList><iso639Id>pol</iso639Id></languageList>
 
174
      </configItem>
 
175
      <variantList>
 
176
        <variant>
 
177
          <configItem>
 
178
            <name>intl</name>
 
179
            <_description>Polish (international with dead keys)</_description>
 
180
          </configItem>
 
181
        </variant>
 
182
      </variantList>
 
183
    </layout>
 
184
    <layout>
 
185
      <configItem>
86
186
        <name>ro</name>
87
 
        <_shortDescription>Rou</_shortDescription>
88
 
        <_description>Romania</_description>
 
187
        <_shortDescription>ro</_shortDescription>
 
188
        <_description>Romanian</_description>
89
189
        <languageList><iso639Id>rum</iso639Id></languageList>
90
190
      </configItem>
91
191
      <variantList>
92
192
        <variant>
93
193
          <configItem>
 
194
            <name>crh_dobruja</name>
 
195
            <_shortDescription>crh</_shortDescription>
 
196
            <_description>Crimean Tatar (Dobruja Q)</_description>
 
197
            <languageList>
 
198
              <iso639Id>crh</iso639Id>
 
199
            </languageList>
 
200
          </configItem>
 
201
        </variant>
 
202
        <variant>
 
203
          <configItem>
94
204
            <name>ergonomic</name>
95
 
            <_description>Romania - Ergonomic Touchtype</_description>
 
205
            <_description>Romanian (ergonomic Touchtype)</_description>
96
206
          </configItem>
97
207
        </variant>
98
208
      </variantList>
100
210
    <layout>
101
211
      <configItem>
102
212
        <name>rs</name>
103
 
        <_shortDescription>Srb</_shortDescription>
104
 
        <_description>Serbia</_description>
 
213
        <_shortDescription>sr</_shortDescription>
 
214
        <_description>Serbian</_description>
105
215
        <languageList><iso639Id>srp</iso639Id></languageList>
106
216
      </configItem>
107
217
      <variantList>
108
218
        <variant>
109
219
          <configItem>
110
220
            <name>combiningkeys</name>
111
 
            <_description>Serbia - Combining accents instead of dead keys</_description>
 
221
            <_description>Serbian (combining accents instead of dead keys)</_description>
112
222
          </configItem>
113
223
        </variant>
114
224
      </variantList>
116
226
    <layout>
117
227
      <configItem>
118
228
        <name>ru</name>
119
 
        <_shortDescription>Rus</_shortDescription>
120
 
        <_description>Russia</_description>
 
229
        <_shortDescription>ru</_shortDescription>
 
230
        <_description>Russian</_description>
121
231
      </configItem>
122
232
      <variantList>
123
233
        <variant>
124
234
          <configItem>
125
235
            <name>chu</name>
126
 
            <description>Russia - Church Slavonic</description>
 
236
            <description>Church Slavonic</description>
127
237
            <languageList><iso639Id>chu</iso639Id></languageList>
128
238
          </configItem>
129
239
        </variant>
 
240
        <variant>
 
241
          <configItem>
 
242
            <name>ruu</name>
 
243
            <_shortDescription>ru</_shortDescription>
 
244
            <_description>Russian (with UKR and BEL layout)</_description>
 
245
            <languageList><iso639Id>rus</iso639Id>
 
246
                          <iso639Id>ukr</iso639Id>
 
247
                          <iso639Id>bel</iso639Id></languageList>
 
248
          </configItem>
 
249
        </variant>
 
250
      </variantList>
 
251
    </layout>
 
252
    <layout>
 
253
      <configItem>
 
254
        <name>am</name>
 
255
        <_shortDescription>hy</_shortDescription>
 
256
        <_description>Armenian</_description>
 
257
        <languageList>
 
258
          <iso639Id>hye</iso639Id>
 
259
        </languageList>
 
260
      </configItem>
 
261
      <variantList>
 
262
        <variant>
 
263
          <configItem>
 
264
            <name>olpc-phonetic</name>
 
265
            <_description>Armenian (OLPC phonetic)</_description>
 
266
          </configItem>
 
267
        </variant>
130
268
      </variantList>
131
269
    </layout>
132
270
  </layoutList>