X Strike Force X.Org X11 SVN commit: r2421 - in branches/7.1/lib/libx11/debian: . patches
Author: dnusinow
Date: 2006-07-03 15:10:41 -0400 (Mon, 03 Jul 2006)
New Revision: 2421
Removed:
branches/7.1/lib/libx11/debian/patches/010_manpages_fix.diff
branches/7.1/lib/libx11/debian/patches/013_SECURITY_setuid.diff
Modified:
branches/7.1/lib/libx11/debian/changelog
branches/7.1/lib/libx11/debian/patches/003_recognize_glibc_2.3.2_locale_names.diff
branches/7.1/lib/libx11/debian/patches/004_en_US.UTF-8_Compose_fix_Unicode_plane_1.diff
branches/7.1/lib/libx11/debian/patches/series
branches/7.1/lib/libx11/debian/rules
Log:
* New upstream release
* Dump obsolete patch 10 for manpage fix and 13 for setuid fix
* Run dh_install with --list-missing
Modified: branches/7.1/lib/libx11/debian/changelog
===================================================================
--- branches/7.1/lib/libx11/debian/changelog 2006-07-03 18:13:04 UTC (rev 2420)
+++ branches/7.1/lib/libx11/debian/changelog 2006-07-03 19:10:41 UTC (rev 2421)
@@ -1,3 +1,11 @@
+libx11 (2:1.0.3-1) experimental; urgency=low
+
+ * New upstream release
+ * Dump obsolete patch 10 for manpage fix and 13 for setuid fix
+ * Run dh_install with --list-missing
+
+ -- David Nusinow <dnusinow@debian.org> Mon, 3 Jul 2006 15:10:09 -0400
+
libx11 (2:1.0.0-7) unstable; urgency=high
* Security update. Fix for setuid privledge escalation vulernabilities.
Modified: branches/7.1/lib/libx11/debian/patches/003_recognize_glibc_2.3.2_locale_names.diff
===================================================================
--- branches/7.1/lib/libx11/debian/patches/003_recognize_glibc_2.3.2_locale_names.diff 2006-07-03 18:13:04 UTC (rev 2420)
+++ branches/7.1/lib/libx11/debian/patches/003_recognize_glibc_2.3.2_locale_names.diff 2006-07-03 19:10:41 UTC (rev 2421)
@@ -55,10 +55,10 @@
Partially submitted upstream. This is so large I don't expect it to all go in at once,
but any bit would help. --Nathanael
-Index: libx11-1.0.0/nls/compose.dir.pre
+Index: libx11/nls/compose.dir.pre
===================================================================
---- libx11-1.0.0.orig/nls/compose.dir.pre 2006-02-27 12:58:05.000000000 +0700
-+++ libx11-1.0.0/nls/compose.dir.pre 2006-02-27 12:58:41.000000000 +0700
+--- libx11.orig/nls/compose.dir.pre 2006-07-03 14:10:48.000000000 -0400
++++ libx11/nls/compose.dir.pre 2006-07-03 14:30:06.000000000 -0400
@@ -1,14 +1,22 @@
XCOMM $Xorg: compose.dir,v 1.3 2000/08/17 19:46:48 cpqbld Exp $
XCOMM
@@ -222,15 +222,17 @@
iso8859-1/Compose: ms_MY.ISO8859-1
iso8859-3/Compose: mt_MT.ISO8859-3
iso8859-1/Compose: nl_BE.ISO8859-1
-@@ -174,30 +209,36 @@
+@@ -174,25 +209,32 @@
iso8859-15/Compose: ny_NO.ISO8859-15
iso8859-1/Compose: oc_FR.ISO8859-1
iso8859-15/Compose: oc_FR.ISO8859-15
-iso8859-1/Compose: pd_DE.ISO8859-1
-iso8859-1/Compose: pd_US.ISO8859-1
-++iso8859-1/Compose: om_KE.ISO8859-1
-+XCOMM Presumably, "pd" is "Pennsylvania 'Dutch'", a U.S. dialect of German.
-+XCOMM This is not an ISO language code defined for it, and the GNU C Library
++iso8859-1/Compose: om_KE.ISO8859-1
++XCOMM Presumably, "pd" is "Pennsylvania 'Dutch'", a U.S. dialect of
++German.
++XCOMM This is not an ISO language code defined for it, and the GNU C
++Library
+XCOMM doesn't support it.
+XCOMM iso8859-1/Compose: pd_DE.ISO8859-1
+XCOMM iso8859-1/Compose: pd_US.ISO8859-1
@@ -253,11 +255,13 @@
iso8859-2/Compose: sk_SK.ISO8859-2
-iso8859-2/Compose: sl_CS.ISO8859-2
iso8859-2/Compose: sl_SI.ISO8859-2
-+iso8859-1/Compose: so_DJ.ISO8859-1
-+iso8859-1/Compose: so_KE.ISO8859-1
-+iso8859-1/Compose: so_SO.ISO8859-1
++iso8859-1/Compose: so_DJ.ISO8859-1
++iso8859-1/Compose: so_KE.ISO8859-1
++iso8859-1/Compose: so_SO.ISO8859-1
iso8859-5/Compose: sp_YU.ISO8859-5
iso8859-2/Compose: sq_AL.ISO8859-2
+ iso8859-2/Compose: sr_CS.ISO8859-2
+@@ -200,6 +242,7 @@
iso8859-2/Compose: sr_SP.ISO8859-2
iso8859-2/Compose: sr_YU.ISO8859-2
iso8859-5/Compose: sr_YU.ISO8859-5
@@ -265,7 +269,7 @@
iso8859-1/Compose: ss_ZA.ISO8859-1
iso8859-1/Compose: st_ZA.ISO8859-1
iso8859-1/Compose: sv_FI.ISO8859-1
-@@ -206,38 +247,59 @@
+@@ -208,38 +251,59 @@
iso8859-15/Compose: sv_SE.ISO8859-15
tscii-0/Compose: ta_IN.TSCII-0
koi8-c/Compose: tg_TJ.KOI8-C
@@ -331,7 +335,7 @@
en_US.UTF-8/Compose: ar_IQ.UTF-8
en_US.UTF-8/Compose: ar_JO.UTF-8
en_US.UTF-8/Compose: ar_KW.UTF-8
-@@ -247,15 +309,18 @@
+@@ -249,15 +313,18 @@
en_US.UTF-8/Compose: ar_OM.UTF-8
en_US.UTF-8/Compose: ar_QA.UTF-8
en_US.UTF-8/Compose: ar_SA.UTF-8
@@ -351,7 +355,7 @@
en_US.UTF-8/Compose: ca_ES.UTF-8
en_US.UTF-8/Compose: cs_CZ.UTF-8
en_US.UTF-8/Compose: cy_GB.UTF-8
-@@ -269,17 +334,28 @@
+@@ -271,17 +338,28 @@
en_US.UTF-8/Compose: de_LU.UTF-8
el_GR.UTF-8/Compose: el_GR.UTF-8
en_US.UTF-8/Compose: en_AU.UTF-8
@@ -381,7 +385,7 @@
en_US.UTF-8/Compose: es_AR.UTF-8
en_US.UTF-8/Compose: es_BO.UTF-8
en_US.UTF-8/Compose: es_CL.UTF-8
-@@ -297,10 +373,12 @@
+@@ -299,10 +377,12 @@
en_US.UTF-8/Compose: es_PR.UTF-8
en_US.UTF-8/Compose: es_PY.UTF-8
en_US.UTF-8/Compose: es_SV.UTF-8
@@ -394,7 +398,7 @@
en_US.UTF-8/Compose: fa_IR.UTF-8
en_US.UTF-8/Compose: fi_FI.UTF-8
en_US.UTF-8/Compose: fo_FO.UTF-8
-@@ -311,6 +389,8 @@
+@@ -313,6 +393,8 @@
en_US.UTF-8/Compose: fr_LU.UTF-8
en_US.UTF-8/Compose: ga_IE.UTF-8
en_US.UTF-8/Compose: gd_GB.UTF-8
@@ -403,7 +407,7 @@
en_US.UTF-8/Compose: gl_ES.UTF-8
en_US.UTF-8/Compose: gu_IN.UTF-8
en_US.UTF-8/Compose: gv_GB.UTF-8
-@@ -324,9 +404,11 @@
+@@ -326,9 +408,11 @@
en_US.UTF-8/Compose: it_CH.UTF-8
en_US.UTF-8/Compose: it_IT.UTF-8
en_US.UTF-8/Compose: iu_CA.UTF-8
@@ -415,7 +419,7 @@
en_US.UTF-8/Compose: ko_KR.UTF-8
en_US.UTF-8/Compose: kw_GB.UTF-8
en_US.UTF-8/Compose: ky_KG.UTF-8
-@@ -335,18 +417,30 @@
+@@ -337,18 +421,30 @@
en_US.UTF-8/Compose: lv_LV.UTF-8
en_US.UTF-8/Compose: mi_NZ.UTF-8
en_US.UTF-8/Compose: mk_MK.UTF-8
@@ -449,7 +453,7 @@
en_US.UTF-8/Compose: ph_PH.UTF-8
en_US.UTF-8/Compose: pl_PL.UTF-8
en_US.UTF-8/Compose: pp_AN.UTF-8
-@@ -356,9 +450,13 @@
+@@ -358,9 +454,13 @@
en_US.UTF-8/Compose: ru_RU.UTF-8
en_US.UTF-8/Compose: ru_UA.UTF-8
en_US.UTF-8/Compose: rw_RW.UTF-8
@@ -461,9 +465,9 @@
en_US.UTF-8/Compose: sl_SI.UTF-8
+en_US.UTF-8/Compose: so_ET.UTF-8
en_US.UTF-8/Compose: sq_AL.UTF-8
+ en_US.UTF-8/Compose: sr_CS.UTF-8
en_US.UTF-8/Compose: sr_YU.UTF-8
- en_US.UTF-8/Compose: ss_ZA.UTF-8
-@@ -366,8 +464,12 @@
+@@ -369,8 +469,12 @@
en_US.UTF-8/Compose: sv_FI.UTF-8
en_US.UTF-8/Compose: sv_SE.UTF-8
en_US.UTF-8/Compose: ta_IN.UTF-8
@@ -476,11 +480,11 @@
en_US.UTF-8/Compose: tl_PH.UTF-8
en_US.UTF-8/Compose: tn_ZA.UTF-8
en_US.UTF-8/Compose: tr_TR.UTF-8
-Index: libx11-1.0.0/nls/locale.alias.pre
+Index: libx11/nls/locale.alias.pre
===================================================================
---- libx11-1.0.0.orig/nls/locale.alias.pre 2006-02-27 12:58:05.000000000 +0700
-+++ libx11-1.0.0/nls/locale.alias.pre 2006-02-27 12:58:41.000000000 +0700
-@@ -323,6 +323,7 @@
+--- libx11.orig/nls/locale.alias.pre 2006-07-03 14:10:39.000000000 -0400
++++ libx11/nls/locale.alias.pre 2006-07-03 14:37:20.000000000 -0400
+@@ -324,6 +324,7 @@
en_US.ISO-8859-1: en_US.ISO8859-1
en_US.ISO_8859-1: en_US.ISO8859-1
en_US.iso885915: en_US.ISO8859-15
@@ -488,7 +492,7 @@
en_US.8859-15: en_US.ISO8859-15
en_US.ISO8859-15@euro: en_US.ISO8859-15
en_US.utf8: en_US.UTF-8
-@@ -857,7 +858,6 @@
+@@ -858,7 +859,6 @@
pt_BR.iso88591: pt_BR.ISO8859-1
pt_BR.ISO-8859-1: pt_BR.ISO8859-1
pt_BR.ISO_8859-1: pt_BR.ISO8859-1
@@ -496,21 +500,21 @@
pt_BR.utf8: pt_BR.UTF-8
pt_PT: pt_PT.ISO8859-1
pt_PT.88591: pt_PT.ISO8859-1
-@@ -905,12 +905,12 @@
- se_NO: se_NO.UTF-8
- se_NO.utf8: se_NO.UTF-8
- sh: sh_YU.ISO8859-2
--sh_HR.iso88592: sh_HR.ISO8859-2
- sh_SP: sh_YU.ISO8859-2
- sh_YU: sh_YU.ISO8859-2
- sh_YU.utf8: sh_YU.UTF-8
+@@ -909,12 +909,12 @@
+ XCOMM YU was the old ISO code for Yugoslavia (now CS for Serbia&Montenegro).
+ XCOMM These lines should be deleted in the future.
+ sh: sr_CS.ISO8859-2
+-sh_HR.iso88592: hr_HR.ISO8859-2
+ sh_SP: sr_CS.ISO8859-2
+ sh_YU: sr_CS.ISO8859-2
+ sh_YU.utf8: sr_CS.UTF-8
si: si_LK.UTF-8
si_LK: si_LK.UTF-8
+sid_ET: sid_ET.UTF-8
sk: sk_SK.ISO8859-2
sk_SK: sk_SK.ISO8859-2
sk_SK.iso88592: sk_SK.ISO8859-2
-@@ -1124,7 +1124,7 @@
+@@ -1145,7 +1145,7 @@
dutch: nl_NL.ISO8859-1
dutch.iso88591: nl_BE.ISO8859-1
eesti: et_EE.ISO8859-1
@@ -519,7 +523,7 @@
estonian: et_EE.ISO8859-1
finnish: fi_FI.ISO8859-1
finnish.iso88591: fi_FI.ISO8859-1
-@@ -1137,8 +1137,8 @@
+@@ -1158,8 +1158,8 @@
german.iso88591: de_CH.ISO8859-1
greek: el_GR.ISO8859-7
greek.iso88597: el_GR.ISO8859-7
@@ -530,7 +534,7 @@
hrvatski: hr_HR.ISO8859-2
hungarian: hu_HU.ISO8859-2
icelandic.iso88591: is_IS.ISO8859-1
-@@ -1181,103 +1181,103 @@
+@@ -1202,103 +1202,103 @@
#ifdef WIN32
XCOMM Microsoft Windows/NT 4.0 SP3
XCOMM parser doesn't grok embedded spaces in locale name
@@ -606,79 +610,7 @@
-Icelandic_Iceland.1252: is_IS.iso8859-1
-Italian_Switzerland.1252: it_CH.iso8859-1
-Italian_Italy.1252: it_IT.iso8859-1
-+Afrikaans_South Africa.1252: af_ZA.ISO8859-1
-+Arabic_Bahrain.1256: ar_BH.ISO8859-6
-+Arabic_Algeria.1256: ar_DZ.ISO8859-6
-+Arabic_Egypt.1256: ar_EG.ISO8859-6
-+Arabic_Iraq.1256: ar_IQ.ISO8859-6
-+Arabic_Jordan.1256: ar_JO.ISO8859-6
-+Arabic_Kuwait.1256: ar_KW.ISO8859-6
-+Arabic_Lebanon.1256: ar_LB.ISO8859-6
-+Arabic_Libya.1256: ar_LY.ISO8859-6
-+Arabic_Morocco.1256: ar_MA.ISO8859-6
-+Arabic_Oman.1256: ar_OM.ISO8859-6
-+Arabic_Qatar.1256: ar_QA.ISO8859-6
-+Arabic_Saudi Arabia.1256: ar_SA.ISO8859-6
-+Arabic_Tunisia.1256: ar_TN.ISO8859-6
-+Arabic_Yemen.1256: ar_YE.ISO8859-6
-+Belarusian_Belarus.1251: be_BY.ISO8859-5
-+Bulgarian_Bulgaria.1251: bg_BG.ISO8859-5
-+Catalan_Spain.1252: ca_ES.ISO8859-1
-+Czech_Czech Republic.1250: cs_CZ.ISO8859-2
-+Danish_Denmark.1252: da_DK.ISO8859-1
-+German_Austria.1252: de_AT.ISO8859-1
-+German_Switzerland.1252: de_CH.ISO8859-1
-+German_Germany.1252: de_DE.ISO8859-1
-+German_Liechtenstein.1252: de_LI.ISO8859-1
-+German_Luxembourg.1252: de_LU.ISO8859-1
-+Greek_Greece.1253: el_GR.ISO8859-7
-+English_Australia.1252: en_AU.ISO8859-1
-+English_Belize.1252: en_BZ.ISO8859-1
-+English_Canada.1252: en_CA.ISO8859-1
-+English_Ireland.1252: en_IE.ISO8859-1
-+English_Jamaica.1252: en_JM.ISO8859-1
-+English_New Zealand.1252: en_NZ.ISO8859-1
-+English_Trinidad y Tobago.1252: en_TT.ISO8859-1
-+English_United Kingdom.1252: en_UK.ISO8859-1
-+English_United States.1252: en_US.ISO8859-1
-+English_South Africa.1252: en_ZA.ISO8859-1
-+Spanish_Argentina.1252: es_AR.ISO8859-1
-+Spanish_Bolivia.1252: es_BO.ISO8859-1
-+Spanish_Chile.1252: es_CL.ISO8859-1
-+Spanish_Colombia.1252: es_CO.ISO8859-1
-+Spanish_Costa Rica.1252: es_CR.ISO8859-1
-+Spanish_Dominican Republic.1252: es_DO.ISO8859-1
-+Spanish_Ecuador.1252: es_EC.ISO8859-1
-+Spanish - Modern Sort_Spain.1252: es_ES.ISO8859-1
-+Spanish - Traditional Sort_Spain.1252: es_ES.ISO8859-1
-+Spanish_Guatemala.1252: es_GT.ISO8859-1
-+Spanish_Honduras.1252: es_HN.ISO8859-1
-+Spanish_Mexican.1252: es_MX.ISO8859-1
-+Spanish_Nicaragua.1252: es_NI.ISO8859-1
-+Spanish_Panama.1252: es_PA.ISO8859-1
-+Spanish_Paraguay.1252: es_PY.ISO8859-1
-+Spanish_Peru.1252: es_PE.ISO8859-1
-+Spanish_Puerto Rico.1252: es_PR.ISO8859-1
-+Spanish_El Salvador.1252: es_SV.ISO8859-1
-+Spanish_Uruguay.1252: es_UY.ISO8859-1
-+Spanish_Venezuela.1252: es_VE.ISO8859-1
-+Estonian_Estonia.1257: et_EE.ISO8859-13
-+Basque_Spain.1252: eu_ES.ISO8859-1
-+Finnish_Finland.1252: fi_FI.ISO8859-1
-+French_Belgium.1252: fr_BE.ISO8859-1
-+French_Canada.1252: fr_CA.ISO8859-1
-+French_Switzerland.1252: fr_CH.ISO8859-1
-+French_France.1252: fr_FR.ISO8859-1
-+French_Luxembourg.1252: fr_LU.ISO8859-1
-+Faeroese_Faeroe Islands.1252: fo_FO.ISO8859-1
-+Hebrew_Israel.1255: he_IL.ISO8859-8
-+Croatian_Croatia.1250: hr_HR.ISO8859-2
-+Hungarian_Hungary.1250: hu_HU.ISO8859-2
-+Indonesian_Indonesia.1252: id_ID.ISO8859-1
-+Icelandic_Iceland.1252: is_IS.ISO8859-1
-+Italian_Switzerland.1252: it_CH.ISO8859-1
-+Italian_Italy.1252: it_IT.ISO8859-1
- Japanese_Japan.932: ja_JP.SJIS
+-Japanese_Japan.932: ja_JP.SJIS
-Korean_Korea.949: ko_KR.EUC
-Lithuanian_Lithuania.1257: lt_LT.iso8859-13
-Latvian_Latvia.1257: lv_LV.iso8859-13
@@ -694,7 +626,7 @@
-Slovak_Slovakia.1250: sk_SK.iso8859-2
-Slovene_Slovenia.1250: sl_SI.iso8859-2
-Albanian_Albania.1250: sq_AL.iso8859-2
--Serbian (Latin)_Serbia.1250: sr_YU.iso8859-2
+-Serbian (Latin)_Serbia.1250: sr_CS.iso8859-2
-Swedish_Finland.1252: sv_FI.iso8859-1
-Swedish_Sweden.1252: sv_SE.iso8859-1
-Turkish_Turkey.1254: tr_TR.iso8859-9
@@ -703,37 +635,110 @@
-Chinese(PRC)_Hong Kong.950: zh_HK.EUC
-Chinese(Singapore)_Signapore.936: zh_SG.EUC
-Chinese(Taiwan)_Taiwan.950: zh_TW.EUC
-+Korean_Korea.949: ko_KR.eucKR
-+Lithuanian_Lithuania.1257: lt_LT.ISO8859-13
-+Latvian_Latvia.1257: lv_LV.ISO8859-13
-+Dutch_Belgium.1252: nl_BE.ISO8859-1
-+Dutch_Netherlands.1252: nl_NL.ISO8859-1
-+Norwegian (Nynorsk)_Norway.1252: no_NO.ISO8859-1
-+Norwegian (Bokm�_Norway.1252: no_NO.ISO8859-1
-+Polish_Poland.1250: pl_PL.ISO8859-2
-+Portuguese_Brazil.1252: pt_BR.ISO8859-1
-+Portuguese_Portugal.1252: pt_PT.ISO8859-1
-+Romanian_Romania.1250: ro_RO.ISO8859-2
-+Russian_Russia.1251: ru_RU.ISO8859-5
-+Slovak_Slovakia.1250: sk_SK.ISO8859-2
-+Slovene_Slovenia.1250: sl_SI.ISO8859-2
-+Albanian_Albania.1250: sq_AL.ISO8859-2
-+Serbian (Latin)_Serbia.1250: sr_YU.ISO8859-2
-+Swedish_Finland.1252: sv_FI.ISO8859-1
-+Swedish_Sweden.1252: sv_SE.ISO8859-1
-+Turkish_Turkey.1254: tr_TR.ISO8859-9
-+Ukrainian_Ukraine.1251: uk_UA.ISO8859-5
-+Chinese(PRC)_People's Republic of China.936: zh_CN.eucCN
-+Chinese(PRC)_Hong Kong.950: zh_TW.eucTW
-+Chinese(Singapore)_Signapore.936: zh_CN.eucCN
-+Chinese(Taiwan)_Taiwan.950: zh_TW.eucTW
++Afrikaans_South Africa.1252: af_ZA.ISO8859-1
++Arabic_Bahrain.1256: ar_BH.ISO8859-6
++Arabic_Algeria.1256: ar_DZ.ISO8859-6
++Arabic_Egypt.1256: ar_EG.ISO8859-6
++Arabic_Iraq.1256: ar_IQ.ISO8859-6
++Arabic_Jordan.1256: ar_JO.ISO8859-6
++Arabic_Kuwait.1256: ar_KW.ISO8859-6
++Arabic_Lebanon.1256: ar_LB.ISO8859-6
++Arabic_Libya.1256: ar_LY.ISO8859-6
++Arabic_Morocco.1256: ar_MA.ISO8859-6
++Arabic_Oman.1256: ar_OM.ISO8859-6
++Arabic_Qatar.1256: ar_QA.ISO8859-6
++Arabic_Saudi Arabia.1256: ar_SA.ISO8859-6
++Arabic_Tunisia.1256: ar_TN.ISO8859-6
++Arabic_Yemen.1256: ar_YE.ISO8859-6
++Belarusian_Belarus.1251: be_BY.ISO8859-5
++Bulgarian_Bulgaria.1251: bg_BG.ISO8859-5
++Catalan_Spain.1252: ca_ES.ISO8859-1
++Czech_Czech Republic.1250: cs_CZ.ISO8859-2
++Danish_Denmark.1252: da_DK.ISO8859-1
++German_Austria.1252: de_AT.ISO8859-1
++German_Switzerland.1252: de_CH.ISO8859-1
++German_Germany.1252: de_DE.ISO8859-1
++German_Liechtenstein.1252: de_LI.ISO8859-1
++German_Luxembourg.1252: de_LU.ISO8859-1
++Greek_Greece.1253: el_GR.ISO8859-7
++English_Australia.1252: en_AU.ISO8859-1
++English_Belize.1252: en_BZ.ISO8859-1
++English_Canada.1252: en_CA.ISO8859-1
++English_Ireland.1252: en_IE.ISO8859-1
++English_Jamaica.1252: en_JM.ISO8859-1
++English_New Zealand.1252: en_NZ.ISO8859-1
++English_Trinidad y Tobago.1252: en_TT.ISO8859-1
++English_United Kingdom.1252: en_UK.ISO8859-1
++English_United States.1252: en_US.ISO8859-1
++English_South Africa.1252: en_ZA.ISO8859-1
++Spanish_Argentina.1252: es_AR.ISO8859-1
++Spanish_Bolivia.1252: es_BO.ISO8859-1
++Spanish_Chile.1252: es_CL.ISO8859-1
++Spanish_Colombia.1252: es_CO.ISO8859-1
++Spanish_Costa Rica.1252: es_CR.ISO8859-1
++Spanish_Dominican Republic.1252: es_DO.ISO8859-1
++Spanish_Ecuador.1252: es_EC.ISO8859-1
++Spanish - Modern Sort_Spain.1252: es_ES.ISO8859-1
++Spanish - Traditional Sort_Spain.1252: es_ES.ISO8859-1
++Spanish_Guatemala.1252: es_GT.ISO8859-1
++Spanish_Honduras.1252: es_HN.ISO8859-1
++Spanish_Mexican.1252: es_MX.ISO8859-1
++Spanish_Nicaragua.1252: es_NI.ISO8859-1
++Spanish_Panama.1252: es_PA.ISO8859-1
++Spanish_Paraguay.1252: es_PY.ISO8859-1
++Spanish_Peru.1252: es_PE.ISO8859-1
++Spanish_Puerto Rico.1252: es_PR.ISO8859-1
++Spanish_El Salvador.1252: es_SV.ISO8859-1
++Spanish_Uruguay.1252: es_UY.ISO8859-1
++Spanish_Venezuela.1252: es_VE.ISO8859-1
++Estonian_Estonia.1257: et_EE.ISO8859-13
++Basque_Spain.1252: eu_ES.ISO8859-1
++Finnish_Finland.1252: fi_FI.ISO8859-1
++French_Belgium.1252: fr_BE.ISO8859-1
++French_Canada.1252: fr_CA.ISO8859-1
++French_Switzerland.1252: fr_CH.ISO8859-1
++French_France.1252: fr_FR.ISO8859-1
++French_Luxembourg.1252: fr_LU.ISO8859-1
++Faeroese_Faeroe Islands.1252: fo_FO.ISO8859-1
++Hebrew_Israel.1255: he_IL.ISO8859-8
++Croatian_Croatia.1250: hr_HR.ISO8859-2
++Hungarian_Hungary.1250: hu_HU.ISO8859-2
++Indonesian_Indonesia.1252: id_ID.ISO8859-1
++Icelandic_Iceland.1252: is_IS.ISO8859-1
++Italian_Switzerland.1252: it_CH.ISO8859-1
++Italian_Italy.1252: it_IT.ISO8859-1
++Japanese_Japan.932: ja_JP.SJIS
++Korean_Korea.949: ko_KR.eucKR
++Lithuanian_Lithuania.1257: lt_LT.ISO8859-13
++Latvian_Latvia.1257: lv_LV.ISO8859-13
++Dutch_Belgium.1252: nl_BE.ISO8859-1
++Dutch_Netherlands.1252: nl_NL.ISO8859-1
++Norwegian (Nynorsk)_Norway.1252: no_NO.ISO8859-1
++Norwegian (Bokm�_Norway.1252: no_NO.ISO8859-1
++Polish_Poland.1250: pl_PL.ISO8859-2
++Portuguese_Brazil.1252: pt_BR.ISO8859-1
++Portuguese_Portugal.1252: pt_PT.ISO8859-1
++Romanian_Romania.1250: ro_RO.ISO8859-2
++Russian_Russia.1251: ru_RU.ISO8859-5
++Slovak_Slovakia.1250: sk_SK.ISO8859-2
++Slovene_Slovenia.1250: sl_SI.ISO8859-2
++Albanian_Albania.1250: sq_AL.ISO8859-2
++Serbian (Latin)_Serbia.1250: sr_YU.ISO8859-2
++Swedish_Finland.1252: sv_FI.ISO8859-1
++Swedish_Sweden.1252: sv_SE.ISO8859-1
++Turkish_Turkey.1254: tr_TR.ISO8859-9
++Ukrainian_Ukraine.1251: uk_UA.ISO8859-5
++Chinese(PRC)_People's Republic of China.936: zh_CN.eucCN
++Chinese(PRC)_Hong Kong.950: zh_TW.eucTW
++Chinese(Singapore)_Signapore.936: zh_CN.eucCN
++Chinese(Taiwan)_Taiwan.950: zh_TW.eucTW
#endif
XCOMM Other miscellaneous locale names
ISO8859-1: en_US.ISO8859-1
-Index: libx11-1.0.0/nls/locale.dir.pre
+Index: libx11/nls/locale.dir.pre
===================================================================
---- libx11-1.0.0.orig/nls/locale.dir.pre 2006-02-27 12:58:05.000000000 +0700
-+++ libx11-1.0.0/nls/locale.dir.pre 2006-02-27 12:58:41.000000000 +0700
+--- libx11.orig/nls/locale.dir.pre 2006-07-03 14:10:29.000000000 -0400
++++ libx11/nls/locale.dir.pre 2006-07-03 14:38:58.000000000 -0400
@@ -9,8 +9,13 @@
XCOMM
@@ -835,7 +840,7 @@
iso8859-2/XLC_LOCALE: pl_PL.ISO8859-2
iso8859-1/XLC_LOCALE: pp_AN.ISO8859-1
iso8859-1/XLC_LOCALE: pt_BR.ISO8859-1
-@@ -197,17 +216,22 @@
+@@ -197,11 +216,15 @@
iso8859-5/XLC_LOCALE: ru_RU.ISO8859-5
microsoft-cp1251/XLC_LOCALE: ru_RU.CP1251
koi8-r/XLC_LOCALE: ru_RU.KOI8-R
@@ -850,15 +855,8 @@
+iso8859-1/XLC_LOCALE: so_SO.ISO8859-1
iso8859-5/XLC_LOCALE: sp_YU.ISO8859-5
iso8859-2/XLC_LOCALE: sq_AL.ISO8859-2
- iso8859-2/XLC_LOCALE: sr_SP.ISO8859-2
- iso8859-2/XLC_LOCALE: sr_YU.ISO8859-2
- iso8859-5/XLC_LOCALE: sr_YU.ISO8859-5
- microsoft-cp1251/XLC_LOCALE: sr_YU.CP1251
-+iso8859-1/XLC_LOCALE: st_ZA.ISO8859-1
- iso8859-1/XLC_LOCALE: ss_ZA.ISO8859-1
- iso8859-1/XLC_LOCALE: st_ZA.ISO8859-1
- iso8859-1/XLC_LOCALE: sv_FI.ISO8859-1
-@@ -216,8 +240,8 @@
+ iso8859-2/XLC_LOCALE: sr_CS.ISO8859-2
+@@ -218,8 +241,8 @@
iso8859-15/XLC_LOCALE: sv_SE.ISO8859-15
tscii-0/XLC_LOCALE: ta_IN.TSCII-0
koi8-c/XLC_LOCALE: tg_TJ.KOI8-C
@@ -868,7 +866,7 @@
iso8859-1/XLC_LOCALE: tl_PH.ISO8859-1
iso8859-15/XLC_LOCALE: tn_ZA.ISO8859-15
iso8859-9/XLC_LOCALE: tr_TR.ISO8859-9
-@@ -228,6 +252,7 @@
+@@ -230,6 +253,7 @@
microsoft-cp1251/XLC_LOCALE: uk_UA.CP1251
koi8-u/XLC_LOCALE: uk_UA.KOI8-U
microsoft-cp1256/XLC_LOCALE: ur_PK.CP1256
@@ -876,7 +874,7 @@
vi_VN.tcvn/XLC_LOCALE: vi_VN.TCVN
vi_VN.viscii/XLC_LOCALE: vi_VN.VISCII
iso8859-1/XLC_LOCALE: wa_BE.ISO8859-1
-@@ -243,10 +268,17 @@
+@@ -245,10 +269,17 @@
zh_HK.big5hkscs/XLC_LOCALE: zh_HK.Big5-HKSCS
zh_HK.big5hkscs/XLC_LOCALE: zh_HK.big5hkscs
zh_HK.big5hkscs/XLC_LOCALE: zh_HK.Big5HKSCS
@@ -894,7 +892,7 @@
en_US.UTF-8/XLC_LOCALE: af_ZA.UTF-8
en_US.UTF-8/XLC_LOCALE: am_ET.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_AA.UTF-8
-@@ -254,6 +286,7 @@
+@@ -256,6 +287,7 @@
en_US.UTF-8/XLC_LOCALE: ar_BH.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_DZ.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_EG.UTF-8
@@ -902,7 +900,7 @@
en_US.UTF-8/XLC_LOCALE: ar_IQ.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_JO.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_KW.UTF-8
-@@ -269,12 +302,12 @@
+@@ -271,12 +303,12 @@
en_US.UTF-8/XLC_LOCALE: ar_TN.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_YE.UTF-8
en_US.UTF-8/XLC_LOCALE: az_AZ.UTF-8
@@ -916,7 +914,7 @@
en_US.UTF-8/XLC_LOCALE: ca_ES.UTF-8
en_US.UTF-8/XLC_LOCALE: cs_CZ.UTF-8
en_US.UTF-8/XLC_LOCALE: cy_GB.UTF-8
-@@ -289,18 +322,27 @@
+@@ -291,18 +323,27 @@
en_US.UTF-8/XLC_LOCALE: el_GR.UTF-8
en_US.UTF-8/XLC_LOCALE: en_AU.UTF-8
en_US.UTF-8/XLC_LOCALE: en_BE.UTF-8
@@ -946,7 +944,7 @@
en_US.UTF-8/XLC_LOCALE: es_AR.UTF-8
en_US.UTF-8/XLC_LOCALE: es_BO.UTF-8
en_US.UTF-8/XLC_LOCALE: es_CL.UTF-8
-@@ -318,10 +360,12 @@
+@@ -320,10 +361,12 @@
en_US.UTF-8/XLC_LOCALE: es_PR.UTF-8
en_US.UTF-8/XLC_LOCALE: es_PY.UTF-8
en_US.UTF-8/XLC_LOCALE: es_SV.UTF-8
@@ -959,7 +957,7 @@
en_US.UTF-8/XLC_LOCALE: fa_IR.UTF-8
en_US.UTF-8/XLC_LOCALE: fi_FI.UTF-8
en_US.UTF-8/XLC_LOCALE: fo_FO.UTF-8
-@@ -332,6 +376,8 @@
+@@ -334,6 +377,8 @@
en_US.UTF-8/XLC_LOCALE: fr_LU.UTF-8
en_US.UTF-8/XLC_LOCALE: ga_IE.UTF-8
en_US.UTF-8/XLC_LOCALE: gd_GB.UTF-8
@@ -968,7 +966,7 @@
en_US.UTF-8/XLC_LOCALE: gl_ES.UTF-8
en_US.UTF-8/XLC_LOCALE: gu_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: gv_GB.UTF-8
-@@ -345,9 +391,11 @@
+@@ -347,9 +392,11 @@
en_US.UTF-8/XLC_LOCALE: it_CH.UTF-8
en_US.UTF-8/XLC_LOCALE: it_IT.UTF-8
en_US.UTF-8/XLC_LOCALE: iu_CA.UTF-8
@@ -980,7 +978,7 @@
ko_KR.UTF-8/XLC_LOCALE: ko_KR.UTF-8
en_US.UTF-8/XLC_LOCALE: kw_GB.UTF-8
en_US.UTF-8/XLC_LOCALE: ky_KG.UTF-8
-@@ -356,20 +404,30 @@
+@@ -358,20 +405,30 @@
en_US.UTF-8/XLC_LOCALE: lv_LV.UTF-8
en_US.UTF-8/XLC_LOCALE: mi_NZ.UTF-8
en_US.UTF-8/XLC_LOCALE: mk_MK.UTF-8
@@ -1014,7 +1012,7 @@
en_US.UTF-8/XLC_LOCALE: ph_PH.UTF-8
en_US.UTF-8/XLC_LOCALE: pl_PL.UTF-8
en_US.UTF-8/XLC_LOCALE: pp_AN.UTF-8
-@@ -380,10 +438,12 @@
+@@ -382,10 +439,12 @@
en_US.UTF-8/XLC_LOCALE: ru_UA.UTF-8
en_US.UTF-8/XLC_LOCALE: rw_RW.UTF-8
en_US.UTF-8/XLC_LOCALE: se_NO.UTF-8
@@ -1025,9 +1023,9 @@
en_US.UTF-8/XLC_LOCALE: sl_SI.UTF-8
+en_US.UTF-8/XLC_LOCALE: so_ET.UTF-8
en_US.UTF-8/XLC_LOCALE: sq_AL.UTF-8
+ en_US.UTF-8/XLC_LOCALE: sr_CS.UTF-8
en_US.UTF-8/XLC_LOCALE: sr_YU.UTF-8
- en_US.UTF-8/XLC_LOCALE: ss_ZA.UTF-8
-@@ -391,10 +451,12 @@
+@@ -394,10 +453,12 @@
en_US.UTF-8/XLC_LOCALE: sv_FI.UTF-8
en_US.UTF-8/XLC_LOCALE: sv_SE.UTF-8
en_US.UTF-8/XLC_LOCALE: ta_IN.UTF-8
Modified: branches/7.1/lib/libx11/debian/patches/004_en_US.UTF-8_Compose_fix_Unicode_plane_1.diff
===================================================================
--- branches/7.1/lib/libx11/debian/patches/004_en_US.UTF-8_Compose_fix_Unicode_plane_1.diff 2006-07-03 18:13:04 UTC (rev 2420)
+++ branches/7.1/lib/libx11/debian/patches/004_en_US.UTF-8_Compose_fix_Unicode_plane_1.diff 2006-07-03 19:10:41 UTC (rev 2421)
@@ -16,55 +16,55 @@
Update: pt_BR.UTF-8 part removed. We replace it by a simple #include with a
couple of additional entries later anyway. (Eugene Konev)
-Index: libx11-1.0.0/nls/en_US.UTF-8/Compose.pre
+Index: libx11/nls/en_US.UTF-8/Compose.pre
===================================================================
---- libx11-1.0.0.orig/nls/en_US.UTF-8/Compose.pre 2006-02-27 12:58:04.000000000 +0700
-+++ libx11-1.0.0/nls/en_US.UTF-8/Compose.pre 2006-02-27 12:58:44.000000000 +0700
-@@ -5576,25 +5576,25 @@
- <Multi_key> <U05bf> <hebrew_beth> : "בֿ" UFB4C # HEBREW LETTER BET WITH RAFE
- <Multi_key> <U05bf> <hebrew_kaph> : "כֿ" UFB4D # HEBREW LETTER KAF WITH RAFE
- <Multi_key> <U05bf> <hebrew_pe> : "פֿ" UFB4E # HEBREW LETTER PE WITH RAFE
--<Multi_key> <U1d157> <U1d165> : "텞" U1D15E # MUSICAL SYMBOL HALF NOTE
--<Multi_key> <U1d158> <U1d165> : "텟" U1D15F # MUSICAL SYMBOL QUARTER NOTE
--<Multi_key> <U1d15f> <U1d16e> : "텠" U1D160 # MUSICAL SYMBOL EIGHTH NOTE
--<Multi_key> <U1d158> <U1d165> <U1d16e> : "텠" U1D160 # MUSICAL SYMBOL EIGHTH NOTE
--<Multi_key> <U1d15f> <U1d16f> : "텡" U1D161 # MUSICAL SYMBOL SIXTEENTH NOTE
--<Multi_key> <U1d158> <U1d165> <U1d16f> : "텡" U1D161 # MUSICAL SYMBOL SIXTEENTH NOTE
--<Multi_key> <U1d15f> <U1d170> : "텢" U1D162 # MUSICAL SYMBOL THIRTY-SECOND NOTE
--<Multi_key> <U1d158> <U1d165> <U1d170> : "텢" U1D162 # MUSICAL SYMBOL THIRTY-SECOND NOTE
--<Multi_key> <U1d15f> <U1d171> : "텣" U1D163 # MUSICAL SYMBOL SIXTY-FOURTH NOTE
--<Multi_key> <U1d158> <U1d165> <U1d171> : "텣" U1D163 # MUSICAL SYMBOL SIXTY-FOURTH NOTE
--<Multi_key> <U1d15f> <U1d172> : "텤" U1D164 # MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE
--<Multi_key> <U1d158> <U1d165> <U1d172> : "텤" U1D164 # MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE
--<Multi_key> <U1d1b9> <U1d165> : "톻" U1D1BB # MUSICAL SYMBOL MINIMA
--<Multi_key> <U1d1ba> <U1d165> : "톼" U1D1BC # MUSICAL SYMBOL MINIMA BLACK
--<Multi_key> <U1d1bb> <U1d16e> : "톽" U1D1BD # MUSICAL SYMBOL SEMIMINIMA WHITE
--<Multi_key> <U1d1b9> <U1d165> <U1d16e> : "톽" U1D1BD # MUSICAL SYMBOL SEMIMINIMA WHITE
--<Multi_key> <U1d1bc> <U1d16e> : "톾" U1D1BE # MUSICAL SYMBOL SEMIMINIMA BLACK
--<Multi_key> <U1d1ba> <U1d165> <U1d16e> : "톾" U1D1BE # MUSICAL SYMBOL SEMIMINIMA BLACK
--<Multi_key> <U1d1bb> <U1d16f> : "톿" U1D1BF # MUSICAL SYMBOL FUSA WHITE
--<Multi_key> <U1d1b9> <U1d165> <U1d16f> : "톿" U1D1BF # MUSICAL SYMBOL FUSA WHITE
--<Multi_key> <U1d1bc> <U1d16f> : "퇀" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
--<Multi_key> <U1d1ba> <U1d165> <U1d16f> : "퇀" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
-+<Multi_key> <U1d157> <U1d165> : "𝅗𝅥" U1D15E # MUSICAL SYMBOL HALF NOTE
-+<Multi_key> <U1d158> <U1d165> : "𝅘𝅥" U1D15F # MUSICAL SYMBOL QUARTER NOTE
-+<Multi_key> <U1d15f> <U1d16e> : "𝅘𝅥𝅮" U1D160 # MUSICAL SYMBOL EIGHTH NOTE
-+<Multi_key> <U1d158> <U1d165> <U1d16e> : "𝅘𝅥𝅮" U1D160 # MUSICAL SYMBOL EIGHTH NOTE
-+<Multi_key> <U1d15f> <U1d16f> : "𝅘𝅥𝅯" U1D161 # MUSICAL SYMBOL SIXTEENTH NOTE
-+<Multi_key> <U1d158> <U1d165> <U1d16f> : "𝅘𝅥𝅯" U1D161 # MUSICAL SYMBOL SIXTEENTH NOTE
-+<Multi_key> <U1d15f> <U1d170> : "𝅘𝅥𝅰" U1D162 # MUSICAL SYMBOL THIRTY-SECOND NOTE
-+<Multi_key> <U1d158> <U1d165> <U1d170> : "𝅘𝅥𝅰" U1D162 # MUSICAL SYMBOL THIRTY-SECOND NOTE
-+<Multi_key> <U1d15f> <U1d171> : "𝅘𝅥𝅱" U1D163 # MUSICAL SYMBOL SIXTY-FOURTH NOTE
-+<Multi_key> <U1d158> <U1d165> <U1d171> : "𝅘𝅥𝅱" U1D163 # MUSICAL SYMBOL SIXTY-FOURTH NOTE
-+<Multi_key> <U1d15f> <U1d172> : "𝅘𝅥𝅲" U1D164 # MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE
-+<Multi_key> <U1d158> <U1d165> <U1d172> : "𝅘𝅥𝅲" U1D164 # MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE
-+<Multi_key> <U1d1b9> <U1d165> : "𝆹𝅥" U1D1BB # MUSICAL SYMBOL MINIMA
-+<Multi_key> <U1d1ba> <U1d165> : "𝆺𝅥" U1D1BC # MUSICAL SYMBOL MINIMA BLACK
-+<Multi_key> <U1d1bb> <U1d16e> : "𝆹𝅥𝅮" U1D1BD # MUSICAL SYMBOL SEMIMINIMA WHITE
-+<Multi_key> <U1d1b9> <U1d165> <U1d16e> : "𝆹𝅥𝅮" U1D1BD # MUSICAL SYMBOL SEMIMINIMA WHITE
-+<Multi_key> <U1d1bc> <U1d16e> : "𝆺𝅥𝅮" U1D1BE # MUSICAL SYMBOL SEMIMINIMA BLACK
-+<Multi_key> <U1d1ba> <U1d165> <U1d16e> : "𝆺𝅥𝅮" U1D1BE # MUSICAL SYMBOL SEMIMINIMA BLACK
-+<Multi_key> <U1d1bb> <U1d16f> : "𝆹𝅥𝅯" U1D1BF # MUSICAL SYMBOL FUSA WHITE
-+<Multi_key> <U1d1b9> <U1d165> <U1d16f> : "𝆹𝅥𝅯" U1D1BF # MUSICAL SYMBOL FUSA WHITE
-+<Multi_key> <U1d1bc> <U1d16f> : "𝆺𝅥𝅯" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
-+<Multi_key> <U1d1ba> <U1d165> <U1d16f> : "𝆺𝅥𝅯" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
+--- libx11.orig/nls/en_US.UTF-8/Compose.pre 2006-07-03 14:10:38.000000000 -0400
++++ libx11/nls/en_US.UTF-8/Compose.pre 2006-07-03 14:56:04.000000000 -0400
+@@ -5570,25 +5570,25 @@
+ <Multi_key> <U100005BF> <hebrew_beth> : "בֿ" UFB4C # HEBREW LETTER BET WITH RAFE
+ <Multi_key> <U100005BF> <hebrew_kaph> : "כֿ" UFB4D # HEBREW LETTER KAF WITH RAFE
+ <Multi_key> <U100005BF> <hebrew_pe> : "פֿ" UFB4E # HEBREW LETTER PE WITH RAFE
+-<Multi_key> <U1001D157> <U1001D165> : "텞" U1D15E # MUSICAL SYMBOL HALF NOTE
+-<Multi_key> <U1001D158> <U1001D165> : "텟" U1D15F # MUSICAL SYMBOL QUARTER NOTE
+-<Multi_key> <U1001D15F> <U1001D16E> : "텠" U1D160 # MUSICAL SYMBOL EIGHTH NOTE
+-<Multi_key> <U1001D158> <U1001D165> <U1001D16E> : "텠" U1D160 # MUSICAL SYMBOL EIGHTH NOTE
+-<Multi_key> <U1001D15F> <U1001D16F> : "텡" U1D161 # MUSICAL SYMBOL SIXTEENTH NOTE
+-<Multi_key> <U1001D158> <U1001D165> <U1001D16F> : "텡" U1D161 # MUSICAL SYMBOL SIXTEENTH NOTE
+-<Multi_key> <U1001D15F> <U1001D170> : "텢" U1D162 # MUSICAL SYMBOL THIRTY-SECOND NOTE
+-<Multi_key> <U1001D158> <U1001D165> <U1001D170> : "텢" U1D162 # MUSICAL SYMBOL THIRTY-SECOND NOTE
+-<Multi_key> <U1001D15F> <U1001D171> : "텣" U1D163 # MUSICAL SYMBOL SIXTY-FOURTH NOTE
+-<Multi_key> <U1001D158> <U1001D165> <U1001D171> : "텣" U1D163 # MUSICAL SYMBOL SIXTY-FOURTH NOTE
+-<Multi_key> <U1001D15F> <U1001D172> : "텤" U1D164 # MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE
+-<Multi_key> <U1001D158> <U1001D165> <U1001D172> : "텤" U1D164 # MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE
+-<Multi_key> <U1001D1B9> <U1001D165> : "톻" U1D1BB # MUSICAL SYMBOL MINIMA
+-<Multi_key> <U1001D1BA> <U1001D165> : "톼" U1D1BC # MUSICAL SYMBOL MINIMA BLACK
+-<Multi_key> <U1001D1BB> <U1001D16E> : "톽" U1D1BD # MUSICAL SYMBOL SEMIMINIMA WHITE
+-<Multi_key> <U1001D1B9> <U1001D165> <U1001D16E> : "톽" U1D1BD # MUSICAL SYMBOL SEMIMINIMA WHITE
+-<Multi_key> <U1001D1BC> <U1001D16E> : "톾" U1D1BE # MUSICAL SYMBOL SEMIMINIMA BLACK
+-<Multi_key> <U1001D1BA> <U1001D165> <U1001D16E> : "톾" U1D1BE # MUSICAL SYMBOL SEMIMINIMA BLACK
+-<Multi_key> <U1001D1BB> <U1001D16F> : "톿" U1D1BF # MUSICAL SYMBOL FUSA WHITE
+-<Multi_key> <U1001D1B9> <U1001D165> <U1001D16F> : "톿" U1D1BF # MUSICAL SYMBOL FUSA WHITE
+-<Multi_key> <U1001D1BC> <U1001D16F> : "퇀" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
+-<Multi_key> <U1001D1BA> <U1001D165> <U1001D16F> : "퇀" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
++<Multi_key> <U1001D157> <U1001D165> : "?" U1D15E # MUSICAL SYMBOL HALF NOTE
++<Multi_key> <U1001D158> <U1001D165> : "?" U1D15F # MUSICAL SYMBOL QUARTER NOTE
++<Multi_key> <U1001D15F> <U1001D16E> : "?" U1D160 # MUSICAL SYMBOL EIGHTH NOTE
++<Multi_key> <U1001D158> <U1001D165> <U1001D16E> : "?" U1D160 # MUSICAL SYMBOL EIGHTH NOTE
++<Multi_key> <U1001D15F> <U1001D16F> : "?" U1D161 # MUSICAL SYMBOL SIXTEENTH NOTE
++<Multi_key> <U1001D158> <U1001D165> <U1001D16F> : "?" U1D161 # MUSICAL SYMBOL SIXTEENTH NOTE
++<Multi_key> <U1001D15F> <U1001D170> : "?" U1D162 # MUSICAL SYMBOL THIRTY-SECOND NOTE
++<Multi_key> <U1001D158> <U1001D165> <U1001D170> : "?" U1D162 # MUSICAL SYMBOL THIRTY-SECOND NOTE
++<Multi_key> <U1001D15F> <U1001D171> : "?" U1D163 # MUSICAL SYMBOL SIXTY-FOURTH NOTE
++<Multi_key> <U1001D158> <U1001D165> <U1001D171> : "?" U1D163 # MUSICAL SYMBOL SIXTY-FOURTH NOTE
++<Multi_key> <U1001D15F> <U1001D172> : "?" U1D164 # MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE
++<Multi_key> <U1001D158> <U1001D165> <U1001D172> : "?" U1D164 # MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE
++<Multi_key> <U1001D1B9> <U1001D165> : "?" U1D1BB # MUSICAL SYMBOL MINIMA
++<Multi_key> <U1001D1BA> <U1001D165> : "?" U1D1BC # MUSICAL SYMBOL MINIMA BLACK
++<Multi_key> <U1001D1BB> <U1001D16E> : "?" U1D1BD # MUSICAL SYMBOL SEMIMINIMA WHITE
++<Multi_key> <U1001D1B9> <U1001D165> <U1001D16E> : "?" U1D1BD # MUSICAL SYMBOL SEMIMINIMA WHITE
++<Multi_key> <U1001D1BC> <U1001D16E> : "?" U1D1BE # MUSICAL SYMBOL SEMIMINIMA BLACK
++<Multi_key> <U1001D1BA> <U1001D165> <U1001D16E> : "?" U1D1BE # MUSICAL SYMBOL SEMIMINIMA BLACK
++<Multi_key> <U1001D1BB> <U1001D16F> : "?" U1D1BF # MUSICAL SYMBOL FUSA WHITE
++<Multi_key> <U1001D1B9> <U1001D165> <U1001D16F> : "?" U1D1BF # MUSICAL SYMBOL FUSA WHITE
++<Multi_key> <U1001D1BC> <U1001D16F> : "?" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
++<Multi_key> <U1001D1BA> <U1001D165> <U1001D16F> : "?" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
Deleted: branches/7.1/lib/libx11/debian/patches/010_manpages_fix.diff
===================================================================
--- branches/7.1/lib/libx11/debian/patches/010_manpages_fix.diff 2006-07-03 18:13:04 UTC (rev 2420)
+++ branches/7.1/lib/libx11/debian/patches/010_manpages_fix.diff 2006-07-03 19:10:41 UTC (rev 2421)
@@ -1,584 +0,0 @@
-Index: libx11-1.0.0/man/Makefile.am
-===================================================================
---- libx11-1.0.0.orig/man/Makefile.am 2006-02-27 12:58:02.000000000 +0700
-+++ libx11-1.0.0/man/Makefile.am 2006-02-27 12:58:55.000000000 +0700
-@@ -3,6 +3,8 @@
-
- libmandir = $(LIB_MAN_DIR)
-
-+LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
-+
- libman_PRE = \
- AllPlanes.man \
- BlackPixelOfScreen.man \
-@@ -1070,428 +1072,429 @@
- XmbTextPerCharExtents_shadows = \
- XwcTextPerCharExtents \
- Xutf8TextPerCharExtents
-+
- shadows.DONE:
- -rm -f $(all_aliases:=.@LIB_MAN_SUFFIX@)
- (for i in $(AllPlanes_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/AllPlanes.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/AllPlanes.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(BlackPixelOfScreen_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/BlackPixelOfScreen.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/BlackPixelOfScreen.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(DisplayOfCCC_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/DisplayOfCCC.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/DisplayOfCCC.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(ImageByteOrder_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/ImageByteOrder.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/ImageByteOrder.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(IsCursorKey_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/IsCursorKey.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/IsCursorKey.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XAllocClassHint_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XAllocClassHint.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XAllocClassHint.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XAllocIconSize_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XAllocIconSize.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XAllocIconSize.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XAllocStandardColormap_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XAllocStandardColormap.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XAllocStandardColormap.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XAllocSizeHints_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XAllocSizeHints.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XAllocSizeHints.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XAllocWMHints_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XAllocWMHints.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XAllocWMHints.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XAddHost_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XAddHost.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XAddHost.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XAllocColor_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XAllocColor.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XAllocColor.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XAnyEvent_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XAnyEvent.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XAnyEvent.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XButtonEvent_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XButtonEvent.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XButtonEvent.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XChangeKeyboardControl_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XChangeKeyboardControl.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XChangeKeyboardControl.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XChangeKeyboardMapping_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XChangeKeyboardMapping.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XChangeKeyboardMapping.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XChangePointerControl_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XChangePointerControl.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XChangePointerControl.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XChangeSaveSet_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XChangeSaveSet.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XChangeSaveSet.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XChangeWindowAttributes_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XChangeWindowAttributes.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XChangeWindowAttributes.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XClearArea_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XClearArea.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XClearArea.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XConfigureWindow_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XConfigureWindow.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XConfigureWindow.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XCopyArea_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XCopyArea.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XCopyArea.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XCreateColormap_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XCreateColormap.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XCreateColormap.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XCreateFontCursor_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XCreateFontCursor.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XCreateFontCursor.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XCreateFontSet_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XCreateFontSet.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XCreateFontSet.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XCreateGC_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XCreateGC.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XCreateGC.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XCreateIC_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XCreateIC.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XCreateIC.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XInitImage_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XInitImage.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XInitImage.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XCreateOC_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XCreateOC.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XCreateOC.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XCreatePixmap_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XCreatePixmap.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XCreatePixmap.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XCreateRegion_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XCreateRegion.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XCreateRegion.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XCreateWindow_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XCreateWindow.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XCreateWindow.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XDefineCursor_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XDefineCursor.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XDefineCursor.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XDestroyWindow_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XDestroyWindow.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XDestroyWindow.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XDrawArc_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XDrawArc.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XDrawArc.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XDrawImageString_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XDrawImageString.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XDrawImageString.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XDrawLine_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XDrawLine.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XDrawLine.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XDrawPoint_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XDrawPoint.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XDrawPoint.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XDrawRectangle_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XDrawRectangle.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XDrawRectangle.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XDrawString_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XDrawString.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XDrawString.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XDrawText_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XDrawText.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XDrawText.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XEmptyRegion_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XEmptyRegion.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XEmptyRegion.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XFillRectangle_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XFillRectangle.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XFillRectangle.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XFlush_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XFlush.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XFlush.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XFontsOfFontSet_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XFontsOfFontSet.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XFontsOfFontSet.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XGraphicsExposeEvent_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XGraphicsExposeEvent.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XGraphicsExposeEvent.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XrmGetFileDatabase_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XrmGetFileDatabase.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XrmGetFileDatabase.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XrmGetResource_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XrmGetResource.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XrmGetResource.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XGetVisualInfo_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XGetVisualInfo.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XGetVisualInfo.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XGetWindowAttributes_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XGetWindowAttributes.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XGetWindowAttributes.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XGetWindowProperty_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XGetWindowProperty.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XGetWindowProperty.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XGrabButton_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XGrabButton.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XGrabButton.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XGrabKey_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XGrabKey.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XGrabKey.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XGrabKeyboard_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XGrabKeyboard.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XGrabKeyboard.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XGrabPointer_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XGrabPointer.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XGrabPointer.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XGrabServer_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XGrabServer.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XGrabServer.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XIconifyWindow_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XIconifyWindow.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XIconifyWindow.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XIfEvent_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XIfEvent.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XIfEvent.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XrmInitialize_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XrmInitialize.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XrmInitialize.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XInstallColormap_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XInstallColormap.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XInstallColormap.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XAddConnectionWatch_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XAddConnectionWatch.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XAddConnectionWatch.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XIntersectRegion_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XIntersectRegion.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XIntersectRegion.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XInternAtom_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XInternAtom.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XInternAtom.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XListFonts_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XListFonts.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XListFonts.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XLoadFont_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XLoadFont.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XLoadFont.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XLookupKeysym_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XLookupKeysym.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XLookupKeysym.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XrmMergeDatabases_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XrmMergeDatabases.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XrmMergeDatabases.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XMapEvent_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XMapEvent.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XMapEvent.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XMapWindow_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XMapWindow.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XMapWindow.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XNextEvent_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XNextEvent.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XNextEvent.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XOpenDisplay_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XOpenDisplay.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XOpenDisplay.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XOpenIM_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XOpenIM.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XOpenIM.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XOpenOM_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XOpenOM.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XOpenOM.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XParseGeometry_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XParseGeometry.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XParseGeometry.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XPolygonRegion_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XPolygonRegion.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XPolygonRegion.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XPutImage_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XPutImage.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XPutImage.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XrmPutResource_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XrmPutResource.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XrmPutResource.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XQueryBestSize_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XQueryBestSize.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XQueryBestSize.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XQueryColor_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XQueryColor.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XQueryColor.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XQueryExtension_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XQueryExtension.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XQueryExtension.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XResourceManagerString_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XResourceManagerString.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XResourceManagerString.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XRaiseWindow_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XRaiseWindow.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XRaiseWindow.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XReadBitmapFile_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XReadBitmapFile.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XReadBitmapFile.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XRecolorCursor_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XRecolorCursor.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XRecolorCursor.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSaveContext_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSaveContext.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSaveContext.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSetICFocus_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSetICFocus.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetICFocus.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSetICValues_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSetICValues.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetICValues.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XStringListToTextProperty_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XStringListToTextProperty.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XStringListToTextProperty.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSetArcMode_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSetArcMode.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetArcMode.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSetClipOrigin_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSetClipOrigin.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetClipOrigin.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSetCloseDownMode_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSetCloseDownMode.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetCloseDownMode.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSetCommand_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSetCommand.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetCommand.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSetErrorHandler_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSetErrorHandler.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetErrorHandler.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSendEvent_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSendEvent.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSendEvent.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSetFillStyle_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSetFillStyle.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetFillStyle.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSetFontPath_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSetFontPath.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetFontPath.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSetInputFocus_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSetInputFocus.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetInputFocus.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSetLineAttributes_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSetLineAttributes.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetLineAttributes.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSetPointerMapping_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSetPointerMapping.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetPointerMapping.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSetScreenSaver_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSetScreenSaver.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetScreenSaver.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSetSelectionOwner_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSetSelectionOwner.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetSelectionOwner.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSetState_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSetState.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetState.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSetTransientForHint_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSetTransientForHint.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetTransientForHint.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSetTextProperty_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSetTextProperty.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetTextProperty.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSetTile_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSetTile.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetTile.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSetWMClientMachine_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSetWMClientMachine.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetWMClientMachine.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSetWMColormapWindows_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSetWMColormapWindows.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetWMColormapWindows.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSetWMIconName_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSetWMIconName.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetWMIconName.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSetWMName_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSetWMName.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetWMName.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSetWMProperties_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSetWMProperties.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetWMProperties.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSetWMProtocols_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSetWMProtocols.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetWMProtocols.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XStoreBytes_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XStoreBytes.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XStoreBytes.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XStoreColors_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XStoreColors.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XStoreColors.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XStringToKeysym_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XStringToKeysym.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XStringToKeysym.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSupportsLocale_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSupportsLocale.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSupportsLocale.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XSynchronize_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XSynchronize.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSynchronize.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XmbTextListToTextProperty_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XmbTextListToTextProperty.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XmbTextListToTextProperty.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XTextExtents_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XTextExtents.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XTextExtents.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XTextWidth_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XTextWidth.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XTextWidth.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XInitThreads_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XInitThreads.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XInitThreads.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XrmUniqueQuark_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XrmUniqueQuark.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XrmUniqueQuark.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XUnmapWindow_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XUnmapWindow.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XUnmapWindow.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XcmsCCCOfColormap_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XcmsCCCOfColormap.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XcmsCCCOfColormap.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XcmsAllocColor_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XcmsAllocColor.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XcmsAllocColor.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XcmsColor_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XcmsColor.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XcmsColor.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XcmsCreateCCC_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XcmsCreateCCC.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XcmsCreateCCC.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XcmsCIELabQueryMaxC_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XcmsCIELabQueryMaxC.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XcmsCIELabQueryMaxC.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XcmsCIELuvQueryMaxC_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XcmsCIELuvQueryMaxC.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XcmsCIELuvQueryMaxC.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XcmsQueryBlack_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XcmsQueryBlack.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XcmsQueryBlack.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XcmsQueryColor_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XcmsQueryColor.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XcmsQueryColor.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XcmsStoreColor_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XcmsStoreColor.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XcmsStoreColor.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XcmsSetWhitePoint_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XcmsSetWhitePoint.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XcmsSetWhitePoint.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XcmsTekHVCQueryMaxC_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XcmsTekHVCQueryMaxC.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XcmsTekHVCQueryMaxC.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XmbDrawImageString_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XmbDrawImageString.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XmbDrawImageString.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XmbDrawString_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XmbDrawString.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XmbDrawString.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XmbDrawText_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XmbDrawText.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XmbDrawText.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XmbLookupString_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XmbLookupString.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XmbLookupString.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XmbResetIC_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XmbResetIC.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XmbResetIC.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XmbTextEscapement_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XmbTextEscapement.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XmbTextEscapement.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XmbTextExtents_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XmbTextExtents.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XmbTextExtents.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(XmbTextPerCharExtents_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/XmbTextPerCharExtents.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XmbTextPerCharExtents.$(LIB_MAN_SUFFIX) > $$i; \
- done)
Deleted: branches/7.1/lib/libx11/debian/patches/013_SECURITY_setuid.diff
===================================================================
--- branches/7.1/lib/libx11/debian/patches/013_SECURITY_setuid.diff 2006-07-03 18:13:04 UTC (rev 2420)
+++ branches/7.1/lib/libx11/debian/patches/013_SECURITY_setuid.diff 2006-07-03 19:10:41 UTC (rev 2421)
@@ -1,17 +0,0 @@
-Index: libx11/src/xlibi18n/lcFile.c
-===================================================================
---- libx11.orig/src/xlibi18n/lcFile.c 2006-06-30 02:34:10.000000000 -0400
-+++ libx11/src/xlibi18n/lcFile.c 2006-06-30 02:35:06.000000000 -0400
-@@ -269,7 +269,11 @@
- if (seteuid(0) != 0) {
- priv = 0;
- } else {
-- seteuid(oldeuid);
-+ if (seteuid(oldeuid) == -1) {
-+ /* XXX ouch, coudn't get back to original uid
-+ what can we do ??? */
-+ _exit(127);
-+ }
- priv = 1;
- }
- #endif
Modified: branches/7.1/lib/libx11/debian/patches/series
===================================================================
--- branches/7.1/lib/libx11/debian/patches/series 2006-07-03 18:13:04 UTC (rev 2420)
+++ branches/7.1/lib/libx11/debian/patches/series 2006-07-03 19:10:41 UTC (rev 2421)
@@ -7,7 +7,5 @@
007_iso8859-15_Compose_fix.diff
008_remove_ko_Compose.diff
009_iso8859-15_Compose_Eurosign.diff
-010_manpages_fix.diff
011_stolen_from_ubuntu_xlocalelibdir.diff
012_ru_RU_UTF-8_XLC_LOCALE.diff
-013_SECURITY_setuid.diff
Modified: branches/7.1/lib/libx11/debian/rules
===================================================================
--- branches/7.1/lib/libx11/debian/rules 2006-07-03 18:13:04 UTC (rev 2420)
+++ branches/7.1/lib/libx11/debian/rules 2006-07-03 19:10:41 UTC (rev 2421)
@@ -107,7 +107,7 @@
dh_installdocs -i
dh_installchangelogs -i
- dh_install --sourcedir=debian/tmp $(dhinstallindepflags)
+ dh_install --sourcedir=debian/tmp $(dhinstallindepflags) --list-missing
dh_link -i
dh_compress -i
dh_fixperms -i
Reply to: