[BZ #9963]

2009-04-22  Ulrich Drepper  <drepper@redhat.com>
	[BZ #9963]
	* locales/en_PH: Fix LC_PAPER.
	* locales/es_CL: Likewise.
	* locales/es_CO: Likewise.
	* locales/es_MX: Likewise.
	* locales/es_US: Likewise.
	* locales/es_VE: Likewise.
	* locales/fil_PH: Likewise.
	* locales/ik_CA: Likewise.
	* locales/iu_CA: Likewise.
	* locales/tl_PH: Likewise.

12 files changed, 30 insertions, 33 deletions

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 9e5182edf1..c13533b4ff 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,17 @@
+2009-04-22  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #9963]
+	* locales/en_PH: Fix LC_PAPER.
+	* locales/es_CL: Likewise.
+	* locales/es_CO: Likewise.
+	* locales/es_MX: Likewise.
+	* locales/es_US: Likewise.
+	* locales/es_VE: Likewise.
+	* locales/fil_PH: Likewise.
+	* locales/ik_CA: Likewise.
+	* locales/iu_CA: Likewise.
+	* locales/tl_PH: Likewise.
+
 2009-04-18  Ulrich Drepper  <drepper@redhat.com>
 
 	* SUPPORTED: Add ks_IN.
diff --git a/localedata/locales/en_PH b/localedata/locales/en_PH
index 13da351db0..895e7c890a 100644
--- a/localedata/locales/en_PH
+++ b/localedata/locales/en_PH
@@ -166,11 +166,7 @@ END LC_MESSAGES
 
 
 LC_PAPER
-% This is the ISO_IEC TR14652 Locale definition for the LC_PAPER category
-% generated by IBM Basic CountryPack Transformer.
-height      297
-width       210
-
+copy "tl_PH"
 END LC_PAPER
 
 
diff --git a/localedata/locales/es_CL b/localedata/locales/es_CL
index 2f44845862..ff44fa8c5f 100644
--- a/localedata/locales/es_CL
+++ b/localedata/locales/es_CL
@@ -125,10 +125,8 @@ date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
 END LC_TIME
 
 LC_PAPER
-% FIXME
-height   297
-% FIXME
-width    210
+height   279
+width    216
 END LC_PAPER
 
 LC_TELEPHONE
diff --git a/localedata/locales/es_CO b/localedata/locales/es_CO
index 630ee75d4b..bb983d7e7f 100644
--- a/localedata/locales/es_CO
+++ b/localedata/locales/es_CO
@@ -125,10 +125,8 @@ date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
 END LC_TIME
 
 LC_PAPER
-% FIXME
-height   297
-% FIXME
-width    210
+height   279
+width    216
 END LC_PAPER
 
 LC_TELEPHONE
diff --git a/localedata/locales/es_MX b/localedata/locales/es_MX
index 0149865018..91dac23d8a 100644
--- a/localedata/locales/es_MX
+++ b/localedata/locales/es_MX
@@ -125,10 +125,8 @@ date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
 END LC_TIME
 
 LC_PAPER
-% FIXME
-height   297
-% FIXME
-width    210
+height   279
+width    216
 END LC_PAPER
 
 LC_TELEPHONE
diff --git a/localedata/locales/es_US b/localedata/locales/es_US
index 031483965c..71e8ac803c 100644
--- a/localedata/locales/es_US
+++ b/localedata/locales/es_US
@@ -177,8 +177,7 @@ date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
 END LC_TIME
 
 LC_PAPER
-height   279
-width    216
+copy "en_US"
 END LC_PAPER
 
 LC_TELEPHONE
diff --git a/localedata/locales/es_VE b/localedata/locales/es_VE
index c9e916a286..ca6637a6df 100644
--- a/localedata/locales/es_VE
+++ b/localedata/locales/es_VE
@@ -126,10 +126,8 @@ date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
 END LC_TIME
 
 LC_PAPER
-% FIXME
-height   297
-% FIXME
-width    210
+height   279
+width    216
 END LC_PAPER
 
 LC_TELEPHONE
diff --git a/localedata/locales/fil_PH b/localedata/locales/fil_PH
index 799a43c3de..ad3ea8eab2 100644
--- a/localedata/locales/fil_PH
+++ b/localedata/locales/fil_PH
@@ -150,8 +150,7 @@ noexpr      "<U005B><U0068><U0048><U006E><U004E><U005D><U002E><U002A>"
 END LC_MESSAGES
 
 LC_PAPER
-height      297
-width       210
+copy "tl_PH"
 END LC_PAPER
 
 LC_MEASUREMENT
diff --git a/localedata/locales/ik_CA b/localedata/locales/ik_CA
index fdcb8afe16..1b967423ed 100644
--- a/localedata/locales/ik_CA
+++ b/localedata/locales/ik_CA
@@ -207,10 +207,8 @@ yesexpr     "<U005B><U0079><U0059><U0069><U0049><U0061><U0041><U005D><U002E><U00
 noexpr      "<U005B><U006E><U004E><U0071><U0051><U005D><U002E><U002A>"
 END LC_MESSAGES
 
-% Default paper: A4
 LC_PAPER
-height 297
-width 210
+copy "en_CA"
 END LC_PAPER
 
 % Metric System (ISO 1000)
diff --git a/localedata/locales/iu_CA b/localedata/locales/iu_CA
index da08366ddb..cb91f3ddfd 100644
--- a/localedata/locales/iu_CA
+++ b/localedata/locales/iu_CA
@@ -119,10 +119,8 @@ yesexpr     "<U005B><U0079><U0059><U0073><U0053><U005D><U002E><U002A>"
 noexpr      "<U005B><U006E><U004E><U005D><U002E><U002A>"
 END LC_MESSAGES
 
-% Default paper: A4
 LC_PAPER
-height 297
-width 210
+copy "en_CA"
 END LC_PAPER
 
 % FIXME
diff --git a/localedata/locales/tl_PH b/localedata/locales/tl_PH
index 250f276298..40c6a715ad 100644
--- a/localedata/locales/tl_PH
+++ b/localedata/locales/tl_PH
@@ -144,8 +144,8 @@ copy "en_US"
 END LC_MESSAGES
 
 LC_PAPER
-height      297
-width       210
+height   279
+width    216
 END LC_PAPER
 
 LC_MEASUREMENT
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index e5fab66e64..60bab8502c 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,6 @@
 2009-04-22  Ulrich Drepper  <drepper@redhat.com>
 
+	[BZ #10090]
 	* pthread_attr_setschedparam.c (__pthread_attr_setschedparam):
 	Check policy and priority for validity.
 	Patch mostly by Zhang Xiliang <zhangxiliang@cn.fujitsu.com>.