Author: barbier Date: 2006-09-29 22:19:41 +0000 (Fri, 29 Sep 2006) New Revision: 1808
Added: glibc-package/trunk/debian/patches/locale/cvs-iso3166.diff glibc-package/trunk/debian/patches/locale/iso3166-RS.diff glibc-package/trunk/debian/patches/localedata/locales-sr.diff Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/patches/localedata/first_weekday.diff glibc-package/trunk/debian/patches/series Log: Add sr_ME and sr_RS locales, and keep sr_CS for backward compatibility. Modified: glibc-package/trunk/debian/changelog =================================================================== --- glibc-package/trunk/debian/changelog 2006-09-28 09:31:17 UTC (rev 1807) +++ glibc-package/trunk/debian/changelog 2006-09-29 22:19:41 UTC (rev 1808) @@ -10,6 +10,9 @@ * Add hurd-i386/submitted-futimes.diff (fix touch on the Hurd) by Thomas Schwinge and Samuel Thibault. Closes: #388785. + [ Denis Barbier ] + * Add sr_ME and sr_RS locales, and keep sr_CS for backward compatibility. + -- Aurelien Jarno <[EMAIL PROTECTED]> Thu, 24 Aug 2006 21:04:20 +0200 glibc (2.3.6.ds1-4) unstable; urgency=low Added: glibc-package/trunk/debian/patches/locale/cvs-iso3166.diff =================================================================== --- glibc-package/trunk/debian/patches/locale/cvs-iso3166.diff (rev 0) +++ glibc-package/trunk/debian/patches/locale/cvs-iso3166.diff 2006-09-29 22:19:41 UTC (rev 1808) @@ -0,0 +1,23 @@ +# DP: Description: Update to latest CVS +# DP: Date: 2006-09-29 + +Index: locale/iso-3166.def +=================================================================== +--- locale/iso-3166.def.orig ++++ locale/iso-3166.def +@@ -6,6 +6,7 @@ + * http://www.gnu.org/software/libc/bugs.html and follow + * instructions there to file a bug report. + */ ++DEFINE_COUNTRY_CODE ("AALAND ISLANDS", AX, ALA, 248) + DEFINE_COUNTRY_CODE ("AFGHANISTAN", AF, AFG, 4) + DEFINE_COUNTRY_CODE ("ALBANIA", AL, ALB, 8) + DEFINE_COUNTRY_CODE ("ALGERIA", DZ, DZA, 12) +@@ -149,6 +150,7 @@ + DEFINE_COUNTRY_CODE ("MOLDOVA, REPUBLIC OF", MD, MDA, 498) + DEFINE_COUNTRY_CODE ("MONACO", MC, MCO, 492) + DEFINE_COUNTRY_CODE ("MONGOLIA", MN, MNG, 496) ++DEFINE_COUNTRY_CODE ("MONTENEGRO", ME, MNE, 499) + DEFINE_COUNTRY_CODE ("MONTSERRAT", MS, MSR, 500) + DEFINE_COUNTRY_CODE ("MOROCCO", MA, MAR, 504) + DEFINE_COUNTRY_CODE ("MOZAMBIQUE", MZ, MOZ, 508) Added: glibc-package/trunk/debian/patches/locale/iso3166-RS.diff =================================================================== --- glibc-package/trunk/debian/patches/locale/iso3166-RS.diff (rev 0) +++ glibc-package/trunk/debian/patches/locale/iso3166-RS.diff 2006-09-29 22:19:41 UTC (rev 1808) @@ -0,0 +1,18 @@ +See + http://www.iso.org/iso/en/prods-services/iso3166ma/03updates-on-iso-3166/nlv12-div.html + +Add SERBIA, it has not yet been committed upstream. +Keep SERBIA AND MONTENEGRO for a transition phase. + +Index: glibc-2.3.6/locale/iso-3166.def +=================================================================== +--- glibc-2.3.6.orig/locale/iso-3166.def ++++ glibc-2.3.6/locale/iso-3166.def +@@ -197,6 +197,7 @@ + DEFINE_COUNTRY_CODE ("SAO TOME AND PRINCIPE", ST, STP, 678) + DEFINE_COUNTRY_CODE ("SAUDI ARABIA", SA, SAU, 682) + DEFINE_COUNTRY_CODE ("SENEGAL", SN, SEN, 686) ++DEFINE_COUNTRY_CODE ("SERBIA", RS, SRB, 688) + DEFINE_COUNTRY_CODE ("SERBIA AND MONTENEGRO", CS, SCG, 891) + DEFINE_COUNTRY_CODE ("SEYCHELLES", SC, SYC, 690) + DEFINE_COUNTRY_CODE ("SIERRA LEONE", SL, SLE, 694) Modified: glibc-package/trunk/debian/patches/localedata/first_weekday.diff =================================================================== --- glibc-package/trunk/debian/patches/localedata/first_weekday.diff 2006-09-28 09:31:17 UTC (rev 1807) +++ glibc-package/trunk/debian/patches/localedata/first_weekday.diff 2006-09-29 22:19:41 UTC (rev 1808) @@ -1848,6 +1848,19 @@ first_weekday 2 first_workday 2 END LC_TIME +Index: localedata/locales/sr_ME +=================================================================== +--- localedata/locales/sr_ME.orig ++++ localedata/locales/sr_ME +@@ -110,7 +110,7 @@ + date_fmt "<U0025><U0061><U002c><U0020><U0025><U0065><U002E><U0020>/ + <U0025><U0062><U0020><U0025><U0059><U002E><U0020><U0020><U0025><U0048>/ + <U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U005A><U000A>" +-week 7;19971201;4 ++% week 7;19971201;4 + first_weekday 2 + first_workday 2 + END LC_TIME Index: localedata/locales/ss_ZA =================================================================== --- localedata/locales/ss_ZA.orig Added: glibc-package/trunk/debian/patches/localedata/locales-sr.diff =================================================================== --- glibc-package/trunk/debian/patches/localedata/locales-sr.diff (rev 0) +++ glibc-package/trunk/debian/patches/localedata/locales-sr.diff 2006-09-29 22:19:41 UTC (rev 1808) @@ -0,0 +1,266 @@ +CS has been splitted into ME and RS. +Upstream already added sr_ME into CVS. +Keep sr_CS for backward compatibility, and add a new sr_RS +locale which copies definitions from sr_CS. In the future, +sr_CS will be renamed into sr_RS. + +Index: glibc-2.3.6/localedata/SUPPORTED +=================================================================== +--- glibc-2.3.6.orig/localedata/SUPPORTED ++++ glibc-2.3.6/localedata/SUPPORTED +@@ -334,6 +334,10 @@ + sq_AL/ISO-8859-1 \ + sr_CS.UTF-8/UTF-8 \ + sr_CS/ISO-8859-5 \ ++sr_ME.UTF-8/UTF-8 \ ++sr_ME/ISO-8859-5 \ ++sr_RS.UTF-8/UTF-8 \ ++sr_RS/ISO-8859-5 \ + ss_ZA/UTF-8 \ + st_ZA.UTF-8/UTF-8 \ + st_ZA/ISO-8859-1 \ +Index: glibc-2.3.6/localedata/locales/sr_ME +=================================================================== +--- /dev/null ++++ glibc-2.3.6/localedata/locales/sr_ME +@@ -0,0 +1,140 @@ ++comment_char % ++escape_char / ++% ++% Serbian Language in Jekavian dialect Locale for Serbia and Montenegro ++% Source: sr_YU locale ++% Address: ++% ++% Contact: Danilo Segan ++% Email: [EMAIL PROTECTED] ++% Tel: +381 63 8626082 ++% Fax: none ++% Language: sr ++% Territory: CS ++% Revision: 1.0 ++% Date: 2003-08-13 ++% Application: general ++% Users: general ++% Charset: UTF-8, ISO-8859-5 ++% Distribution and use is free, also ++% for commercial purposes. ++% ++% TODO: ++% -- fix LC_COLLATE to work correctly for latin alphabet too ++% ++ ++LC_IDENTIFICATION ++title "Serbian locale for Serbia and Montenegro" ++source "sr_YU locale" ++address "" ++contact "Danilo Segan" ++email "[EMAIL PROTECTED]" ++tel "" ++fax "" ++language "Serbian" ++territory "Serbia and Montenegro" ++revision "1.1" ++date "2004-01-10" ++audience "general" ++application "" ++abbreviation "" ++% ++category i18n:1997;LC_IDENTIFICATION ++category i18n:1997;LC_CTYPE ++category i18n:1997;LC_COLLATE ++category i18n:1997;LC_MONETARY ++category i18n:1997;LC_NUMERIC ++category i18n:1997;LC_TIME ++category i18n:1997;LC_MESSAGES ++category i18n:1997;LC_PAPER ++category i18n:1997;LC_NAME ++category i18n:1997;LC_ADDRESS ++category i18n:1997;LC_TELEPHONE ++category i18n:1997;LC_MEASUREMENT ++END LC_IDENTIFICATION ++ ++LC_CTYPE ++copy "sr_CS" ++END LC_CTYPE ++ ++LC_COLLATE ++copy "sr_CS" ++END LC_COLLATE ++ ++LC_MONETARY ++copy "sr_CS" ++END LC_MONETARY ++ ++LC_NUMERIC ++copy "sr_CS" ++END LC_NUMERIC ++ ++LC_TIME ++abday "<U043D><U0435><U0434>";"<U043F><U043E><U043D>";/ ++ "<U0443><U0442><U043E>";"<U0441><U0440><U0438>";/ ++ "<U0447><U0435><U0442>";"<U043F><U0435><U0442>";/ ++ "<U0441><U0443><U0431>" ++day "<U043D><U0435><U0434><U0458><U0435><U0459><U0430>";/ ++ "<U043F><U043E><U043D><U0435><U0434><U0435><U0459><U0430><U043A>";/ ++ "<U0443><U0442><U043E><U0440><U0430><U043A>";/ ++ "<U0441><U0440><U0438><U0458><U0435><U0434><U0430>";/ ++ "<U0447><U0435><U0442><U0432><U0440><U0442><U0430><U043A>";/ ++ "<U043F><U0435><U0442><U0430><U043A>";/ ++ "<U0441><U0443><U0431><U043E><U0442><U0430>" ++abmon "<U0458><U0430><U043D>";"<U0444><U0435><U0431>";/ ++ "<U043C><U0430><U0440>";"<U0430><U043F><U0440>";/ ++ "<U043C><U0430><U0458>";"<U0458><U0443><U043D>";/ ++ "<U0458><U0443><U043B>";"<U0430><U0432><U0433>";/ ++ "<U0441><U0435><U043F>";"<U043E><U043A><U0442>";/ ++ "<U043D><U043E><U0432>";"<U0434><U0435><U0446>" ++mon "<U0458><U0430><U043D><U0443><U0430><U0440>";/ ++ "<U0444><U0435><U0431><U0440><U0443><U0430><U0440>";/ ++ "<U043C><U0430><U0440><U0442>";/ ++ "<U0430><U043F><U0440><U0438><U043B>";/ ++ "<U043C><U0430><U0458>";/ ++ "<U0458><U0443><U043D>";/ ++ "<U0458><U0443><U043B>";/ ++ "<U0430><U0432><U0433><U0443><U0441><U0442>";/ ++ "<U0441><U0435><U043F><U0442><U0435><U043C><U0431><U0430><U0440>";/ ++ "<U043E><U043A><U0442><U043E><U0431><U0430><U0440>";/ ++ "<U043D><U043E><U0432><U0435><U043C><U0431><U0430><U0440>";/ ++ "<U0434><U0435><U0446><U0435><U043C><U0431><U0430><U0440>" ++ ++d_t_fmt "<U0025><U0041><U002C><U0020><U0025><U0064><U002E><U0020>/ ++<U0025><U0042><U0020><U0025><U0059><U002E><U0020><U0025><U0054>/ ++<U0020><U0025><U005A>" ++d_fmt "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0059><U002E>" ++t_fmt "<U0025><U0054>" ++am_pm "";"" ++t_fmt_ampm "<U0025><U0054>" ++date_fmt "<U0025><U0061><U002c><U0020><U0025><U0065><U002E><U0020>/ ++<U0025><U0062><U0020><U0025><U0059><U002E><U0020><U0020><U0025><U0048>/ ++<U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U005A><U000A>" ++week 7;19971201;4 ++first_weekday 2 ++first_workday 2 ++END LC_TIME ++ ++LC_MESSAGES ++copy "sr_CS" ++END LC_MESSAGES ++ ++LC_PAPER ++copy "sr_CS" ++END LC_PAPER ++ ++LC_NAME ++copy "sr_CS" ++END LC_NAME ++ ++LC_ADDRESS ++copy "sr_CS" ++END LC_ADDRESS ++ ++LC_TELEPHONE ++copy "sr_CS" ++END LC_TELEPHONE ++ ++LC_MEASUREMENT ++copy "sr_CS" ++END LC_MEASUREMENT +Index: glibc-2.3.6/localedata/locales/sr_RS +=================================================================== +--- /dev/null ++++ glibc-2.3.6/localedata/locales/sr_RS +@@ -0,0 +1,95 @@ ++comment_char % ++escape_char / ++% ++% Serbian Language Locale for Serbia ++% Source: sr_YU locale ++% Address: ++% ++% Contact: Danilo Segan ++% Email: [EMAIL PROTECTED] ++% Tel: +381 63 8626082 ++% Fax: none ++% Language: sr ++% Territory: RS ++% Revision: 1.0 ++% Date: 2003-08-13 ++% Application: general ++% Users: general ++% Charset: UTF-8, ISO-8859-5 ++% Distribution and use is free, also ++% for commercial purposes. ++% ++ ++LC_IDENTIFICATION ++title "Serbian locale for Serbia" ++source "sr_YU locale" ++address "" ++contact "Danilo Segan" ++email "[EMAIL PROTECTED]" ++tel "" ++fax "" ++language "Serbian" ++territory "Serbia" ++revision "1.1" ++date "2004-01-10" ++audience "general" ++application "" ++abbreviation "" ++% ++category i18n:1997;LC_IDENTIFICATION ++category i18n:1997;LC_CTYPE ++category i18n:1997;LC_COLLATE ++category i18n:1997;LC_MONETARY ++category i18n:1997;LC_NUMERIC ++category i18n:1997;LC_TIME ++category i18n:1997;LC_MESSAGES ++category i18n:1997;LC_PAPER ++category i18n:1997;LC_NAME ++category i18n:1997;LC_ADDRESS ++category i18n:1997;LC_TELEPHONE ++category i18n:1997;LC_MEASUREMENT ++END LC_IDENTIFICATION ++ ++LC_CTYPE ++copy "sr_CS" ++END LC_CTYPE ++ ++LC_COLLATE ++copy "sr_CS" ++END LC_COLLATE ++ ++LC_MONETARY ++copy "sr_CS" ++END LC_MONETARY ++ ++LC_NUMERIC ++copy "sr_CS" ++END LC_NUMERIC ++ ++LC_TIME ++copy "sr_CS" ++END LC_TIME ++ ++LC_MESSAGES ++copy "sr_CS" ++END LC_MESSAGES ++ ++LC_PAPER ++copy "sr_CS" ++END LC_PAPER ++ ++LC_NAME ++copy "sr_CS" ++END LC_NAME ++ ++LC_ADDRESS ++copy "sr_CS" ++END LC_ADDRESS ++ ++LC_TELEPHONE ++copy "sr_CS" ++END LC_TELEPHONE ++ ++LC_MEASUREMENT ++copy "sr_CS" ++END LC_MEASUREMENT Modified: glibc-package/trunk/debian/patches/series =================================================================== --- glibc-package/trunk/debian/patches/series 2006-09-28 09:31:17 UTC (rev 1807) +++ glibc-package/trunk/debian/patches/series 2006-09-29 22:19:41 UTC (rev 1808) @@ -4,8 +4,10 @@ localedata/locale-eo_EO.diff -p1 localedata/locale-no_NO.diff -p0 localedata/locale-eu_FR.diff -p0 +locale/cvs-iso3166.diff -p0 locale/cvs-iso4217.diff -p0 locale/cvs-iso639.diff -p0 +locale/iso3166-RS.diff localedata/locale-ku_TR.diff -p0 #localedata/discard-dz_BT.diff # not needed when complex-collate is applied locale/complex-collate.diff @@ -35,6 +37,7 @@ localedata/locale-zh_TW.diff -p0 localedata/new-valencian-locale.diff localedata/locale-se_NO.diff +localedata/locales-sr.diff localedata/tailor-iso14651_t1.diff -p0 localedata/fix-lang.diff localedata/fix-unknown-symbols.diff -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]