r1111 - in glibc-package/trunk/debian: . patches/localedata
Author: barbier
Date: 2006-01-15 22:08:48 +0000 (Sun, 15 Jan 2006)
New Revision: 1111
Added:
glibc-package/trunk/debian/patches/localedata/supported.diff
Removed:
glibc-package/trunk/debian/patches/localedata/support-ru_RU.cp1251.diff
Modified:
glibc-package/trunk/debian/changelog
Log:
* debian/patches/localedata/supported.diff: Rename support-ru_RU.cp1251.diff
into supported.diff, and add more locales:
- uz_UZ.UTF-8 (its ISO-8859-1 counterpart had no UTF-8 variant)
- da_DK.ISO-8859-15, en_GB.ISO-8859-15, en_US.ISO-8859-15 and
sv_SE.ISO-8859-15 are found in fedora-branch CVS branch.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-01-15 21:22:27 UTC (rev 1110)
+++ glibc-package/trunk/debian/changelog 2006-01-15 22:08:48 UTC (rev 1111)
@@ -17,6 +17,11 @@
<mbravo@wintermute.spb.ru>. (Closes: #225516)
* debian/patches/localedata/locale-sa_IN.diff: New sa_IN locale file,
provided by Vidya Ayer and Christian Perrier. (Closes: #331377)
+ * debian/patches/localedata/supported.diff: Rename support-ru_RU.cp1251.diff
+ into supported.diff, and add more locales:
+ - uz_UZ.UTF-8 (its ISO-8859-1 counterpart had no UTF-8 variant)
+ - da_DK.ISO-8859-15, en_GB.ISO-8859-15, en_US.ISO-8859-15 and
+ sv_SE.ISO-8859-15 are found in fedora-branch CVS branch.
-- Denis Barbier <barbier@debian.org> Sun, 15 Jan 2006 18:20:16 +0100
Deleted: glibc-package/trunk/debian/patches/localedata/support-ru_RU.cp1251.diff
===================================================================
--- glibc-package/trunk/debian/patches/localedata/support-ru_RU.cp1251.diff 2006-01-15 21:22:27 UTC (rev 1110)
+++ glibc-package/trunk/debian/patches/localedata/support-ru_RU.cp1251.diff 2006-01-15 22:08:48 UTC (rev 1111)
@@ -1,20 +0,0 @@
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Add support for ru_RU.CP1251
-# DP: Related bugs: #225516
-# DP: Dpatch author: Denis Barbier
-# DP: Patch author: Petter Reinholdtsen
-# DP: Upstream status: not submitted
-# DP: Date: 2006-01-10
-
-Index: glibc-2.3.5/localedata/SUPPORTED
-===================================================================
---- glibc-2.3.5.orig/localedata/SUPPORTED
-+++ glibc-2.3.5/localedata/SUPPORTED
-@@ -281,6 +281,7 @@
- ro_RO/ISO-8859-2 \
- ru_RU.KOI8-R/KOI8-R \
- ru_RU.UTF-8/UTF-8 \
-+ru_RU.CP1251/CP1251 \
- ru_RU/ISO-8859-5 \
- ru_UA.UTF-8/UTF-8 \
- ru_UA/KOI8-U \
Copied: glibc-package/trunk/debian/patches/localedata/supported.diff (from rev 1110, glibc-package/trunk/debian/patches/localedata/support-ru_RU.cp1251.diff)
===================================================================
--- glibc-package/trunk/debian/patches/localedata/support-ru_RU.cp1251.diff 2006-01-15 21:22:27 UTC (rev 1110)
+++ glibc-package/trunk/debian/patches/localedata/supported.diff 2006-01-15 22:08:48 UTC (rev 1111)
@@ -0,0 +1,63 @@
+# All lines beginning with `# DP:' are a description of the patch.
+# DP: Description: Add several locales to localedata.SUPPORTED
+# DP: - ru_RU.CP1251 was requested in #225516
+# DP: - uz_UZ.UTF-8 was clearly missing, uz_UZ had no UTF-8 variant
+# DP: - da_DK.ISO-8859-15, en_GB.ISO-8859-15, en_US.ISO-8859-15 and
+# DP: sv_SE.ISO-8859-15 are found in fedora-branch CVS branch.
+# DP: Related bugs: #225516 (ru_RU.CP1251)
+# DP: Dpatch author: Denis Barbier
+# DP: Upstream status: not submitted
+# DP: Date: 2006-01-10
+
+Index: glibc-2.3.5/localedata/SUPPORTED
+===================================================================
+--- glibc-2.3.5.orig/localedata/SUPPORTED
++++ glibc-2.3.5/localedata/SUPPORTED
+@@ -69,6 +69,7 @@
+ 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/ISO-8859-1 \
+ de_AT@euro/ISO-8859-15 \
+@@ -96,6 +97,7 @@
+ 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 \
+@@ -110,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 \
+@@ -286,6 +291,7 @@
+ ro_RO/ISO-8859-2 \
+ ru_RU.KOI8-R/KOI8-R \
+ ru_RU.UTF-8/UTF-8 \
++ru_RU.CP1251/CP1251 \
+ ru_RU/ISO-8859-5 \
+ ru_UA.UTF-8/UTF-8 \
+ ru_UA/KOI8-U \
+@@ -316,6 +322,7 @@
+ 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.UTF-8/UTF-8 \
+@@ -335,6 +342,7 @@
+ uk_UA.UTF-8/UTF-8 \
+ uk_UA/KOI8-U \
+ ur_PK/UTF-8 \
++uz_UZ.UTF-8/UTF-8 \
+ uz_UZ/ISO-8859-1 \
+ uz_UZ@cyrillic/UTF-8 \
+ ve_ZA/UTF-8 \
Reply to: