r1114 - glibc-package/trunk/debian/patches
Author: barbier
Date: 2006-01-15 22:33:26 +0000 (Sun, 15 Jan 2006)
New Revision: 1114
Removed:
glibc-package/trunk/debian/patches/locale-sr_CS.diff
glibc-package/trunk/debian/patches/locales-supported.diff
glibc-package/trunk/debian/patches/translation-fr.diff
Modified:
glibc-package/trunk/debian/patches/series
Log:
Remove obsolete patches:
* locale-sr_CS.diff superseeded by localedata/cvs-localedata.diff
* locales-supported.diff superseeded by localedata/supported.diff
* translation-fr.diff is rejected
Deleted: glibc-package/trunk/debian/patches/locale-sr_CS.diff
===================================================================
--- glibc-package/trunk/debian/patches/locale-sr_CS.diff 2006-01-15 22:24:06 UTC (rev 1113)
+++ glibc-package/trunk/debian/patches/locale-sr_CS.diff 2006-01-15 22:33:26 UTC (rev 1114)
@@ -1,526 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Bug#254993: Please add the sr_CS and sr_CS@cyrillic locales
-# DP: Related bugs: #254993
-# DP: Dpatch author: GOTO Masanori <gotom@debian.org>
-# DP: Patch author: Christian Perrier <bubulle@debian.org>
-# DP: Upstream status: Not submitted
-# DP: Status Details:
-# DP: Date: 2004-07-31
-
-PATCHLEVEL=0
-
-if [ $# -ne 2 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -d "$2" -f --no-backup-if-mismatch -p$PATCHLEVEL < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p$PATCHLEVEL < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-# append the patch here and adjust the -p? flag in the patch calls.
---- localedata/locales/sr_CS 2004-06-26 20:05:20.000000000 +0900
-+++ localedata/locales/sr_CS 2004-07-31 18:00:21.000000000 +0900
-@@ -0,0 +1,330 @@
-+comment_char %
-+escape_char /
-+%
-+% Serbian Language Locale for Serbia and Montenegro
-+% derived from sr_YU
-+% Language: sr
-+% Territory: CS
-+% Application: general
-+% Users: general
-+% Repertoiremap: mnemonic.ds
-+% Charset: ISO-8859-2
-+% Distribution and use is free, also
-+% for commercial purposes.
-+
-+LC_IDENTIFICATION
-+title "Serbian locale for Serbia and Montenegro"
-+source "Christian Perrier and the Debian Project"
-+address ""
-+contact "Christian Perrier"
-+email "bubulle@debian.org"
-+tel ""
-+fax ""
-+language "Serbian"
-+territory "Serbia and Montenegro"
-+revision "0.1"
-+date "2004-06-15"
-+%
-+category "sr_CS:2000";LC_IDENTIFICATION
-+category "sr_CS:2000";LC_CTYPE
-+category "sr_CS:2000";LC_COLLATE
-+category "sr_CS:2000";LC_TIME
-+category "sr_CS:2000";LC_NUMERIC
-+category "sr_CS:2000";LC_MONETARY
-+category "sr_CS:2000";LC_MESSAGES
-+category "sr_CS:2000";LC_PAPER
-+category "sr_CS:2000";LC_NAME
-+category "sr_CS:2000";LC_ADDRESS
-+category "sr_CS:2000";LC_TELEPHONE
-+
-+END LC_IDENTIFICATION
-+
-+LC_COLLATE
-+copy "iso14651_t1"
-+
-+% a b c c' c< d dz< d// e f g h i j k l lj m n nj o p
-+% q r s s< t u v w x y z z<
-+
-+collating-symbol <d-z-sh>
-+collating-element <D-Z<> from "<U0044><U017D>"
-+collating-element <D-z<> from "<U0044><U017E>"
-+collating-element <d-Z<> from "<U0064><U017D>"
-+collating-element <d-z<> from "<U0064><U017E>"
-+collating-symbol <l-j-sh>
-+collating-element <L-J> from "<U004C><U004A>"
-+collating-element <L-j> from "<U004C><U006A>"
-+collating-element <l-J> from "<U006C><U004A>"
-+collating-element <l-j> from "<U006C><U006A>"
-+collating-symbol <n-j-sh>
-+collating-element <N-J> from "<U004E><U004A>"
-+collating-element <N-j> from "<U004E><U006A>"
-+collating-element <n-J> from "<U006E><U004A>"
-+collating-element <n-j> from "<U006E><U006A>"
-+collating-symbol <cacute>
-+collating-symbol <ccaron>
-+collating-symbol <d//>
-+collating-symbol <scaron>
-+collating-symbol <zcaron>
-+
-+collating-symbol <CAP-MIN>
-+collating-symbol <MIN-CAP>
-+
-+reorder-after <MIN>
-+<MIN-CAP>
-+reorder-after <CAP>
-+<CAP-MIN>
-+
-+reorder-after <c>
-+<cacute>
-+<ccaron>
-+<d>
-+<d-z-sh>
-+<d//>
-+reorder-after <l>
-+<l-j-sh>
-+reorder-after <n>
-+<n-j-sh>
-+reorder-after <s>
-+<scaron>
-+reorder-after <z>
-+<zcaron>
-+
-+reorder-after <U0063>
-+<U0107> <cacute>;<PCT>;<MIN>;IGNORE
-+<U010D> <ccaron>;<PCT>;<MIN>;IGNORE
-+reorder-after <U0043>
-+<U0106> <cacute>;<PCT>;<CAP>;IGNORE
-+<U010C> <ccaron>;<PCT>;<CAP>;IGNORE
-+
-+reorder-after <U0064>
-+<d-z<> <d-z-sh>;<PCT>;<MIN>;IGNORE
-+<d-Z<> <d-z-sh>;<PCT>;<MIN-CAP>;IGNORE
-+<U0111> <d//>;<PCT>;<MIN>;IGNORE
-+reorder-after <U0044>
-+<D-Z<> <d-z-sh>;<PCT>;<CAP>;IGNORE
-+<D-z<> <d-z-sh>;<PCT>;<CAP-MIN>;IGNORE
-+<U0110> <d//>;<PCT>;<CAP>;IGNORE
-+
-+reorder-after <U006C>
-+<l-j> <l-j-sh>;<PCT>;<MIN>;IGNORE
-+<l-J> <l-j-sh>;<PCT>;<MIN-CAP>;IGNORE
-+reorder-after <U004C>
-+<L-J> <l-j-sh>;<PCT>;<CAP>;IGNORE
-+<L-j> <l-j-sh>;<PCT>;<CAP-MIN>;IGNORE
-+
-+reorder-after <U006E>
-+<n-j> <n-j-sh>;<PCT>;<MIN>;IGNORE
-+<n-J> <n-j-sh>;<PCT>;<MIN-CAP>;IGNORE
-+reorder-after <U004E>
-+<N-J> <n-j-sh>;<PCT>;<CAP>;IGNORE
-+<N-j> <n-j-sh>;<PCT>;<CAP-MIN>;IGNORE
-+
-+reorder-after <U0073>
-+<U0161> <scaron>;<PCT>;<MIN>;IGNORE
-+reorder-after <U0053>
-+<U0160> <scaron>;<PCT>;<CAP>;IGNORE
-+
-+reorder-after <U007A>
-+<U017E> <zcaron>;<PCT>;<MIN>;IGNORE
-+reorder-after <U005A>
-+<U017D> <zcaron>;<PCT>;<CAP>;IGNORE
-+
-+reorder-end
-+END LC_COLLATE
-+
-+LC_CTYPE
-+copy "i18n"
-+translit_start
-+include "translit_combining";""
-+
-+% cyrillic -> latin
-+<U0452> "<U0111>";"<U0064><U006A>" % d-
-+<U0453> "<U0067><U006A>" % gj
-+<U0455> "<U0064><U007A>" % dz
-+<U0458> "<U006A>" % j
-+<U0459> "<U006C><U006A>" % lj
-+<U045A> "<U006e><U006A>" % nj
-+<U045B> "<U0107>";"<U0063>" % c'
-+<U045C> "<U006B><U006A>" % kj
-+<U045F> "<U0064><U017E>";"<U0064><U007A>" % dz<
-+
-+<U0402> "<U0110>";"<U0044><U006A>" % D-
-+<U0403> "<U0047><U006A>" % Gj
-+<U0405> "<U0044><U007A>" % Dz
-+<U0408> "<U004A>" % J
-+<U0409> "<U004C><U006A>" % Lj
-+<U040A> "<U004e><U006A>" % Nj
-+<U040B> "<U0106>";"<U0043>" % C'
-+<U040C> "<U004B><U006A>" % Kj
-+<U040F> "<U0044><U017E>";"<U0064><U007A>" % Dz<
-+
-+<U0430> "<U0061>"
-+<U0431> "<U0062>"
-+<U0446> "<U0063>"
-+<U0434> "<U0064>"
-+<U0435> "<U0065>"
-+<U0444> "<U0066>"
-+<U0433> "<U0067>"
-+<U0445> "<U0068>"
-+<U0438> "<U0069>"
-+<U043A> "<U006B>"
-+<U043B> "<U006C>"
-+<U043C> "<U006D>"
-+<U043D> "<U006E>"
-+<U043E> "<U006F>"
-+<U043F> "<U0070>"
-+<U0440> "<U0072>"
-+<U0441> "<U0073>"
-+<U0442> "<U0074>"
-+<U0443> "<U0075>"
-+<U0432> "<U0076>"
-+<U0437> "<U007A>"
-+<U0436> "<U017E>";"<U007A>" % z<
-+<U0448> "<U0161>";"<U0073>" % s<
-+<U0447> "<U010D>";"<U0063>" % c<
-+
-+<U0410> "<U0041>"
-+<U0411> "<U0042>"
-+<U0426> "<U0043>"
-+<U0414> "<U0044>"
-+<U0415> "<U0045>"
-+<U0424> "<U0046>"
-+<U0413> "<U0047>"
-+<U0425> "<U0048>"
-+<U0418> "<U0049>"
-+<U041A> "<U004B>"
-+<U041B> "<U004C>"
-+<U041C> "<U004D>"
-+<U041D> "<U004E>"
-+<U041E> "<U004F>"
-+<U041F> "<U0050>"
-+<U0420> "<U0052>"
-+<U0421> "<U0053>"
-+<U0422> "<U0054>"
-+<U0423> "<U0055>"
-+<U0412> "<U0056>"
-+<U0417> "<U005A>"
-+<U0416> "<U017D>";"<U005A>" % z<
-+<U0428> "<U0160>";"<U0053>" % s<
-+<U0427> "<U010C>";"<U0063>" % c<
-+
-+translit_end
-+END LC_CTYPE
-+
-+LC_MESSAGES
-+yesexpr "<U005E><U005B><U0064><U0044><U0079><U0059><U0031><U005D><U002E><U002A>"
-+noexpr "<U005E><U005B><U006E><U004E><U0030><U005D><U002E><U002A>"
-+END LC_MESSAGES
-+
-+LC_MONETARY
-+% "YUM"
-+% This is the "New Yugoslavian Dinar"
-+% YUN is *wrong* as this is the "convertible" "New Yugoslavian Dinar"
-+% YUD is the "old" Yugoslavian Dinar
-+% Please note that Montenegro uses EUR only. YUM is OK
-+% for Serbia and Kosovo
-+% There is NO Serbian Dinar
-+int_curr_symbol "<U0059><U0055><U004D><U0020>"
-+% "din"
-+currency_symbol "<U0064><U0069><U006E>"
-+mon_decimal_point "<U002C>"
-+mon_thousands_sep "<U0020>"
-+mon_grouping 3;3
-+positive_sign ""
-+negative_sign "<U002D>"
-+int_frac_digits 0
-+frac_digits 0
-+p_cs_precedes 1
-+p_sep_by_space 1
-+n_cs_precedes 1
-+n_sep_by_space 1
-+p_sign_posn 1
-+n_sign_posn 1
-+END LC_MONETARY
-+
-+LC_NUMERIC
-+decimal_point "<U002C>"
-+thousands_sep ""
-+grouping 0;0
-+END LC_NUMERIC
-+
-+LC_TIME
-+
-+abday "<U006E><U0065><U0064>";"<U0070><U006F><U006E>";/
-+ "<U0075><U0074><U006F>";"<U0073><U0072><U0065>";/
-+ "<U010D><U0065><U0074>";"<U0070><U0065><U0074>";/
-+ "<U0073><U0075><U0062>"
-+day "<U006E><U0065><U0064><U0065><U006C><U006A><U0061>";/
-+ "<U0070><U006F><U006E><U0065><U0064><U0065><U006C><U006A><U0061><U006B>";/
-+ "<U0075><U0074><U006F><U0072><U0061><U006B>";/
-+ "<U0073><U0072><U0065><U0064><U0061>";/
-+ "<U010D><U0065><U0074><U0076><U0072><U0074><U0061><U006B>";/
-+ "<U0070><U0065><U0074><U0061><U006B>";/
-+ "<U0073><U0075><U0062><U006F><U0074><U0061>"
-+abmon "<U006A><U0061><U006E>";"<U0066><U0065><U0062>";/
-+ "<U006D><U0061><U0072>";"<U0061><U0070><U0072>";/
-+ "<U006D><U0061><U006A>";"<U006A><U0075><U006E>";/
-+ "<U006A><U0075><U006C>";"<U0061><U0076><U0067>";/
-+ "<U0073><U0065><U0070>";"<U006F><U006B><U0074>";/
-+ "<U006E><U006F><U0076>";"<U0064><U0065><U0063>"
-+mon "<U006A><U0061><U006E><U0075><U0061><U0072>";/
-+ "<U0066><U0065><U0062><U0072><U0075><U0061><U0072>";/
-+ "<U006D><U0061><U0072><U0074>";/
-+ "<U0061><U0070><U0072><U0069><U006C>";/
-+ "<U006D><U0061><U006A>";/
-+ "<U006A><U0075><U006E><U0069>";/
-+ "<U006A><U0075><U006C><U0069>";/
-+ "<U0061><U0076><U0067><U0075><U0073><U0074>";/
-+ "<U0073><U0065><U0070><U0074><U0065><U006D><U0062><U0061><U0072>";/
-+ "<U006F><U006B><U0074><U006F><U0062><U0061><U0072>";/
-+ "<U006E><U006F><U0076><U0065><U006D><U0062><U0061><U0072>";/
-+ "<U0064><U0065><U0063><U0065><U006D><U0062><U0061><U0072>"
-+d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
-+d_fmt "<U0025><U0064><U002D><U0025><U006D><U002D><U0025><U0059><U002E>"
-+t_fmt "<U0025><U0054>"
-+am_pm "";""
-+t_fmt_ampm ""
-+date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
-+<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
-+<U0025><U005A><U0020><U0025><U0059>"
-+END LC_TIME
-+
-+LC_PAPER
-+% FIXME
-+height 297
-+% FIXME
-+width 210
-+END LC_PAPER
-+
-+LC_TELEPHONE
-+tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
-+<U006C>"
-+% 381?
-+int_prefix "<U0033><U0038><U0031>"
-+END LC_TELEPHONE
-+
-+LC_MEASUREMENT
-+% FIXME
-+measurement 1
-+END LC_MEASUREMENT
-+
-+LC_NAME
-+% "%d%t%g%t%m%T%f"
-+name_fmt "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
-+<U0025><U006D><U0025><U0074><U0025><U0066>"
-+END LC_NAME
-+
-+LC_ADDRESS
-+% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N"
-+postal_fmt "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
-+<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/
-+<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
-+<U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
-+<U004E><U0025><U0063><U0025><U004E>"
-+% "CS"
-+country_ab2 "<U0043><U0053>"
-+% "SCG"
-+country_ab3 "<U0053><U0043><U0047>"
-+% same as former Yugoslavia
-+country_num 891
-+END LC_ADDRESS
---- localedata/locales/sr_CS@cyrillic 2004-06-26 20:05:20.000000000 +0900
-+++ localedata/locales/sr_CS@cyrillic 2004-07-31 18:00:25.000000000 +0900
-@@ -0,0 +1,140 @@
-+comment_char %
-+escape_char /
-+%
-+% Serbian Language Locale for Serbia and Montenegro
-+% derived from sr_YU@cyrillic
-+% Language: sr
-+% Territory: CS
-+% Application: general
-+% Users: general
-+% Repertoiremap: mnemonic.ds
-+% Charset: ISO-8859-5
-+% Distribution and use is free, also
-+% for commercial purposes.
-+
-+LC_IDENTIFICATION
-+title "Serbian locale for Serbia and Montenegro - cyrillic variant"
-+source "Christian Perrier and the Debian Project"
-+address ""
-+contact "Christian Perrier"
-+email "bubulle@debian.org"
-+tel ""
-+fax ""
-+language "Serbian"
-+territory "Serbia and Montenegro"
-+revision "0.1"
-+date "2004-06-15"
-+%
-+category "sr_CS@cyrillic:2000";LC_IDENTIFICATION
-+category "sr_CS@cyrillic:2000";LC_CTYPE
-+category "sr_CS@cyrillic:2000";LC_COLLATE
-+category "sr_CS@cyrillic:2000";LC_TIME
-+category "sr_CS@cyrillic:2000";LC_NUMERIC
-+category "sr_CS@cyrillic:2000";LC_MONETARY
-+category "sr_CS@cyrillic:2000";LC_MESSAGES
-+category "sr_CS@cyrillic:2000";LC_PAPER
-+category "sr_CS@cyrillic:2000";LC_NAME
-+category "sr_CS@cyrillic:2000";LC_ADDRESS
-+category "sr_CS@cyrillic:2000";LC_TELEPHONE
-+
-+END LC_IDENTIFICATION
-+
-+LC_COLLATE
-+copy "sr_CS"
-+END LC_COLLATE
-+
-+LC_CTYPE
-+copy "i18n"
-+END LC_CTYPE
-+
-+LC_MESSAGES
-+yesexpr "<U005E><U005B><U0414><U0434><U0059><U0079><U005D><U002E><U002A>"
-+noexpr "<U005E><U005B><U041D><U043D><U004E><U006E><U005D><U002E><U002A>"
-+END LC_MESSAGES
-+
-+LC_MONETARY
-+% "YUM"
-+% This is the "New Yugoslavian Dinar"
-+% YUN is *wrong* as this is the "convertible" "New Yugoslavian Dinar"
-+% YUD is the "old" Yugoslavian Dinar
-+% Please note that Montenegro uses EUR only. YUM is OK
-+% for Serbia and Kosovo
-+% There is NO Serbian Dinar
-+int_curr_symbol "<U0059><U0055><U004D><U0020>"
-+currency_symbol "<U0434><U0438><U043D>"
-+mon_decimal_point "<U002C>"
-+mon_thousands_sep "<U0020>"
-+mon_grouping 3;3
-+positive_sign ""
-+negative_sign "<U002D>"
-+int_frac_digits 0
-+frac_digits 0
-+p_cs_precedes 1
-+p_sep_by_space 1
-+n_cs_precedes 1
-+n_sep_by_space 1
-+p_sign_posn 1
-+n_sign_posn 1
-+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><U0435>";/
-+ "<U0447><U0435><U0442>";"<U043F><U0435><U0442>";/
-+ "<U0441><U0443><U0431>"
-+day "<U043D><U0435><U0434><U0435><U0459><U0061>";/
-+ "<U043F><U043E><U043D><U0435><U0434><U0435><U0459><U0430><U043A>";/
-+ "<U0443><U0442><U043E><U0440><U0430><U043A>";/
-+ "<U0441><U0440><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 "<U002B><U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
-+d_fmt "<U0025><U0064><U002D><U0025><U006D><U002D><U0025><U0059><U002E>"
-+t_fmt "<U0025><U0054>"
-+am_pm "";""
-+t_fmt_ampm ""
-+END LC_TIME
-+
-+LC_PAPER
-+copy "sr_CS"
-+END LC_PAPER
-+
-+LC_TELEPHONE
-+copy "sr_CS"
-+END LC_TELEPHONE
-+
-+LC_MEASUREMENT
-+copy "sr_CS"
-+END LC_MEASUREMENT
-+
-+LC_NAME
-+copy "sr_CS"
-+END LC_NAME
-+
-+LC_ADDRESS
-+copy "sr_CS"
-+END LC_ADDRESS
---- locale/iso-3166.def 2004-07-31 17:57:06.000000000 +0900
-+++ locale/iso-3166.def 2004-07-31 17:57:07.000000000 +0900
-@@ -193,6 +193,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 AND MONTENEGRO", CS, SCG, 891)
- DEFINE_COUNTRY_CODE ("SEYCHELLES", SC, SYC, 690)
- DEFINE_COUNTRY_CODE ("SIERRA LEONE", SL, SLE, 694)
- DEFINE_COUNTRY_CODE ("SINGAPORE", SG, SGP, 702)
---- localedata/SUPPORTED 2004-07-31 17:32:45.000000000 +0900
-+++ localedata/SUPPORTED 2004-07-31 17:59:55.000000000 +0900
-@@ -296,6 +299,10 @@
- so_SO/ISO-8859-1 \
- sq_AL.UTF-8/UTF-8 \
- sq_AL/ISO-8859-1 \
-+sr_CS.UTF-8/UTF-8 \
-+sr_CS.UTF-8@cyrillic/UTF-8 \
-+sr_CS/ISO-8859-2 \
-+sr_CS@cyrillic/ISO-8859-5 \
- sr_YU.UTF-8/UTF-8 \
- sr_YU.UTF-8@cyrillic/UTF-8 \
- sr_YU/ISO-8859-2 \
Deleted: glibc-package/trunk/debian/patches/locales-supported.diff
===================================================================
--- glibc-package/trunk/debian/patches/locales-supported.diff 2006-01-15 22:24:06 UTC (rev 1113)
+++ glibc-package/trunk/debian/patches/locales-supported.diff 2006-01-15 22:33:26 UTC (rev 1114)
@@ -1,177 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: This dpatch addes many locales especially for UTF-8 and
-# DP: ISO-8859-15, to display debconf locale menu using
-# DP: SUPPORTED.orig. This dpatch is based on RedHat cygnus-to-
-# DP: redhat patch.
-# DP: Author: GOTO Masanori <gotom@debian.org>
-# DP: Upstream status: Debian/RedHat-Specific
-# DP: Status Details: Severely reduced because many of these locales
-# are now in upstream. - jbailey 2003-03-23
-# DP: Date: 2003-02-09, Update 2004-07-21 for #246170 - gotom
-
-if [ $# -ne 2 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -d "$2" -f --no-backup-if-mismatch -p0 < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p0 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-# append the patch here and adjust the -p? flag in the patch calls.
---- localedata/SUPPORTED~ 2004-07-21 09:25:57.000000000 +0900
-+++ localedata/SUPPORTED 2004-07-21 09:26:34.000000000 +0900
-@@ -56,6 +56,7 @@
- bs_BA/ISO-8859-2 \
- byn_ER/UTF-8 \
- ca_ES.UTF-8/UTF-8 \
-+ca_ES.UTF-8@euro/UTF-8 \
- ca_ES/ISO-8859-1 \
- ca_ES@euro/ISO-8859-15 \
- cs_CZ.UTF-8/UTF-8 \
-@@ -64,18 +65,23 @@
- cy_GB/ISO-8859-14 \
- da_DK.UTF-8/UTF-8 \
- da_DK/ISO-8859-1 \
-+da_DK.ISO-8859-15/ISO-8859-15 \
- de_AT.UTF-8/UTF-8 \
-+de_AT.UTF-8@euro/UTF-8 \
- de_AT/ISO-8859-1 \
- de_AT@euro/ISO-8859-15 \
- de_BE.UTF-8/UTF-8 \
-+de_BE.UTF-8@euro/UTF-8 \
- de_BE/ISO-8859-1 \
- de_BE@euro/ISO-8859-15 \
- de_CH.UTF-8/UTF-8 \
- de_CH/ISO-8859-1 \
- de_DE.UTF-8/UTF-8 \
-+de_DE.UTF-8@euro/UTF-8 \
- de_DE/ISO-8859-1 \
- de_DE@euro/ISO-8859-15 \
- de_LU.UTF-8/UTF-8 \
-+de_LU.UTF-8@euro/UTF-8 \
- de_LU/ISO-8859-1 \
- de_LU@euro/ISO-8859-15 \
- el_GR.UTF-8/UTF-8 \
-@@ -90,9 +96,11 @@
- en_DK/ISO-8859-1 \
- en_GB.UTF-8/UTF-8 \
- en_GB/ISO-8859-1 \
-+en_GB.ISO-8859-15/ISO-8859-15 \
- en_HK.UTF-8/UTF-8 \
- en_HK/ISO-8859-1 \
- en_IE.UTF-8/UTF-8 \
-+en_IE.UTF-8@euro/UTF-8 \
- en_IE/ISO-8859-1 \
- en_IE@euro/ISO-8859-15 \
- en_IN/UTF-8 \
-@@ -104,6 +112,7 @@
- en_SG/ISO-8859-1 \
- en_US.UTF-8/UTF-8 \
- en_US/ISO-8859-1 \
-+en_US.ISO-8859-15/ISO-8859-15 \
- en_ZA.UTF-8/UTF-8 \
- en_ZA/ISO-8859-1 \
- en_ZW.UTF-8/UTF-8 \
-@@ -123,6 +132,7 @@
- es_EC.UTF-8/UTF-8 \
- es_EC/ISO-8859-1 \
- es_ES.UTF-8/UTF-8 \
-+es_ES.UTF-8@euro/UTF-8 \
- es_ES/ISO-8859-1 \
- es_ES@euro/ISO-8859-15 \
- es_GT.UTF-8/UTF-8 \
-@@ -152,15 +162,18 @@
- et_EE.UTF-8/UTF-8 \
- et_EE/ISO-8859-1 \
- eu_ES.UTF-8/UTF-8 \
-+eu_ES.UTF-8@euro/UTF-8 \
- eu_ES/ISO-8859-1 \
- eu_ES@euro/ISO-8859-15 \
- fa_IR/UTF-8 \
- fi_FI.UTF-8/UTF-8 \
-+fi_FI.UTF-8@euro/UTF-8 \
- fi_FI/ISO-8859-1 \
- fi_FI@euro/ISO-8859-15 \
- fo_FO.UTF-8/UTF-8 \
- fo_FO/ISO-8859-1 \
- fr_BE.UTF-8/UTF-8 \
-+fr_BE.UTF-8@euro/UTF-8 \
- fr_BE/ISO-8859-1 \
- fr_BE@euro/ISO-8859-15 \
- fr_CA.UTF-8/UTF-8 \
-@@ -168,12 +181,15 @@
- fr_CH.UTF-8/UTF-8 \
- fr_CH/ISO-8859-1 \
- fr_FR.UTF-8/UTF-8 \
-+fr_FR.UTF-8@euro/UTF-8 \
- fr_FR/ISO-8859-1 \
- fr_FR@euro/ISO-8859-15 \
- fr_LU.UTF-8/UTF-8 \
-+fr_LU.UTF-8@euro/UTF-8 \
- fr_LU/ISO-8859-1 \
- fr_LU@euro/ISO-8859-15 \
- ga_IE.UTF-8/UTF-8 \
-+ga_IE.UTF-8@euro/UTF-8 \
- ga_IE/ISO-8859-1 \
- ga_IE@euro/ISO-8859-15 \
- gd_GB/ISO-8859-15 \
-@@ -182,6 +198,7 @@
- gez_ET/UTF-8 \
- gez_ET@abegede/UTF-8 \
- gl_ES.UTF-8/UTF-8 \
-+gl_ES.UTF-8@euro/UTF-8 \
- gl_ES/ISO-8859-1 \
- gl_ES@euro/ISO-8859-15 \
- gu_IN/UTF-8 \
-@@ -201,6 +218,7 @@
- it_CH.UTF-8/UTF-8 \
- it_CH/ISO-8859-1 \
- it_IT.UTF-8/UTF-8 \
-+it_IT.UTF-8@euro/UTF-8 \
- it_IT/ISO-8859-1 \
- it_IT@euro/ISO-8859-15 \
- iw_IL.UTF-8/UTF-8 \
-@@ -233,11 +251,15 @@
- mt_MT/ISO-8859-3 \
- nb_NO.UTF-8/UTF-8 \
- nb_NO/ISO-8859-1 \
-+no_NO.UTF-8/UTF-8 \
-+no_NO/ISO-8859-1 \
- ne_NP/UTF-8 \
- nl_BE.UTF-8/UTF-8 \
-+nl_BE.UTF-8@euro/UTF-8 \
- nl_BE/ISO-8859-1 \
- nl_BE@euro/ISO-8859-15 \
- nl_NL.UTF-8/UTF-8 \
-+nl_NL.UTF-8@euro/UTF-8 \
- nl_NL/ISO-8859-1 \
- nl_NL@euro/ISO-8859-15 \
- nn_NO.UTF-8/UTF-8 \
-@@ -251,6 +273,7 @@
- pt_BR.UTF-8/UTF-8 \
- pt_BR/ISO-8859-1 \
- pt_PT.UTF-8/UTF-8 \
-+pt_PT.UTF-8@euro/UTF-8 \
- pt_PT/ISO-8859-1 \
- pt_PT@euro/ISO-8859-15 \
- ro_RO.UTF-8/UTF-8 \
-@@ -279,10 +302,12 @@
- st_ZA.UTF-8/UTF-8 \
- st_ZA/ISO-8859-1 \
- sv_FI.UTF-8/UTF-8 \
-+sv_FI.UTF-8@euro/UTF-8 \
- sv_FI/ISO-8859-1 \
- sv_FI@euro/ISO-8859-15 \
- sv_SE.UTF-8/UTF-8 \
- sv_SE/ISO-8859-1 \
-+sv_SE.ISO-8859-15/ISO-8859-15 \
- ta_IN/UTF-8 \
- te_IN/UTF-8 \
- tg_TJ/KOI8-T \
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-01-15 22:24:06 UTC (rev 1113)
+++ glibc-package/trunk/debian/patches/series 2006-01-15 22:33:26 UTC (rev 1114)
@@ -1,10 +1,8 @@
localedata/cvs-localedata.diff -p0
-#locale-sr_CS - sr_YU is needed to be disabled after sarge.
localedata/locale-de_CH.diff -p1
locale-ru_RU.diff -p1
localedata/locale-eo_EO.diff -p1
localedata/locale-no_NO.diff -p0
-#locales-supported.diff -p0 # g: untilsarge, dropped.
glibc-i686-timing.diff -p1
glibc-sparc-timing.diff -p1
makeconfig.diff -p0
@@ -45,7 +43,6 @@
#glibc23-errno-hack.diff -p1 # g: untilsarge
90_glibc233_tcsetaddr.diff -p1
localedef-fix-trampoline.diff -p1
-#translation-fr - translation maintainer currently reject this patch 2004-04-21
localedata/locale-eu_FR.diff -p0
glibc232-m68k-reloc.diff -p1
#glibc232-globfree-clear.diff -p1 # g: suspended
Deleted: glibc-package/trunk/debian/patches/translation-fr.diff
===================================================================
--- glibc-package/trunk/debian/patches/translation-fr.diff 2006-01-15 22:24:06 UTC (rev 1113)
+++ glibc-package/trunk/debian/patches/translation-fr.diff 2006-01-15 22:33:26 UTC (rev 1114)
@@ -1,47 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Correct typo in french translation
-# DP: Related bugs: #243183
-# DP: Dpatch author: Petter Reinholdtsen
-# DP: Patch author: Petter Reinholdtsen based on input from Sam Hocevar
-# DP: Upstream status: Sent 20040418 to translator team <traduc@traduc.org>
-# DP: Status Details: Unknown
-# DP: Date: 2004-04-18
-
-PATCHLEVEL=1
-
-if [ $# -ne 2 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -d "$2" -f --no-backup-if-mismatch -p$PATCHLEVEL < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p$PATCHLEVEL < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-# append the patch here and adjust the -p? flag in the patch calls.
---- glibc-2.3.2/po/fr.po.orig Sat Apr 17 23:39:07 2004
-+++ glibc-2.3.2/po/fr.po Sat Apr 17 23:39:23 2004
-@@ -940,7 +940,7 @@
-
- #: locale/programs/ld-ctype.c:758
- msgid "no input digits defined and none of the standard names in the charmap"
--msgstr "Pas de chiffre d�ni et aucun des noms standards dans la table des caract�s"
-+msgstr "Pas de chiffre d�ni et aucun des noms standard dans la table des caract�s"
-
- #: locale/programs/ld-ctype.c:823
- msgid "not all characters used in `outdigit' are available in the charmap"
-@@ -1084,7 +1084,7 @@
-
- #: locale/programs/ld-ctype.c:3464
- msgid "no output digits defined and none of the standard names in the charmap"
--msgstr "Pas de chiffre d�ni et aucun des noms standards dans la table des caract�s"
-+msgstr "Pas de chiffre d�ni et aucun des noms standard dans la table des caract�s"
-
- #: locale/programs/ld-ctype.c:3755
- #, c-format
Reply to: