Merge lp:~kelemeng/ubuntu/raring/langpack-locales/bug1128566 into lp:ubuntu/raring/langpack-locales

Proposed by Gabor Kelemen
Status: Merged
Merged at revision: 115
Proposed branch: lp:~kelemeng/ubuntu/raring/langpack-locales/bug1128566
Merge into: lp:ubuntu/raring/langpack-locales
Diff against target: 403 lines (+6/-364)
4 files modified
debian/changelog (+6/-1)
debian/patches/series (+0/-2)
debian/patches/ubuntu-la_AU.patch (+0/-179)
debian/patches/ubuntu-tlh_UK.patch (+0/-182)
To merge this branch: bzr merge lp:~kelemeng/ubuntu/raring/langpack-locales/bug1128566
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+148967@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks! Will merge with starting a new changelog, -5 already has been uploaded.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-02-04 16:32:41 +0000
3+++ debian/changelog 2013-02-18 01:26:20 +0000
4@@ -1,9 +1,14 @@
5 langpack-locales (2.13+git20120306-5) raring; urgency=low
6
7+ [ Gunnar Hjalmarsson ]
8 * debian/patches/ubuntu-bn-language.patch: Use the official name Bangla
9 for the language spoken in Bangladesh (LP: #991002, LP: #1070581).
10
11- -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com> Mon, 04 Feb 2013 17:32:38 +0100
12+ [ Gabor Kelemen ]
13+ * debian/patches/ubuntu-la_AU.patch, debian/patches/ubuntu-tlh_UK.patch:
14+ Drop support for Latin and Klingon (LP: #1128566)
15+
16+ -- Gabor Kelemen <kelemeng@ubuntu.com> Mon, 18 Feb 2013 02:18:16 +0100
17
18 langpack-locales (2.13+git20120306-4) raring; urgency=low
19
20
21=== modified file 'debian/patches/series'
22--- debian/patches/series 2013-02-02 09:29:50 +0000
23+++ debian/patches/series 2013-02-18 01:26:20 +0000
24@@ -27,8 +27,6 @@
25 ubuntu-en_CA-dateformat.patch
26 ubuntu-en_IE-am_pm.patch
27 ubuntu-eo_US.patch
28-ubuntu-la_AU.patch
29-ubuntu-tlh_UK.patch
30 ubuntu-sd_PK.patch
31 ubuntu-en_ZA-decimal.patch
32 ubuntu-ug_CN.patch
33
34=== removed file 'debian/patches/ubuntu-la_AU.patch'
35--- debian/patches/ubuntu-la_AU.patch 2011-06-17 07:06:02 +0000
36+++ debian/patches/ubuntu-la_AU.patch 1970-01-01 00:00:00 +0000
37@@ -1,179 +0,0 @@
38-# Description: Add la_AU locale
39-# Ubuntu: https://launchpad.net/bugs/234105
40-# Upstream: http://sourceware.org/bugzilla/show_bug.cgi?id=6583 (rejected)
41-Index: langpack-locales/locales/la_AU
42-===================================================================
43---- /dev/null 1970-01-01 00:00:00.000000000 +0000
44-+++ langpack-locales/locales/la_AU 2011-06-17 08:47:13.534806166 +0200
45-@@ -0,0 +1,159 @@
46-+escape_char /
47-+comment_char %
48-+
49-+% Latin locale based on the English language locale for Australia
50-+% Source:
51-+% Address:
52-+% Contact: Robert Collins
53-+% Email: robert.collins@ubuntu.com
54-+% Tel:
55-+% Fax:
56-+% Language: la
57-+% Revision: 1.0
58-+% Date: 2008-05-23
59-+% Users: general
60-+% Repertoiremap: mnemonic.ds
61-+% Charset: ISO-8859-1
62-+% Distribution and use is free, also
63-+% for commercial purposes.
64-+
65-+LC_IDENTIFICATION
66-+title "Latin locale based on the English locale for Australia"
67-+source ""
68-+address ""
69-+contact "Robert Collins"
70-+email "bug-glibc-locales@gnu.org"
71-+tel ""
72-+fax ""
73-+language "Latin"
74-+revision "1.0"
75-+date "2000-06-29"
76-+%
77-+category "la_AU:2000";LC_IDENTIFICATION
78-+category "la_AU:2000";LC_CTYPE
79-+category "la_AU:2000";LC_COLLATE
80-+category "la_AU:2000";LC_TIME
81-+category "la_AU:2000";LC_NUMERIC
82-+category "la_AU:2000";LC_MONETARY
83-+category "la_AU:2000";LC_MESSAGES
84-+category "la_AU:2000";LC_PAPER
85-+category "la_AU:2000";LC_NAME
86-+category "la_AU:2000";LC_ADDRESS
87-+category "la_AU:2000";LC_TELEPHONE
88-+
89-+END LC_IDENTIFICATION
90-+
91-+LC_CTYPE
92-+copy "en_GB"
93-+END LC_CTYPE
94-+
95-+LC_COLLATE
96-+copy "iso14651_t1"
97-+END LC_COLLATE
98-+
99-+LC_MONETARY
100-+int_curr_symbol "<U0041><U0055><U0044><U0020>"
101-+currency_symbol "<U0024>"
102-+mon_decimal_point "<U002E>"
103-+mon_thousands_sep "<U002C>"
104-+mon_grouping 3;3
105-+positive_sign ""
106-+negative_sign "<U002D>"
107-+int_frac_digits 2
108-+frac_digits 2
109-+p_cs_precedes 1
110-+p_sep_by_space 0
111-+n_cs_precedes 1
112-+n_sep_by_space 0
113-+p_sign_posn 1
114-+n_sign_posn 1
115-+END LC_MONETARY
116-+
117-+LC_NUMERIC
118-+decimal_point "<U002E>"
119-+thousands_sep "<U002C>"
120-+grouping 3;3
121-+END LC_NUMERIC
122-+
123-+LC_TIME
124-+abday "<U0053><U0075><U006E>";"<U004D><U006F><U006E>";/
125-+ "<U0054><U0075><U0065>";"<U0057><U0065><U0064>";/
126-+ "<U0054><U0068><U0075>";"<U0046><U0072><U0069>";/
127-+ "<U0053><U0061><U0074>"
128-+day "<U0053><U0075><U006E><U0064><U0061><U0079>";/
129-+ "<U004D><U006F><U006E><U0064><U0061><U0079>";/
130-+ "<U0054><U0075><U0065><U0073><U0064><U0061><U0079>";/
131-+ "<U0057><U0065><U0064><U006E><U0065><U0073><U0064><U0061><U0079>";/
132-+ "<U0054><U0068><U0075><U0072><U0073><U0064><U0061><U0079>";/
133-+ "<U0046><U0072><U0069><U0064><U0061><U0079>";/
134-+ "<U0053><U0061><U0074><U0075><U0072><U0064><U0061><U0079>"
135-+abmon "<U004A><U0061><U006E>";"<U0046><U0065><U0062>";/
136-+ "<U004D><U0061><U0072>";"<U0041><U0070><U0072>";/
137-+ "<U004D><U0061><U0079>";"<U004A><U0075><U006E>";/
138-+ "<U004A><U0075><U006C>";"<U0041><U0075><U0067>";/
139-+ "<U0053><U0065><U0070>";"<U004F><U0063><U0074>";/
140-+ "<U004E><U006F><U0076>";"<U0044><U0065><U0063>"
141-+mon "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/
142-+ "<U0046><U0065><U0062><U0072><U0075><U0061><U0072><U0079>";/
143-+ "<U004D><U0061><U0072><U0063><U0068>";/
144-+ "<U0041><U0070><U0072><U0069><U006C>";/
145-+ "<U004D><U0061><U0079>";/
146-+ "<U004A><U0075><U006E><U0065>";/
147-+ "<U004A><U0075><U006C><U0079>";/
148-+ "<U0041><U0075><U0067><U0075><U0073><U0074>";/
149-+ "<U0053><U0065><U0070><U0074><U0065><U006D><U0062><U0065><U0072>";/
150-+ "<U004F><U0063><U0074><U006F><U0062><U0065><U0072>";/
151-+ "<U004E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";/
152-+ "<U0044><U0065><U0063><U0065><U006D><U0062><U0065><U0072>"
153-+d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
154-+d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
155-+t_fmt "<U0025><U0054>"
156-+am_pm "<U0041><U004D>";"<U0050><U004D>"
157-+t_fmt_ampm "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
158-+<U0025><U0070>"
159-+date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
160-+<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
161-+<U0025><U005A><U0020><U0025><U0059>"
162-+% FIXME: found in CLDR
163-+first_weekday 1
164-+END LC_TIME
165-+
166-+LC_MESSAGES
167-+yesexpr "<U005E><U005B><U0079><U0059><U005D><U002E><U002A>"
168-+noexpr "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
169-+END LC_MESSAGES
170-+
171-+LC_PAPER
172-+% FIXME
173-+height 297
174-+% FIXME
175-+width 210
176-+END LC_PAPER
177-+
178-+LC_TELEPHONE
179-+tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
180-+<U006C>"
181-+int_prefix "<U0036><U0031>"
182-+int_select "<U0030><U0030><U0031><U0031>"
183-+END LC_TELEPHONE
184-+
185-+LC_MEASUREMENT
186-+% FIXME
187-+measurement 1
188-+END LC_MEASUREMENT
189-+
190-+LC_NAME
191-+name_fmt "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
192-+<U0025><U006D><U0025><U0074><U0025><U0066>"
193-+END LC_NAME
194-+
195-+LC_ADDRESS
196-+postal_fmt "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
197-+<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/
198-+<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
199-+<U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
200-+<U004E><U0025><U0063><U0025><U004E>"
201-+country_ab2 "<U0041><U0055>"
202-+country_ab3 "<U0041><U0055><U0053>"
203-+country_num 036
204-+END LC_ADDRESS
205-Index: langpack-locales/SUPPORTED
206-===================================================================
207---- langpack-locales.orig/SUPPORTED 2011-06-17 08:47:00.000000000 +0200
208-+++ langpack-locales/SUPPORTED 2011-06-17 08:47:28.834806268 +0200
209-@@ -285,6 +285,7 @@
210- kw_GB.UTF-8/UTF-8 \
211- kw_GB/ISO-8859-1 \
212- ky_KG/UTF-8 \
213-+la_AU.UTF-8/UTF-8 \
214- lb_LU/UTF-8 \
215- lg_UG.UTF-8/UTF-8 \
216- lg_UG/ISO-8859-10 \
217
218=== removed file 'debian/patches/ubuntu-tlh_UK.patch'
219--- debian/patches/ubuntu-tlh_UK.patch 2011-11-16 07:43:16 +0000
220+++ debian/patches/ubuntu-tlh_UK.patch 1970-01-01 00:00:00 +0000
221@@ -1,182 +0,0 @@
222-# Description: Add tlh_GB locale
223-# Ubuntu: https://launchpad.net/bugs/516359
224-Index: langpack-locales/locales/tlh_GB
225-===================================================================
226---- /dev/null 1970-01-01 00:00:00.000000000 +0000
227-+++ langpack-locales/locales/tlh_GB 2011-11-16 08:42:37.741335776 +0100
228-@@ -0,0 +1,163 @@
229-+escape_char /
230-+comment_char %
231-+
232-+% Klingon language locale for Britain based on the English locale
233-+% Source:
234-+% Address:
235-+% Contact: Robert Collins
236-+% Email: robert.collins@ubuntu.com
237-+% Tel:
238-+% Fax:
239-+% Language: tlh
240-+% Territory: GB
241-+% Revision: 1.0
242-+% Date: 2010-02-03
243-+% Users: general
244-+% Repertoiremap: mnemonic.ds
245-+% Charset: ISO-8859-1
246-+% Distribution and use is free, also
247-+% for commercial purposes.
248-+
249-+LC_IDENTIFICATION
250-+title "Klingon locale for Britain based on the English locale"
251-+source ""
252-+address ""
253-+contact "Robert Collins"
254-+email "bug-glibc-locales@gnu.org"
255-+tel ""
256-+fax ""
257-+language "Klingon"
258-+territory "Great Britain"
259-+revision "1.0"
260-+date "2000-02-03"
261-+%
262-+category "tlh_GB:2000";LC_IDENTIFICATION
263-+category "tlh_GB:2000";LC_CTYPE
264-+category "tlh_GB:2000";LC_COLLATE
265-+category "tlh_GB:2000";LC_TIME
266-+category "tlh_GB:2000";LC_NUMERIC
267-+category "tlh_GB:2000";LC_MONETARY
268-+category "tlh_GB:2000";LC_MESSAGES
269-+category "tlh_GB:2000";LC_PAPER
270-+category "tlh_GB:2000";LC_NAME
271-+category "tlh_GB:2000";LC_ADDRESS
272-+category "tlh_GB:2000";LC_TELEPHONE
273-+
274-+END LC_IDENTIFICATION
275-+
276-+LC_CTYPE
277-+copy "i18n"
278-+
279-+translit_start
280-+include "translit_combining";""
281-+translit_end
282-+END LC_CTYPE
283-+
284-+LC_COLLATE
285-+% Copy the template from ISO/IEC 14651
286-+copy "iso14651_t1"
287-+END LC_COLLATE
288-+
289-+LC_MONETARY
290-+int_curr_symbol "<U0047><U0042><U0050><U0020>"
291-+currency_symbol "<U00A3>"
292-+mon_decimal_point "<U002E>"
293-+mon_thousands_sep "<U002C>"
294-+mon_grouping 3;3
295-+positive_sign ""
296-+negative_sign "<U002D>"
297-+int_frac_digits 2
298-+frac_digits 2
299-+p_cs_precedes 1
300-+p_sep_by_space 0
301-+n_cs_precedes 1
302-+n_sep_by_space 0
303-+p_sign_posn 1
304-+n_sign_posn 1
305-+END LC_MONETARY
306-+
307-+LC_NUMERIC
308-+decimal_point "<U002E>"
309-+thousands_sep "<U002C>"
310-+grouping 3;3
311-+END LC_NUMERIC
312-+
313-+LC_TIME
314-+abday "<U0053><U0075><U006E>";"<U004D><U006F><U006E>";/
315-+ "<U0054><U0075><U0065>";"<U0057><U0065><U0064>";/
316-+ "<U0054><U0068><U0075>";"<U0046><U0072><U0069>";/
317-+ "<U0053><U0061><U0074>"
318-+day "<U0053><U0075><U006E><U0064><U0061><U0079>";/
319-+ "<U004D><U006F><U006E><U0064><U0061><U0079>";/
320-+ "<U0054><U0075><U0065><U0073><U0064><U0061><U0079>";/
321-+ "<U0057><U0065><U0064><U006E><U0065><U0073><U0064><U0061><U0079>";/
322-+ "<U0054><U0068><U0075><U0072><U0073><U0064><U0061><U0079>";/
323-+ "<U0046><U0072><U0069><U0064><U0061><U0079>";/
324-+ "<U0053><U0061><U0074><U0075><U0072><U0064><U0061><U0079>"
325-+abmon "<U004A><U0061><U006E>";"<U0046><U0065><U0062>";/
326-+ "<U004D><U0061><U0072>";"<U0041><U0070><U0072>";/
327-+ "<U004D><U0061><U0079>";"<U004A><U0075><U006E>";/
328-+ "<U004A><U0075><U006C>";"<U0041><U0075><U0067>";/
329-+ "<U0053><U0065><U0070>";"<U004F><U0063><U0074>";/
330-+ "<U004E><U006F><U0076>";"<U0044><U0065><U0063>"
331-+mon "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/
332-+ "<U0046><U0065><U0062><U0072><U0075><U0061><U0072><U0079>";/
333-+ "<U004D><U0061><U0072><U0063><U0068>";/
334-+ "<U0041><U0070><U0072><U0069><U006C>";/
335-+ "<U004D><U0061><U0079>";/
336-+ "<U004A><U0075><U006E><U0065>";/
337-+ "<U004A><U0075><U006C><U0079>";/
338-+ "<U0041><U0075><U0067><U0075><U0073><U0074>";/
339-+ "<U0053><U0065><U0070><U0074><U0065><U006D><U0062><U0065><U0072>";/
340-+ "<U004F><U0063><U0074><U006F><U0062><U0065><U0072>";/
341-+ "<U004E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";/
342-+ "<U0044><U0065><U0063><U0065><U006D><U0062><U0065><U0072>"
343-+d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
344-+d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
345-+t_fmt "<U0025><U0054>"
346-+am_pm "";""
347-+t_fmt_ampm ""
348-+date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
349-+<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
350-+<U0025><U005A><U0020><U0025><U0059>"
351-+week 7;19971130;4
352-+first_weekday 2
353-+first_workday 2
354-+END LC_TIME
355-+
356-+LC_MESSAGES
357-+yesexpr "<U005E><U005B><U0079><U0059><U005D><U002E><U002A>"
358-+noexpr "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
359-+END LC_MESSAGES
360-+
361-+LC_PAPER
362-+height 297
363-+width 210
364-+END LC_PAPER
365-+
366-+LC_TELEPHONE
367-+tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
368-+<U006C>"
369-+tel_dom_fmt "<U0025><U0041><U0020><U0025><U006C>"
370-+int_select "<U0030><U0030>"
371-+int_prefix "<U0034><U0034>"
372-+END LC_TELEPHONE
373-+
374-+LC_MEASUREMENT
375-+measurement 1
376-+END LC_MEASUREMENT
377-+
378-+LC_NAME
379-+copy "en_US"
380-+END LC_NAME
381-+
382-+LC_ADDRESS
383-+postal_fmt "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
384-+<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/
385-+<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
386-+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
387-+<U004E><U0025><U0063><U0025><U004E>"
388-+country_ab2 "<U0047><U0042>"
389-+country_ab3 "<U0047><U0042><U0052>"
390-+country_num 826
391-+END LC_ADDRESS
392-Index: langpack-locales/SUPPORTED
393-===================================================================
394---- langpack-locales.orig/SUPPORTED 2011-11-16 08:42:36.289335705 +0100
395-+++ langpack-locales/SUPPORTED 2011-11-16 08:42:37.741335776 +0100
396-@@ -405,6 +405,7 @@
397- tk_TM/UTF-8 \
398- tl_PH.UTF-8/UTF-8 \
399- tl_PH/ISO-8859-1 \
400-+tlh_GB.UTF-8/UTF-8 \
401- tn_ZA/UTF-8 \
402- tr_CY.UTF-8/UTF-8 \
403- tr_CY/ISO-8859-9 \

Subscribers

People subscribed via source and target branches

to all changes: