.gitignore | 57 AUTHORS | 2 ChangeLog | 825 Makefile.am | 5 Makefile.in | 749 README | 77 acinclude.m4 | 178 aclocal.m4 | 8347 ---- compile | 142 config.guess | 1526 config.sub | 1658 configure |26615 ------------- configure.ac | 79 cpprules.in | 3 debian/changelog | 22 debian/control | 17 debian/libx11-6.postinst.in | 23 debian/libx11-data.install | 178 debian/patches/002_arm_abi_brain_damage.diff | 8 debian/patches/003_recognize_glibc_2.3.2_locale_names.diff | 10 debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff | 25 debian/patches/007_iso8859-15_Compose_fix.diff | 22 debian/patches/012_ru_RU_UTF-8_XLC_LOCALE.diff | 16 debian/rules | 24 depcomp | 589 include/.gitignore | 2 include/Makefile.in | 489 include/X11/.gitignore | 2 include/X11/XKBlib.h | 26 include/X11/Xcms.h | 8 include/X11/Xlib.h | 104 include/X11/Xlibint.h | 47 include/X11/Xregion.h | 18 include/X11/Xresource.h | 14 include/X11/Xutil.h | 28 include/X11/cursorfont.h | 5 install-sh | 519 ltmain.sh | 6964 --- man/.gitignore | 3 man/Makefile.in | 2088 - man/xkb/Makefile.in | 656 man/xkb/XkbGetIndicatorState.man | 4 man/xkb/XkbSAGroup.man | 5 man/xkb/XkbSASetGroup.man | 5 man/xkb/XkbSetIndicatorMap.man | 4 missing | 367 mkinstalldirs | 161 modules/.gitignore | 2 modules/Makefile.in | 535 modules/im/.gitignore | 2 modules/im/Makefile.in | 535 modules/im/ximcp/.gitignore | 7 modules/im/ximcp/Makefile.in | 620 modules/im/ximcp/imCallbk.c | 138 modules/im/ximcp/imDefFlt.c | 16 modules/im/ximcp/imDefIc.c | 8 modules/im/ximcp/imDefIm.c | 24 modules/im/ximcp/imDefLkup.c | 19 modules/im/ximcp/imDispch.c | 10 modules/im/ximcp/imEvToWire.c | 32 modules/im/ximcp/imExten.c | 10 modules/im/ximcp/imImSw.c | 18 modules/im/ximcp/imInsClbk.c | 3 modules/im/ximcp/imInt.c | 21 modules/im/ximcp/imLcFlt.c | 12 modules/im/ximcp/imLcGIc.c | 8 modules/im/ximcp/imLcIc.c | 4 modules/im/ximcp/imLcIm.c | 31 modules/im/ximcp/imLcLkup.c | 62 modules/im/ximcp/imLcPrs.c | 6 modules/im/ximcp/imLcSIc.c | 8 modules/im/ximcp/imRm.c | 70 modules/im/ximcp/imRmAttr.c | 6 modules/im/ximcp/imThaiFlt.c | 108 modules/im/ximcp/imThaiIc.c | 18 modules/im/ximcp/imThaiIm.c | 30 modules/im/ximcp/imTrX.c | 23 modules/im/ximcp/imTrans.c | 6 modules/im/ximcp/imTransR.c | 27 modules/lc/.gitignore | 2 modules/lc/Makefile.in | 535 modules/lc/Utf8/.gitignore | 7 modules/lc/Utf8/Makefile.in | 561 modules/lc/Utf8/lcUTF8Load.c | 14 modules/lc/def/.gitignore | 7 modules/lc/def/Makefile.in | 559 modules/lc/gen/.gitignore | 7 modules/lc/gen/Makefile.in | 559 modules/lc/gen/lcGenConv.c | 102 modules/lc/xlocale/.gitignore | 7 modules/lc/xlocale/Makefile.in | 563 modules/lc/xlocale/lcEuc.c | 26 modules/lc/xlocale/lcJis.c | 24 modules/lc/xlocale/lcSjis.c | 30 modules/om/.gitignore | 2 modules/om/Makefile.in | 535 modules/om/generic/.gitignore | 7 modules/om/generic/Makefile.in | 578 modules/om/generic/omGeneric.c | 107 modules/om/generic/omText.c | 6 modules/om/generic/omTextEsc.c | 2 modules/om/generic/omTextPer.c | 2 modules/om/generic/omXChar.c | 12 nls/.gitignore | 11 nls/C/.gitignore | 4 nls/C/Makefile.in | 463 nls/Makefile.in | 681 nls/am_ET.UTF-8/.gitignore | 4 nls/am_ET.UTF-8/Compose.pre | 556 nls/am_ET.UTF-8/Makefile.in | 463 nls/armscii-8/.gitignore | 4 nls/armscii-8/Makefile.in | 463 nls/compose.dir.pre | 2 nls/el_GR.UTF-8/.gitignore | 4 nls/el_GR.UTF-8/Compose.pre | 13 nls/el_GR.UTF-8/Makefile.in | 463 nls/en_US.UTF-8/.gitignore | 4 nls/en_US.UTF-8/Compose.pre | 503 nls/en_US.UTF-8/Makefile.in | 463 nls/en_US.UTF-8/XLC_LOCALE.pre | 198 nls/fi_FI.UTF-8/Compose.pre | 6691 +++ nls/fi_FI.UTF-8/Makefile.am | 3 nls/georgian-academy/.gitignore | 4 nls/georgian-academy/Makefile.in | 463 nls/georgian-ps/.gitignore | 4 nls/georgian-ps/Makefile.in | 463 nls/ibm-cp1133/.gitignore | 4 nls/ibm-cp1133/Makefile.in | 463 nls/iscii-dev/.gitignore | 4 nls/iscii-dev/Makefile.in | 463 nls/isiri-3342/.gitignore | 4 nls/isiri-3342/Makefile.in | 463 nls/iso8859-1/.gitignore | 4 nls/iso8859-1/Makefile.in | 463 nls/iso8859-10/.gitignore | 4 nls/iso8859-10/Makefile.in | 463 nls/iso8859-11/.gitignore | 4 nls/iso8859-11/Makefile.in | 463 nls/iso8859-13/.gitignore | 4 nls/iso8859-13/Makefile.in | 463 nls/iso8859-14/.gitignore | 4 nls/iso8859-14/Makefile.in | 463 nls/iso8859-15/.gitignore | 4 nls/iso8859-15/Makefile.in | 463 nls/iso8859-2/.gitignore | 4 nls/iso8859-2/Makefile.in | 463 nls/iso8859-3/.gitignore | 4 nls/iso8859-3/Makefile.in | 463 nls/iso8859-4/.gitignore | 4 nls/iso8859-4/Makefile.in | 463 nls/iso8859-5/.gitignore | 4 nls/iso8859-5/Makefile.in | 463 nls/iso8859-6/.gitignore | 4 nls/iso8859-6/Makefile.in | 463 nls/iso8859-7/.gitignore | 4 nls/iso8859-7/Makefile.in | 463 nls/iso8859-8/.gitignore | 4 nls/iso8859-8/Makefile.in | 463 nls/iso8859-9/.gitignore | 4 nls/iso8859-9/Makefile.in | 463 nls/iso8859-9e/.gitignore | 4 nls/iso8859-9e/Makefile.in | 463 nls/ja.JIS/.gitignore | 4 nls/ja.JIS/Makefile.in | 463 nls/ja.S90/.gitignore | 4 nls/ja.S90/Makefile.in | 463 nls/ja.SJIS/.gitignore | 4 nls/ja.SJIS/Makefile.in | 463 nls/ja.U90/.gitignore | 4 nls/ja.U90/Makefile.in | 463 nls/ja/.gitignore | 4 nls/ja/Makefile.in | 463 nls/ja_JP.UTF-8/.gitignore | 4 nls/ja_JP.UTF-8/Makefile.in | 463 nls/ko/.gitignore | 4 nls/ko/Makefile.in | 463 nls/ko_KR.UTF-8/.gitignore | 4 nls/ko_KR.UTF-8/Makefile.in | 463 nls/koi8-c/.gitignore | 4 nls/koi8-c/Makefile.in | 463 nls/koi8-r/.gitignore | 4 nls/koi8-r/Makefile.in | 463 nls/koi8-u/.gitignore | 4 nls/koi8-u/Makefile.in | 463 nls/locale.dir.pre | 2 nls/microsoft-cp1251/.gitignore | 4 nls/microsoft-cp1251/Makefile.in | 463 nls/microsoft-cp1255/.gitignore | 4 nls/microsoft-cp1255/Makefile.in | 463 nls/microsoft-cp1256/.gitignore | 4 nls/microsoft-cp1256/Makefile.in | 463 nls/mulelao-1/.gitignore | 4 nls/mulelao-1/Makefile.in | 463 nls/nokhchi-1/.gitignore | 4 nls/nokhchi-1/Makefile.in | 463 nls/pt_BR.UTF-8/.gitignore | 4 nls/pt_BR.UTF-8/Compose.pre | 19 nls/pt_BR.UTF-8/Makefile.in | 463 nls/ru_RU.UTF-8/Makefile.in | 463 nls/tatar-cyr/.gitignore | 4 nls/tatar-cyr/Makefile.in | 463 nls/th_TH.UTF-8/.gitignore | 4 nls/th_TH.UTF-8/Makefile.in | 463 nls/th_TH/.gitignore | 4 nls/th_TH/Makefile.in | 463 nls/tscii-0/.gitignore | 4 nls/tscii-0/Makefile.in | 463 nls/vi_VN.tcvn/.gitignore | 4 nls/vi_VN.tcvn/Makefile.in | 463 nls/vi_VN.viscii/.gitignore | 4 nls/vi_VN.viscii/Makefile.in | 463 nls/zh_CN.UTF-8/.gitignore | 4 nls/zh_CN.UTF-8/Makefile.in | 463 nls/zh_CN.gb18030/.gitignore | 4 nls/zh_CN.gb18030/Makefile.in | 463 nls/zh_CN.gbk/.gitignore | 4 nls/zh_CN.gbk/Makefile.in | 463 nls/zh_CN/.gitignore | 4 nls/zh_CN/Makefile.in | 463 nls/zh_HK.UTF-8/.gitignore | 4 nls/zh_HK.UTF-8/Makefile.in | 463 nls/zh_HK.big5/.gitignore | 4 nls/zh_HK.big5/Makefile.in | 463 nls/zh_HK.big5hkscs/.gitignore | 4 nls/zh_HK.big5hkscs/Makefile.in | 463 nls/zh_TW.UTF-8/.gitignore | 4 nls/zh_TW.UTF-8/Makefile.in | 463 nls/zh_TW.big5/.gitignore | 4 nls/zh_TW.big5/Makefile.in | 463 nls/zh_TW/.gitignore | 4 nls/zh_TW/Makefile.in | 463 src/.gitignore | 12 src/AllPlanes.c | 10 src/ChClMode.c | 2 src/ChKeyCon.c | 2 src/ChProp.c | 2 src/ChkIfEv.c | 2 src/ChkMaskEv.c | 2 src/ChkTypEv.c | 2 src/ChkTypWEv.c | 2 src/ChkWinEv.c | 2 src/ClDisplay.c | 2 src/ClearArea.c | 2 src/ConnDis.c | 230 src/Context.c | 23 src/ConvSel.c | 2 src/CopyArea.c | 2 src/CopyCmap.c | 2 src/CopyGC.c | 20 src/CopyPlane.c | 4 src/CrBFData.c | 6 src/CrCursor.c | 8 src/CrGC.c | 12 src/CrGlCur.c | 6 src/CrPFBData.c | 8 src/CrWindow.c | 4 src/Cursor.c | 4 src/Depths.c | 2 src/DisName.c | 6 src/DrArc.c | 4 src/DrLine.c | 4 src/DrRect.c | 2 src/ErrDes.c | 12 src/ErrHndlr.c | 10 src/EvToWire.c | 6 src/FSWrap.c | 14 src/FetchName.c | 4 src/FillPoly.c | 2 src/FillRct.c | 4 src/FillRcts.c | 2 src/FilterEv.c | 4 src/Font.c | 10 src/FontInfo.c | 8 src/FontNames.c | 4 src/FreeEData.c | 2 src/FreeGC.c | 2 src/FreePix.c | 4 src/Geom.c | 12 src/GetAtomNm.c | 4 src/GetDflt.c | 8 src/GetFProp.c | 6 src/GetGeom.c | 4 src/GetHints.c | 24 src/GetIFocus.c | 2 src/GetImage.c | 10 src/GetKCnt.c | 2 src/GetMoEv.c | 8 src/GetNrmHint.c | 26 src/GetPCnt.c | 2 src/GetPntMap.c | 4 src/GetProp.c | 14 src/GetRGBCMap.c | 6 src/GetSSaver.c | 4 src/GetStCmap.c | 12 src/GetTxtProp.c | 8 src/GetWAttrs.c | 4 src/GetWMCMapW.c | 8 src/GetWMProto.c | 8 src/GrButton.c | 2 src/GrKey.c | 2 src/GrKeybd.c | 2 src/GrPointer.c | 2 src/Host.c | 28 src/Iconify.c | 8 src/IfEvent.c | 4 src/ImText.c | 4 src/ImText16.c | 4 src/ImUtil.c | 84 src/InitExt.c | 6 src/IntAtom.c | 2 src/KeyBind.c | 148 src/KeysymStr.c | 2 src/LiHosts.c | 14 src/LiICmaps.c | 2 src/LoadFont.c | 2 src/LockDis.c | 2 src/Macros.c | 32 src/Makefile.am | 2 src/Makefile.in | 1257 src/MaskEvent.c | 2 src/ModMap.c | 4 src/MoveWin.c | 2 src/NextEvent.c | 6 src/OMWrap.c | 2 src/OpenDis.c | 65 src/ParseCmd.c | 20 src/ParseGeom.c | 12 src/PeekEvent.c | 2 src/PolyReg.c | 78 src/PolyTxt.c | 34 src/PolyTxt16.c | 30 src/PropAlloc.c | 2 src/PutBEvent.c | 4 src/PutImage.c | 18 src/QuBest.c | 2 src/QuCurShp.c | 6 src/QuExt.c | 2 src/QuKeybd.c | 4 src/QuPntr.c | 6 src/QuStipShp.c | 2 src/QuTileShp.c | 4 src/QuTree.c | 2 src/Quarks.c | 10 src/RdBitF.c | 16 src/RecolorC.c | 2 src/ReconfWin.c | 2 src/Region.c | 104 src/RegstFlt.c | 4 src/RepWindow.c | 4 src/RestackWs.c | 4 src/RotProp.c | 2 src/SetCRects.c | 4 src/SetClOrig.c | 2 src/SetDashes.c | 2 src/SetHints.c | 42 src/SetIFocus.c | 2 src/SetLocale.c | 16 src/SetNrmHint.c | 4 src/SetPMask.c | 2 src/SetPntMap.c | 4 src/SetRGBCMap.c | 2 src/SetSSaver.c | 2 src/SetStCmap.c | 10 src/SetTxtProp.c | 8 src/SetWMCMapW.c | 12 src/SetWMProto.c | 12 src/StBytes.c | 10 src/StColors.c | 4 src/StName.c | 4 src/StrToText.c | 4 src/Text.c | 22 src/Text16.c | 22 src/TextExt.c | 8 src/TextExt16.c | 8 src/TextToStr.c | 2 src/TrCoords.c | 6 src/UIThrStubs.c | 14 src/UnldFont.c | 2 src/VisUtil.c | 18 src/WMGeom.c | 14 src/WMProps.c | 16 src/WarpPtr.c | 2 src/WinEvent.c | 2 src/Window.c | 12 src/Withdraw.c | 8 src/WrBitF.c | 2 src/XKeysymDB | 22 src/Xatomtype.h | 8 src/XlibAsync.c | 4 src/XlibInt.c | 206 src/XomGeneric.h | 2 src/Xprivate.h | 15 src/Xrm.c | 64 src/XrmI.h | 4 src/Xxcbint.h | 34 src/config.h.in | 187 src/globals.c | 14 src/imConv.c | 20 src/locking.c | 10 src/locking.h | 2 src/os2Stubs.c | 42 src/poly.h | 12 src/udcInf.c | 22 src/util/.gitignore | 4 src/util/Makefile.am | 3 src/util/Makefile.in | 513 src/util/makekeys.c | 12 src/x11_trans.c | 6 src/xcb_disp.c | 20 src/xcb_io.c | 285 src/xcb_lock.c | 235 src/xcms/.gitignore | 7 src/xcms/AddDIC.c | 6 src/xcms/AddSF.c | 6 src/xcms/CCC.c | 12 src/xcms/CvColW.c | 6 src/xcms/CvCols.c | 16 src/xcms/HVC.c | 20 src/xcms/HVCGcC.c | 18 src/xcms/HVCGcV.c | 20 src/xcms/HVCGcVC.c | 22 src/xcms/HVCMnV.c | 12 src/xcms/HVCMxC.c | 16 src/xcms/HVCMxV.c | 16 src/xcms/HVCMxVC.c | 34 src/xcms/HVCMxVs.c | 12 src/xcms/HVCWpAj.c | 10 src/xcms/IdOfPr.c | 6 src/xcms/LRGB.c | 50 src/xcms/Lab.c | 6 src/xcms/LabGcC.c | 12 src/xcms/LabGcL.c | 12 src/xcms/LabGcLC.c | 14 src/xcms/LabMnL.c | 22 src/xcms/LabMxC.c | 12 src/xcms/LabMxL.c | 20 src/xcms/LabMxLC.c | 34 src/xcms/LabWpAj.c | 6 src/xcms/Luv.c | 10 src/xcms/LuvGcC.c | 12 src/xcms/LuvGcL.c | 12 src/xcms/LuvGcLC.c | 14 src/xcms/LuvMnL.c | 22 src/xcms/LuvMxC.c | 14 src/xcms/LuvMxL.c | 20 src/xcms/LuvMxLC.c | 32 src/xcms/LuvWpAj.c | 6 src/xcms/Makefile.in | 681 src/xcms/OfCCC.c | 6 src/xcms/PrOfId.c | 6 src/xcms/QBlack.c | 6 src/xcms/QBlue.c | 6 src/xcms/QGreen.c | 6 src/xcms/QRed.c | 6 src/xcms/QWhite.c | 6 src/xcms/QuCol.c | 6 src/xcms/QuCols.c | 6 src/xcms/SetCCC.c | 6 src/xcms/SetGetCols.c | 10 src/xcms/StCol.c | 6 src/xcms/StCols.c | 6 src/xcms/UNDEFINED.c | 6 src/xcms/XRGB.c | 10 src/xcms/XYZ.c | 6 src/xcms/Xcmsint.h | 6 src/xcms/cmsAllCol.c | 6 src/xcms/cmsAllNCol.c | 8 src/xcms/cmsCmap.c | 8 src/xcms/cmsColNm.c | 14 src/xcms/cmsGlobls.c | 6 src/xcms/cmsInt.c | 10 src/xcms/cmsLkCol.c | 8 src/xcms/cmsMath.c | 4 src/xcms/cmsProp.c | 16 src/xcms/cmsTrig.c | 16 src/xcms/uvY.c | 6 src/xcms/xyY.c | 8 src/xkb/.gitignore | 7 src/xkb/Makefile.in | 555 src/xkb/XKB.c | 24 src/xkb/XKBAlloc.c | 28 src/xkb/XKBBell.c | 18 src/xkb/XKBBind.c | 26 src/xkb/XKBCompat.c | 20 src/xkb/XKBCtrls.c | 36 src/xkb/XKBCvt.c | 22 src/xkb/XKBExtDev.c | 30 src/xkb/XKBGAlloc.c | 42 src/xkb/XKBGeom.c | 22 src/xkb/XKBGetByName.c | 16 src/xkb/XKBGetMap.c | 22 src/xkb/XKBList.c | 18 src/xkb/XKBMAlloc.c | 30 src/xkb/XKBMisc.c | 34 src/xkb/XKBNames.c | 28 src/xkb/XKBRdBuf.c | 18 src/xkb/XKBSetGeom.c | 24 src/xkb/XKBSetMap.c | 18 src/xkb/XKBUse.c | 20 src/xkb/XKBleds.c | 24 src/xkb/XKBlibint.h | 22 src/xlibi18n/.gitignore | 7 src/xlibi18n/ICWrap.c | 74 src/xlibi18n/IMWrap.c | 44 src/xlibi18n/Makefile.am | 2 src/xlibi18n/Makefile.in | 687 src/xlibi18n/XDefaultIMIF.c | 4 src/xlibi18n/XDefaultOMIF.c | 34 src/xlibi18n/Xaixlcint.h | 2 src/xlibi18n/XimImSw.h | 4 src/xlibi18n/XimProto.h | 4 src/xlibi18n/XimThai.h | 30 src/xlibi18n/XimTrX.h | 2 src/xlibi18n/XimTrans.h | 8 src/xlibi18n/Ximint.h | 24 src/xlibi18n/XimintL.h | 18 src/xlibi18n/XimintP.h | 4 src/xlibi18n/XlcDL.c | 12 src/xlibi18n/XlcGeneric.h | 4 src/xlibi18n/XlcPubI.h | 2 src/xlibi18n/Xlcint.h | 43 src/xlibi18n/imKStoUCS.c | 10 src/xlibi18n/lcCT.c | 14 src/xlibi18n/lcCharSet.c | 8 src/xlibi18n/lcConv.c | 4 src/xlibi18n/lcDB.c | 10 src/xlibi18n/lcFile.c | 60 src/xlibi18n/lcGeneric.c | 33 src/xlibi18n/lcInit.c | 6 src/xlibi18n/lcPrTxt.c | 4 src/xlibi18n/lcPubWrap.c | 8 src/xlibi18n/lcPublic.c | 8 src/xlibi18n/lcStd.c | 4 src/xlibi18n/lcTxtPr.c | 4 src/xlibi18n/lcUTF8.c | 552 src/xlibi18n/lcUniConv/big5hkscs.h | 6252 +++ src/xlibi18n/lcUniConv/cjk_tab_to_h.c | 47 src/xlibi18n/lcUniConv/gbk.h | 6200 +++ src/xlibi18n/lcUtil.c | 4 src/xlibi18n/lcWrap.c | 50 src/xlibi18n/mbWrap.c | 14 src/xlibi18n/utf8Wrap.c | 14 src/xlibi18n/wcWrap.c | 14 543 files changed, 24808 insertions(+), 92483 deletions(-)
New commits: commit 42edd8947fbf83d4ca575ba90c8b30286f2a21a4 Author: Julien Cristau <jcris...@debian.org> Date: Tue Feb 17 18:06:49 2009 +0100 Use a wildcard for usr/share/X11/locale instead of listing every single file. diff --git a/debian/changelog b/debian/changelog index 9eee34b..a06a847 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ libx11 (2:1.2-1) UNRELEASED; urgency=low * Handle parallel builds. * Refresh patches 003_recognize_glibc_2.3.2_locale_names.diff and 012_ru_RU_UTF-8_XLC_LOCALE.diff. + * Use a wildcard for usr/share/X11/locale instead of listing every single + file. -- Julien Cristau <jcris...@debian.org> Sun, 21 Dec 2008 18:09:12 +0100 diff --git a/debian/libx11-data.install b/debian/libx11-data.install index acd6094..f5edb36 100644 --- a/debian/libx11-data.install +++ b/debian/libx11-data.install @@ -1,179 +1,3 @@ -usr/share/X11/locale/armscii-8/XI18N_OBJS -usr/share/X11/locale/armscii-8/XLC_LOCALE -usr/share/X11/locale/armscii-8/Compose -usr/share/X11/locale/C/XI18N_OBJS -usr/share/X11/locale/C/XLC_LOCALE -usr/share/X11/locale/C/Compose -usr/share/X11/locale/el_GR.UTF-8/XI18N_OBJS -usr/share/X11/locale/el_GR.UTF-8/XLC_LOCALE -usr/share/X11/locale/el_GR.UTF-8/Compose -usr/share/X11/locale/en_US.UTF-8/XI18N_OBJS -usr/share/X11/locale/en_US.UTF-8/XLC_LOCALE -usr/share/X11/locale/en_US.UTF-8/Compose -usr/share/X11/locale/georgian-academy/XI18N_OBJS -usr/share/X11/locale/georgian-academy/XLC_LOCALE -usr/share/X11/locale/georgian-academy/Compose -usr/share/X11/locale/georgian-ps/XI18N_OBJS -usr/share/X11/locale/georgian-ps/XLC_LOCALE -usr/share/X11/locale/georgian-ps/Compose -usr/share/X11/locale/ibm-cp1133/XI18N_OBJS -usr/share/X11/locale/ibm-cp1133/XLC_LOCALE -usr/share/X11/locale/ibm-cp1133/Compose -usr/share/X11/locale/iscii-dev/XI18N_OBJS -usr/share/X11/locale/iscii-dev/XLC_LOCALE -usr/share/X11/locale/iscii-dev/Compose -usr/share/X11/locale/isiri-3342/XI18N_OBJS -usr/share/X11/locale/isiri-3342/XLC_LOCALE -usr/share/X11/locale/isiri-3342/Compose -usr/share/X11/locale/iso8859-1/XI18N_OBJS -usr/share/X11/locale/iso8859-1/XLC_LOCALE -usr/share/X11/locale/iso8859-1/Compose -usr/share/X11/locale/iso8859-10/XI18N_OBJS -usr/share/X11/locale/iso8859-10/XLC_LOCALE -usr/share/X11/locale/iso8859-10/Compose -usr/share/X11/locale/iso8859-11/XI18N_OBJS -usr/share/X11/locale/iso8859-11/XLC_LOCALE -usr/share/X11/locale/iso8859-11/Compose -usr/share/X11/locale/iso8859-13/XI18N_OBJS -usr/share/X11/locale/iso8859-13/XLC_LOCALE -usr/share/X11/locale/iso8859-13/Compose -usr/share/X11/locale/iso8859-14/XI18N_OBJS -usr/share/X11/locale/iso8859-14/XLC_LOCALE -usr/share/X11/locale/iso8859-14/Compose -usr/share/X11/locale/iso8859-15/XI18N_OBJS -usr/share/X11/locale/iso8859-15/XLC_LOCALE -usr/share/X11/locale/iso8859-15/Compose -usr/share/X11/locale/iso8859-2/XI18N_OBJS -usr/share/X11/locale/iso8859-2/XLC_LOCALE -usr/share/X11/locale/iso8859-2/Compose -usr/share/X11/locale/iso8859-3/XI18N_OBJS -usr/share/X11/locale/iso8859-3/XLC_LOCALE -usr/share/X11/locale/iso8859-3/Compose -usr/share/X11/locale/iso8859-4/XI18N_OBJS -usr/share/X11/locale/iso8859-4/XLC_LOCALE -usr/share/X11/locale/iso8859-4/Compose -usr/share/X11/locale/iso8859-5/XI18N_OBJS -usr/share/X11/locale/iso8859-5/XLC_LOCALE -usr/share/X11/locale/iso8859-5/Compose -usr/share/X11/locale/iso8859-6/XI18N_OBJS -usr/share/X11/locale/iso8859-6/XLC_LOCALE -usr/share/X11/locale/iso8859-6/Compose -usr/share/X11/locale/iso8859-7/XI18N_OBJS -usr/share/X11/locale/iso8859-7/XLC_LOCALE -usr/share/X11/locale/iso8859-7/Compose -usr/share/X11/locale/iso8859-8/XI18N_OBJS -usr/share/X11/locale/iso8859-8/XLC_LOCALE -usr/share/X11/locale/iso8859-8/Compose -usr/share/X11/locale/iso8859-9/XI18N_OBJS -usr/share/X11/locale/iso8859-9/XLC_LOCALE -usr/share/X11/locale/iso8859-9/Compose -usr/share/X11/locale/iso8859-9e/XI18N_OBJS -usr/share/X11/locale/iso8859-9e/XLC_LOCALE -usr/share/X11/locale/iso8859-9e/Compose -usr/share/X11/locale/ja/XI18N_OBJS -usr/share/X11/locale/ja/XLC_LOCALE -usr/share/X11/locale/ja/Compose -usr/share/X11/locale/ja.JIS/XI18N_OBJS -usr/share/X11/locale/ja.JIS/XLC_LOCALE -usr/share/X11/locale/ja.JIS/Compose -usr/share/X11/locale/ja_JP.UTF-8/XI18N_OBJS -usr/share/X11/locale/ja_JP.UTF-8/XLC_LOCALE -usr/share/X11/locale/ja_JP.UTF-8/Compose -usr/share/X11/locale/ja.S90/XI18N_OBJS -usr/share/X11/locale/ja.S90/XLC_LOCALE -usr/share/X11/locale/ja.S90/Compose -usr/share/X11/locale/ja.SJIS/XI18N_OBJS -usr/share/X11/locale/ja.SJIS/XLC_LOCALE -usr/share/X11/locale/ja.SJIS/Compose -usr/share/X11/locale/ja.U90/XI18N_OBJS -usr/share/X11/locale/ja.U90/XLC_LOCALE -usr/share/X11/locale/ja.U90/Compose -usr/share/X11/locale/ko/XI18N_OBJS -usr/share/X11/locale/ko/XLC_LOCALE -usr/share/X11/locale/ko/Compose -usr/share/X11/locale/koi8-c/XI18N_OBJS -usr/share/X11/locale/koi8-c/XLC_LOCALE -usr/share/X11/locale/koi8-c/Compose -usr/share/X11/locale/koi8-r/XI18N_OBJS -usr/share/X11/locale/koi8-r/XLC_LOCALE -usr/share/X11/locale/koi8-r/Compose -usr/share/X11/locale/koi8-u/XI18N_OBJS -usr/share/X11/locale/koi8-u/XLC_LOCALE -usr/share/X11/locale/koi8-u/Compose -usr/share/X11/locale/ko_KR.UTF-8/XI18N_OBJS -usr/share/X11/locale/ko_KR.UTF-8/XLC_LOCALE -usr/share/X11/locale/ko_KR.UTF-8/Compose -usr/share/X11/locale/microsoft-cp1251/XI18N_OBJS -usr/share/X11/locale/microsoft-cp1251/XLC_LOCALE -usr/share/X11/locale/microsoft-cp1251/Compose -usr/share/X11/locale/microsoft-cp1255/XI18N_OBJS -usr/share/X11/locale/microsoft-cp1255/XLC_LOCALE -usr/share/X11/locale/microsoft-cp1255/Compose -usr/share/X11/locale/microsoft-cp1256/XI18N_OBJS -usr/share/X11/locale/microsoft-cp1256/XLC_LOCALE -usr/share/X11/locale/microsoft-cp1256/Compose -usr/share/X11/locale/mulelao-1/XI18N_OBJS -usr/share/X11/locale/mulelao-1/XLC_LOCALE -usr/share/X11/locale/mulelao-1/Compose -usr/share/X11/locale/nokhchi-1/XI18N_OBJS -usr/share/X11/locale/nokhchi-1/XLC_LOCALE -usr/share/X11/locale/nokhchi-1/Compose -usr/share/X11/locale/pt_BR.UTF-8/XI18N_OBJS -usr/share/X11/locale/pt_BR.UTF-8/XLC_LOCALE -usr/share/X11/locale/pt_BR.UTF-8/Compose -usr/share/X11/locale/ru_RU.UTF-8/XI18N_OBJS -usr/share/X11/locale/ru_RU.UTF-8/XLC_LOCALE -usr/share/X11/locale/ru_RU.UTF-8/Compose -usr/share/X11/locale/tatar-cyr/XI18N_OBJS -usr/share/X11/locale/tatar-cyr/XLC_LOCALE -usr/share/X11/locale/tatar-cyr/Compose -usr/share/X11/locale/th_TH/XI18N_OBJS -usr/share/X11/locale/th_TH/XLC_LOCALE -usr/share/X11/locale/th_TH/Compose -usr/share/X11/locale/th_TH.UTF-8/XI18N_OBJS -usr/share/X11/locale/th_TH.UTF-8/XLC_LOCALE -usr/share/X11/locale/th_TH.UTF-8/Compose -usr/share/X11/locale/tscii-0/XI18N_OBJS -usr/share/X11/locale/tscii-0/XLC_LOCALE -usr/share/X11/locale/tscii-0/Compose -usr/share/X11/locale/vi_VN.tcvn/XI18N_OBJS -usr/share/X11/locale/vi_VN.tcvn/XLC_LOCALE -usr/share/X11/locale/vi_VN.tcvn/Compose -usr/share/X11/locale/vi_VN.viscii/XI18N_OBJS -usr/share/X11/locale/vi_VN.viscii/XLC_LOCALE -usr/share/X11/locale/vi_VN.viscii/Compose -usr/share/X11/locale/zh_CN/XI18N_OBJS -usr/share/X11/locale/zh_CN/XLC_LOCALE -usr/share/X11/locale/zh_CN/Compose -usr/share/X11/locale/zh_CN.gb18030/XI18N_OBJS -usr/share/X11/locale/zh_CN.gb18030/XLC_LOCALE -usr/share/X11/locale/zh_CN.gb18030/Compose -usr/share/X11/locale/zh_CN.gbk/XI18N_OBJS -usr/share/X11/locale/zh_CN.gbk/XLC_LOCALE -usr/share/X11/locale/zh_CN.gbk/Compose -usr/share/X11/locale/zh_CN.UTF-8/XI18N_OBJS -usr/share/X11/locale/zh_CN.UTF-8/XLC_LOCALE -usr/share/X11/locale/zh_CN.UTF-8/Compose -usr/share/X11/locale/zh_HK.big5/XI18N_OBJS -usr/share/X11/locale/zh_HK.big5/XLC_LOCALE -usr/share/X11/locale/zh_HK.big5/Compose -usr/share/X11/locale/zh_HK.big5hkscs/XI18N_OBJS -usr/share/X11/locale/zh_HK.big5hkscs/XLC_LOCALE -usr/share/X11/locale/zh_HK.big5hkscs/Compose -usr/share/X11/locale/zh_HK.UTF-8/XI18N_OBJS -usr/share/X11/locale/zh_HK.UTF-8/XLC_LOCALE -usr/share/X11/locale/zh_HK.UTF-8/Compose -usr/share/X11/locale/zh_TW/XI18N_OBJS -usr/share/X11/locale/zh_TW/XLC_LOCALE -usr/share/X11/locale/zh_TW/Compose -usr/share/X11/locale/zh_TW.big5/XI18N_OBJS -usr/share/X11/locale/zh_TW.big5/XLC_LOCALE -usr/share/X11/locale/zh_TW.big5/Compose -usr/share/X11/locale/zh_TW.UTF-8/XI18N_OBJS -usr/share/X11/locale/zh_TW.UTF-8/XLC_LOCALE -usr/share/X11/locale/zh_TW.UTF-8/Compose -usr/share/X11/locale/locale.alias -usr/share/X11/locale/locale.dir -usr/share/X11/locale/compose.dir +usr/share/X11/locale usr/share/X11/XErrorDB usr/share/X11/XKeysymDB commit 4c9f5e762513b947764da2095960b1fe1da4f8b6 Author: Julien Cristau <jcris...@debian.org> Date: Tue Feb 17 17:37:10 2009 +0100 Refresh patches diff --git a/debian/changelog b/debian/changelog index 5230d20..9eee34b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ libx11 (2:1.2-1) UNRELEASED; urgency=low * Remove obsolete ld.so.conf handling from libx11-6 postinst. * Run autoreconf on build; add build-deps on automake, libtool, xutils-dev. * Handle parallel builds. + * Refresh patches 003_recognize_glibc_2.3.2_locale_names.diff and + 012_ru_RU_UTF-8_XLC_LOCALE.diff. -- Julien Cristau <jcris...@debian.org> Sun, 21 Dec 2008 18:09:12 +0100 diff --git a/debian/patches/003_recognize_glibc_2.3.2_locale_names.diff b/debian/patches/003_recognize_glibc_2.3.2_locale_names.diff index bdc467b..ee146f7 100644 --- a/debian/patches/003_recognize_glibc_2.3.2_locale_names.diff +++ b/debian/patches/003_recognize_glibc_2.3.2_locale_names.diff @@ -55,6 +55,8 @@ Major "forward port" by Nathanael Nerode. 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/nls/compose.dir.pre +=================================================================== --- libx11.orig/nls/compose.dir.pre +++ libx11/nls/compose.dir.pre @@ -1,14 +1,22 @@ @@ -395,7 +397,7 @@ but any bit would help. --Nathanael en_US.UTF-8/Compose: eu_ES.UTF-8 +en_US.UTF-8/Compose: eu_FR.UTF-8 en_US.UTF-8/Compose: fa_IR.UTF-8 - en_US.UTF-8/Compose: fi_FI.UTF-8 + fi_FI.UTF-8/Compose: fi_FI.UTF-8 en_US.UTF-8/Compose: fo_FO.UTF-8 @@ -322,6 +403,8 @@ en_US.UTF-8/Compose: fr_LU.UTF-8 @@ -480,6 +482,8 @@ but any bit would help. --Nathanael 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/nls/locale.alias.pre +=================================================================== --- libx11.orig/nls/locale.alias.pre +++ libx11/nls/locale.alias.pre @@ -301,6 +301,12 @@ @@ -570,6 +574,8 @@ but any bit would help. --Nathanael hrvatski: hr_HR.ISO8859-2 hungarian: hu_HU.ISO8859-2 icelandic.iso88591: is_IS.ISO8859-1 +Index: libx11/nls/locale.dir.pre +=================================================================== --- libx11.orig/nls/locale.dir.pre +++ libx11/nls/locale.dir.pre @@ -9,8 +9,13 @@ @@ -790,7 +796,7 @@ but any bit would help. --Nathanael en_US.UTF-8/XLC_LOCALE: eu_ES.UTF-8 +en_US.UTF-8/XLC_LOCALE: eu_FR.UTF-8 en_US.UTF-8/XLC_LOCALE: fa_IR.UTF-8 - en_US.UTF-8/XLC_LOCALE: fi_FI.UTF-8 + fi_FI.UTF-8/XLC_LOCALE: fi_FI.UTF-8 en_US.UTF-8/XLC_LOCALE: fo_FO.UTF-8 @@ -344,6 +388,8 @@ en_US.UTF-8/XLC_LOCALE: fr_LU.UTF-8 diff --git a/debian/patches/012_ru_RU_UTF-8_XLC_LOCALE.diff b/debian/patches/012_ru_RU_UTF-8_XLC_LOCALE.diff index ffbc328..3c6013e 100644 --- a/debian/patches/012_ru_RU_UTF-8_XLC_LOCALE.diff +++ b/debian/patches/012_ru_RU_UTF-8_XLC_LOCALE.diff @@ -201,7 +201,7 @@ Index: libx11/configure.ac =================================================================== --- libx11.orig/configure.ac +++ libx11/configure.ac -@@ -477,6 +477,7 @@ +@@ -476,6 +476,7 @@ nls/mulelao-1/Makefile nls/nokhchi-1/Makefile nls/pt_BR.UTF-8/Makefile commit 0bff981113bc6dbd9c8bd5ba51e6d276448dabba Author: Julien Cristau <jcris...@debian.org> Date: Tue Feb 17 17:35:00 2009 +0100 Delete generated files diff --git a/Makefile.in b/Makefile.in deleted file mode 100644 index ff10e97..0000000 --- a/Makefile.in +++ /dev/null @@ -1,755 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -...@set_make@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -...@xcb_true@am__append_1 = x11-xcb.pc -subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/x11-xcb.pc.in \ - $(srcdir)/x11.pc.in $(top_srcdir)/configure \ - $(top_srcdir)/include/X11/XlibConf.h.in AUTHORS COPYING \ - ChangeLog INSTALL NEWS compile config.guess config.sub depcomp \ - install-sh ltmain.sh missing mkinstalldirs -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno config.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/src/config.h \ - $(top_builddir)/include/X11/XlibConf.h -CONFIG_CLEAN_FILES = x11.pc x11-xcb.pc -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(pkgconfigdir)" -pkgconfigDATA_INSTALL = $(INSTALL_DATA) -DATA = $(pkgconfig_DATA) -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = include modules src nls man -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ -ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ -ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ -AMTAR = @AMTAR@ -APP_MAN_DIR = @APP_MAN_DIR@ -APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BIGFONT_CFLAGS = @BIGFONT_CFLAGS@ -BIGFONT_LIBS = @BIGFONT_LIBS@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CC_FOR_BUILD = @CC_FOR_BUILD@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DOLT_BASH = @DOLT_BASH@ -DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ -DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FILE_MAN_DIR = @FILE_MAN_DIR@ -FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ -GREP = @GREP@ -I18N_MODULE_LIBS = @I18N_MODULE_LIBS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -KEYSYMDEF = @KEYSYMDEF@ -LAUNCHD = @LAUNCHD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIB_MAN_DIR = @LIB_MAN_DIR@ -LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ -LINT = @LINT@ -LINTLIB = @LINTLIB@ -LINT_FLAGS = @LINT_FLAGS@ -LN_S = @LN_S@ -LTCOMPILE = @LTCOMPILE@ -LTCXXCOMPILE = @LTCXXCOMPILE@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@ -MISC_MAN_DIR = @MISC_MAN_DIR@ -MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ -MKDIR_P = @MKDIR_P@ -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org