libx11: Changes to 'debian-unstable'
ChangeLog | 1375 +++++++++++++
autogen.sh | 4
configure.ac | 21
debian/changelog | 19
debian/libx11-6.symbols | 1
debian/patches/003_recognize_glibc_2.3.2_locale_names.diff | 493 +---
debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff | 56
debian/patches/008_remove_ko_Compose.diff | 10
debian/patches/009_remove_th_Compose.diff | 18
debian/patches/015_russian_locale_alias.diff | 6
debian/rules | 14
include/X11/Xcms.h | 12
include/X11/Xlib.h | 16
include/X11/Xlibint.h | 114 -
include/X11/Xutil.h | 12
man/AllPlanes.man | 63
man/BlackPixelOfScreen.man | 37
man/DisplayOfCCC.man | 37
man/ImageByteOrder.man | 71
man/IsCursorKey.man | 63
man/XAddConnectionWatch.man | 63
man/XAddHost.man | 81
man/XAllocClassHint.man | 70
man/XAllocColor.man | 63
man/XAllocIconSize.man | 71
man/XAllocSizeHints.man | 91
man/XAllocStandardColormap.man | 89
man/XAllocWMHints.man | 85
man/XAllowEvents.man | 63
man/XAnyEvent.man | 143 -
man/XButtonEvent.man | 147 -
man/XChangeKeyboardControl.man | 97
man/XChangeKeyboardMapping.man | 69
man/XChangePointerControl.man | 63
man/XChangeSaveSet.man | 63
man/XChangeWindowAttributes.man | 63
man/XCirculateEvent.man | 79
man/XCirculateRequestEvent.man | 79
man/XClearArea.man | 63
man/XClientMessageEvent.man | 89
man/XColormapEvent.man | 81
man/XConfigureEvent.man | 87
man/XConfigureRequestEvent.man | 89
man/XConfigureWindow.man | 75
man/XCopyArea.man | 63
man/XCreateColormap.man | 73
man/XCreateFontCursor.man | 63
man/XCreateFontSet.man | 63
man/XCreateGC.man | 116 -
man/XCreateIC.man | 63
man/XCreateOC.man | 63
man/XCreatePixmap.man | 63
man/XCreateRegion.man | 63
man/XCreateWindow.man | 95
man/XCreateWindowEvent.man | 85
man/XCrossingEvent.man | 103
man/XDefineCursor.man | 63
man/XDestroyWindow.man | 63
man/XDestroyWindowEvent.man | 77
man/XDrawArc.man | 63
man/XDrawImageString.man | 63
man/XDrawLine.man | 67
man/XDrawPoint.man | 67
man/XDrawRectangle.man | 69
man/XDrawString.man | 63
man/XDrawText.man | 83
man/XEmptyRegion.man | 63
man/XErrorEvent.man | 79
man/XExposeEvent.man | 81
man/XExtentsOfFontSet.man | 63
man/XFillRectangle.man | 63
man/XFilterEvent.man | 63
man/XFlush.man | 63
man/XFocusChangeEvent.man | 89
man/XFontSetExtents.man | 69
man/XFontsOfFontSet.man | 63
man/XFree.man | 63
man/XGetEventData.man | 83
man/XGetVisualInfo.man | 85
man/XGetWindowAttributes.man | 107 -
man/XGetWindowProperty.man | 63
man/XGrabButton.man | 63
man/XGrabKey.man | 63
man/XGrabKeyboard.man | 63
man/XGrabPointer.man | 63
man/XGrabServer.man | 63
man/XGraphicsExposeEvent.man | 101
man/XGravityEvent.man | 79
man/XIconifyWindow.man | 63
man/XIfEvent.man | 63
man/XInitImage.man | 63
man/XInitThreads.man | 63
man/XInstallColormap.man | 63
man/XInternAtom.man | 63
man/XIntersectRegion.man | 63
man/XKeymapEvent.man | 79
man/XListFonts.man | 63
man/XLoadFont.man | 63
man/XLookupKeysym.man | 63
man/XMapEvent.man | 99
man/XMapRequestEvent.man | 77
man/XMapWindow.man | 63
man/XNextEvent.man | 63
man/XNoOp.man | 63
man/XOpenDisplay.man | 63
man/XOpenIM.man | 63
man/XOpenOM.man | 63
man/XParseGeometry.man | 63
man/XPolygonRegion.man | 63
man/XPropertyEvent.man | 81
man/XPutBackEvent.man | 63
man/XPutImage.man | 63
man/XQueryBestSize.man | 63
man/XQueryColor.man | 63
man/XQueryPointer.man | 63
man/XQueryTree.man | 63
man/XRaiseWindow.man | 63
man/XReadBitmapFile.man | 63
man/XRecolorCursor.man | 63
man/XReparentEvent.man | 83
man/XReparentWindow.man | 63
man/XResizeRequestEvent.man | 77
man/XResourceManagerString.man | 63
man/XSaveContext.man | 63
man/XSelectInput.man | 63
man/XSelectionClearEvent.man | 79
man/XSelectionEvent.man | 83
man/XSelectionRequestEvent.man | 85
man/XSendEvent.man | 69
man/XSetArcMode.man | 63
man/XSetClipOrigin.man | 63
man/XSetCloseDownMode.man | 63
man/XSetCommand.man | 63
man/XSetErrorHandler.man | 63
man/XSetFillStyle.man | 63
man/XSetFont.man | 63
man/XSetFontPath.man | 63
man/XSetICFocus.man | 63
man/XSetICValues.man | 63
man/XSetInputFocus.man | 63
man/XSetLineAttributes.man | 63
man/XSetPointerMapping.man | 63
man/XSetScreenSaver.man | 63
man/XSetSelectionOwner.man | 63
man/XSetState.man | 63
man/XSetTextProperty.man | 63
man/XSetTile.man | 63
man/XSetTransientForHint.man | 63
man/XSetWMClientMachine.man | 63
man/XSetWMColormapWindows.man | 63
man/XSetWMIconName.man | 63
man/XSetWMName.man | 63
man/XSetWMProperties.man | 63
man/XSetWMProtocols.man | 63
man/XStoreBytes.man | 63
man/XStoreColors.man | 63
man/XStringListToTextProperty.man | 73
man/XStringToKeysym.man | 63
man/XSupportsLocale.man | 63
man/XSynchronize.man | 63
man/XTextExtents.man | 63
man/XTextWidth.man | 63
man/XTranslateCoordinates.man | 63
man/XUnmapEvent.man | 79
man/XUnmapWindow.man | 63
man/XVaCreateNestedList.man | 63
man/XVisibilityEvent.man | 77
man/XWarpPointer.man | 63
man/XcmsAllocColor.man | 63
man/XcmsCCCOfColormap.man | 63
man/XcmsCIELabQueryMaxC.man | 63
man/XcmsCIELuvQueryMaxC.man | 63
man/XcmsColor.man | 63
man/XcmsConvertColors.man | 63
man/XcmsCreateCCC.man | 63
man/XcmsDefaultCCC.man | 63
man/XcmsQueryBlack.man | 63
man/XcmsQueryColor.man | 63
man/XcmsSetWhitePoint.man | 63
man/XcmsStoreColor.man | 63
man/XcmsTekHVCQueryMaxC.man | 63
man/XmbDrawImageString.man | 63
man/XmbDrawString.man | 63
man/XmbDrawText.man | 83
man/XmbLookupString.man | 68
man/XmbResetIC.man | 63
man/XmbTextEscapement.man | 63
man/XmbTextExtents.man | 63
man/XmbTextListToTextProperty.man | 85
man/XmbTextPerCharExtents.man | 63
man/XrmEnumerateDatabase.man | 79
man/XrmGetFileDatabase.man | 65
man/XrmGetResource.man | 65
man/XrmInitialize.man | 103
man/XrmMergeDatabases.man | 65
man/XrmPutResource.man | 65
man/XrmUniqueQuark.man | 65
man/xkb/XkbGetNamedGeometry.man | 4
man/xkb/XkbSAGroup.man | 7
man/xkb/XkbSASetGroup.man | 14
man/xkb/XkbSetDetectableAutoRepeat.man | 4
man/xkb/XkbSetDeviceButtonActions.man | 4
modules/im/ximcp/Makefile.am | 1
modules/im/ximcp/imCallbk.c | 54
modules/im/ximcp/imDefFlt.c | 40
modules/im/ximcp/imDefIc.c | 60
modules/im/ximcp/imDefIm.c | 96
modules/im/ximcp/imDefLkup.c | 74
modules/im/ximcp/imDispch.c | 8
modules/im/ximcp/imExten.c | 34
modules/im/ximcp/imImSw.c | 2
modules/im/ximcp/imInsClbk.c | 14
modules/im/ximcp/imInt.c | 20
modules/im/ximcp/imLcGIc.c | 2
modules/im/ximcp/imLcIc.c | 16
modules/im/ximcp/imLcIm.c | 34
modules/im/ximcp/imLcLkup.c | 14
modules/im/ximcp/imLcPrs.c | 68
modules/im/ximcp/imLcSIc.c | 2
modules/im/ximcp/imRm.c | 220 +-
modules/im/ximcp/imRmAttr.c | 48
modules/im/ximcp/imThaiFlt.c | 98
modules/im/ximcp/imThaiIc.c | 14
modules/im/ximcp/imThaiIm.c | 8
modules/im/ximcp/imTrX.c | 30
modules/im/ximcp/imTrans.c | 22
modules/im/ximcp/imTransR.c | 28
modules/om/generic/omXChar.c | 91
nls/Makefile.am | 4
nls/compose.dir.pre | 98
nls/en_US.UTF-8/Compose.pre | 56
nls/ja.S90/XI18N_OBJS | 7
nls/ja.S90/XLC_LOCALE.pre | 150 -
nls/ja.U90/XI18N_OBJS | 7
nls/ja.U90/XLC_LOCALE.pre | 151 -
nls/ja_JP.UTF-8/Compose.pre | 1
nls/km_KH.UTF-8/Compose.pre | 8
nls/km_KH.UTF-8/XI18N_OBJS | 8
nls/ko_KR.UTF-8/Compose.pre | 1
nls/locale.alias.pre | 254 +-
nls/locale.dir.pre | 43
nls/pt_BR.UTF-8/Compose.pre | 52
nls/sr_CS.UTF-8/Compose.pre | 128 +
nls/sr_CS.UTF-8/XI18N_OBJS | 8
nls/th_TH.UTF-8/Compose.pre | 1
nls/zh_CN.UTF-8/Compose.pre | 1
nls/zh_HK.UTF-8/Compose.pre | 1
nls/zh_TW.UTF-8/Compose.pre | 1
specs/libX11/CH04.xml | 3
src/AllCells.c | 9
src/ChProp.c | 6
src/ChWindow.c | 9
src/Cmap.h | 2
src/ConfWind.c | 13
src/Context.c | 8
src/Cr.h | 2
src/CrBFData.c | 47
src/CrGC.c | 2
src/CrPFBData.c | 54
src/CrWindow.c | 9
src/Depths.c | 2
src/DrArc.c | 12
src/DrLine.c | 16
src/DrPoint.c | 15
src/DrRect.c | 16
src/ErrDes.c | 9
src/FSWrap.c | 6
src/FillArc.c | 16
src/FillRct.c | 15
src/Font.c | 134 -
src/FontInfo.c | 144 -
src/FontNames.c | 35
src/GetAtomNm.c | 12
src/GetDflt.c | 27
src/GetFPath.c | 36
src/GetFProp.c | 27
src/GetHints.c | 9
src/GetImage.c | 12
src/GetMoEv.c | 26
src/GetPntMap.c | 31
src/GetProp.c | 33
src/GetRGBCMap.c | 3
src/ImUtil.c | 20
src/InitExt.c | 4
src/IntAtom.c | 6
src/Key.h | 3
src/KeyBind.c | 10
src/KeysymStr.c | 26
src/LiHosts.c | 29
src/LiICmaps.c | 8
src/LiProps.c | 8
src/ListExt.c | 36
src/Macros.c | 5
src/Makefile.am | 1
src/ModMap.c | 17
src/MoveWin.c | 9
src/OpenDis.c | 27
src/PixFormats.c | 4
src/PolyReg.c | 13
src/PolyTxt16.c | 23
src/PropAlloc.c | 16
src/PutBEvent.c | 2
src/PutImage.c | 13
src/QuColors.c | 10
src/QuTree.c | 8
src/Quarks.c | 13
src/RdBitF.c | 2
src/Region.c | 19
src/RegstFlt.c | 4
src/RestackWs.c | 9
src/SendEvent.c | 5
src/SetFPath.c | 2
src/SetHints.c | 10
src/SetPntMap.c | 2
src/StBytes.c | 2
src/StColor.c | 12
src/StName.c | 6
src/StrKeysym.c | 2
src/StrToText.c | 2
src/Text16.c | 23
src/TextToStr.c | 4
src/VisUtil.c | 8
src/WrBitF.c | 2
src/XErrorDB | 1
src/Xintatom.h | 1
src/Xintconn.h | 1
src/XlibAsync.c | 5
src/XlibInt.c | 268 --
src/Xprivate.h | 2
src/Xresinternal.h | 2
src/Xrm.c | 50
src/globals.c | 121 -
src/locking.c | 8
src/locking.h | 2
src/pathmax.h | 81
src/udcInf.c | 17
src/xcb_io.c | 17
src/xcms/Makefile.am | 5
src/xcms/cmsColNm.c | 31
src/xcms/cmsMath.c | 4
src/xcms/cmsTrig.c | 4
src/xkb/XKBAlloc.c | 12
src/xkb/XKBExtDev.c | 6
src/xkb/XKBGAlloc.c | 21
src/xkb/XKBGeom.c | 15
src/xkb/XKBGetMap.c | 33
src/xkb/XKBMAlloc.c | 13
src/xkb/XKBMisc.c | 13
src/xkb/XKBNames.c | 58
src/xkb/XKBRdBuf.c | 28
src/xkb/XKBlibint.h | 2
src/xlibi18n/XimTrInt.h | 2
src/xlibi18n/Ximint.h | 7
src/xlibi18n/lcFile.c | 24
354 files changed, 4132 insertions(+), 14848 deletions(-)
New commits:
commit 88b6d1c1db665c252c719655f6575770026e3e01
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 15 18:33:45 2013 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 5f5bed1..89097a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libx11 (2:1.6.0-1) UNRELEASED; urgency=low
+libx11 (2:1.6.0-1) unstable; urgency=low
* Bump libx11-dev's x11proto-core-dev dependency to 7.0.17 for _X_NORETURN
(closes: #649866).
@@ -16,7 +16,7 @@ libx11 (2:1.6.0-1) UNRELEASED; urgency=low
* Disable silent rules.
* Use dpkg-buildflags.
- -- Julien Cristau <jcristau@debian.org> Sat, 15 Jun 2013 13:24:49 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 15 Jun 2013 18:31:27 +0200
libx11 (2:1.5.0-1) unstable; urgency=low
commit 60a6a248e962e45b9207e6923a5d989cb989fc8d
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 15 18:31:24 2013 +0200
Use dpkg-buildflags.
diff --git a/debian/changelog b/debian/changelog
index 9cf3cfc..5f5bed1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ libx11 (2:1.6.0-1) UNRELEASED; urgency=low
* Bump shlibs and symbols for _XEatDataWords.
* Add new locales to configure.ac so they can get installed.
* Disable silent rules.
+ * Use dpkg-buildflags.
-- Julien Cristau <jcristau@debian.org> Sat, 15 Jun 2013 13:24:49 +0200
diff --git a/debian/rules b/debian/rules
index 3e99b9b..d88750c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,12 +11,6 @@
include debian/xsfbs/xsfbs.mk
-CFLAGS = -Wall -g
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
@@ -71,7 +65,7 @@ build-stamp: configure $(STAMP_DIR)/genscripts
--without-fop \
--disable-silent-rules \
$(confflags) \
- CFLAGS="$(CFLAGS)"
+ $(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=configure)
cd build && $(MAKE)
>$@
commit 327c2217798f19150c38330ff306b7e1ad7bfa1a
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 15 18:20:49 2013 +0200
Disable silent rules.
diff --git a/debian/changelog b/debian/changelog
index 5aeb1b8..9cf3cfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ libx11 (2:1.6.0-1) UNRELEASED; urgency=low
* Refresh 015_russian_locale_alias.diff.
* Bump shlibs and symbols for _XEatDataWords.
* Add new locales to configure.ac so they can get installed.
+ * Disable silent rules.
-- Julien Cristau <jcristau@debian.org> Sat, 15 Jun 2013 13:24:49 +0200
diff --git a/debian/rules b/debian/rules
index c7cf4a6..3e99b9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,6 +69,7 @@ build-stamp: configure $(STAMP_DIR)/genscripts
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
$(docflags) \
--without-fop \
+ --disable-silent-rules \
$(confflags) \
CFLAGS="$(CFLAGS)"
cd build && $(MAKE)
commit 18de87a6513199c7074b3fc3471aa54fc8bb5e8f
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 15 17:59:27 2013 +0200
Add missing locales to configure.ac
Commits 40761898692e5063957bfa2518cca3d35b2e354a and
f198c6aa98f88ff285d903175a3c4c0fd33a4575 added two new locales
(sr_CS.UTF-8 and km_KH.UTF-8), but didn't list them in configure.ac,
meaning they're not included in tarballs (or installed).
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/configure.ac b/configure.ac
index f533f3c..9322b7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -438,9 +438,9 @@ locales="\
iso8859-1 iso8859-10 iso8859-11 iso8859-13 iso8859-14 iso8859-15 \
iso8859-2 iso8859-3 iso8859-4 iso8859-5 iso8859-6 iso8859-7 \
iso8859-8 iso8859-9 iso8859-9e ja ja.JIS ja_JP.UTF-8\
- ja.SJIS ko koi8-c koi8-r \
- koi8-u ko_KR.UTF-8 microsoft-cp1251 microsoft-cp1255 \
- microsoft-cp1256 mulelao-1 nokhchi-1 pt_BR.UTF-8 ru_RU.UTF-8 \
+ ja.SJIS km_KH.UTF-8 ko koi8-c koi8-r koi8-u \
+ ko_KR.UTF-8 microsoft-cp1251 microsoft-cp1255 microsoft-cp1256 \
+ mulelao-1 nokhchi-1 pt_BR.UTF-8 ru_RU.UTF-8 sr_CS.UTF-8 \
tatar-cyr th_TH th_TH.UTF-8 tscii-0 vi_VN.tcvn vi_VN.viscii \
zh_CN zh_CN.gb18030 zh_CN.gbk zh_CN.UTF-8 zh_HK.big5 \
zh_HK.big5hkscs zh_HK.UTF-8 zh_TW zh_TW.big5 zh_TW.UTF-8"
diff --git a/debian/changelog b/debian/changelog
index 0f83e16..5aeb1b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ libx11 (2:1.6.0-1) UNRELEASED; urgency=low
* Update 009_remove_th_Compose.diff.
* Refresh 015_russian_locale_alias.diff.
* Bump shlibs and symbols for _XEatDataWords.
+ * Add new locales to configure.ac so they can get installed.
-- Julien Cristau <jcristau@debian.org> Sat, 15 Jun 2013 13:24:49 +0200
diff --git a/debian/rules b/debian/rules
index 349d1d7..c7cf4a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,6 +57,9 @@ build-arch: docflags = --disable-specs
build-stamp: configure $(STAMP_DIR)/genscripts
dh_testdir
+ # work around lack of these files in the tarball
+ touch nls/km_KH.UTF-8/XLC_LOCALE.pre
+ touch nls/sr_CS.UTF-8/XLC_LOCALE.pre
mkdir -p build
cd build && \
../configure \
commit 210fa79c24463f36d5f9911ba913d5d4943a7e41
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 15 18:09:22 2013 +0200
Bump shlibs and symbols for _XEatDataWords.
diff --git a/debian/changelog b/debian/changelog
index 7b18c6e..0f83e16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ libx11 (2:1.6.0-1) UNRELEASED; urgency=low
* Refresh 008_remove_ko_Compose.diff.
* Update 009_remove_th_Compose.diff.
* Refresh 015_russian_locale_alias.diff.
+ * Bump shlibs and symbols for _XEatDataWords.
-- Julien Cristau <jcristau@debian.org> Sat, 15 Jun 2013 13:24:49 +0200
diff --git a/debian/libx11-6.symbols b/debian/libx11-6.symbols
index c3e4186..82845f5 100644
--- a/debian/libx11-6.symbols
+++ b/debian/libx11-6.symbols
@@ -800,6 +800,7 @@ libX11.so.6 libx11-6 #MINVER#
_XDeq@Base 0
_XDeqAsyncHandler@Base 0
_XEatData@Base 0
+ _XEatDataWords@Base 2:1.6.0
_XEnq@Base 0
_XError@Base 0
_XErrorFunction@Base 0
diff --git a/debian/rules b/debian/rules
index 24e9b12..349d1d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -116,7 +116,7 @@ binary-arch: build-stamp install
dh_strip -Nlibx11-6 -Nlibx11-xcb1
dh_compress -s
dh_fixperms -s
- dh_makeshlibs -s -plibx11-6 -V'libx11-6 (>= 2:1.4.99.1)' --add-udeb=libx11-6-udeb -- -c4
+ dh_makeshlibs -s -plibx11-6 -V'libx11-6 (>= 2:1.6.0)' --add-udeb=libx11-6-udeb -- -c4
dh_makeshlibs -s -Nlibx11-6 -- -c4
dh_shlibdeps -s
dh_installdeb -s
commit bf00dc46eae79484cb5b92921550b1bbd1b88699
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 15 17:53:47 2013 +0200
Refresh 015_russian_locale_alias.diff.
diff --git a/debian/changelog b/debian/changelog
index 120d9cb..7b18c6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ libx11 (2:1.6.0-1) UNRELEASED; urgency=low
* Update 006_tailor_pt_BR.UTF-8_Compose.diff.
* Refresh 008_remove_ko_Compose.diff.
* Update 009_remove_th_Compose.diff.
+ * Refresh 015_russian_locale_alias.diff.
-- Julien Cristau <jcristau@debian.org> Sat, 15 Jun 2013 13:24:49 +0200
diff --git a/debian/patches/015_russian_locale_alias.diff b/debian/patches/015_russian_locale_alias.diff
index ae0f968..ef74d66 100644
--- a/debian/patches/015_russian_locale_alias.diff
+++ b/debian/patches/015_russian_locale_alias.diff
@@ -12,9 +12,9 @@ This will make it easier for russians to fit in with the rest of the world.
Index: libx11/nls/locale.alias.pre
===================================================================
---- libx11.orig/nls/locale.alias.pre
-+++ libx11/nls/locale.alias.pre
-@@ -1250,7 +1250,7 @@ portuguese: pt_PT.ISO8859-1
+--- libx11.orig/nls/locale.alias.pre 2013-06-15 17:53:12.467725093 +0200
++++ libx11/nls/locale.alias.pre 2013-06-15 17:53:16.183725049 +0200
+@@ -1274,7 +1274,7 @@
portuguese.iso88591: pt_PT.ISO8859-1
romanian: ro_RO.ISO8859-2
rumanian: ro_RO.ISO8859-2
commit f4fb8b260a7498b4a0c02070eb4504f293e1d2bc
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 15 17:53:08 2013 +0200
Update 009_remove_th_Compose.diff.
diff --git a/debian/changelog b/debian/changelog
index df13501..120d9cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ libx11 (2:1.6.0-1) UNRELEASED; urgency=low
* Update 003_recognize_glibc_2.3.2_locale_names.diff.
* Update 006_tailor_pt_BR.UTF-8_Compose.diff.
* Refresh 008_remove_ko_Compose.diff.
+ * Update 009_remove_th_Compose.diff.
-- Julien Cristau <jcristau@debian.org> Sat, 15 Jun 2013 13:24:49 +0200
diff --git a/debian/patches/009_remove_th_Compose.diff b/debian/patches/009_remove_th_Compose.diff
index 65e82c0..cafc3fd 100644
--- a/debian/patches/009_remove_th_Compose.diff
+++ b/debian/patches/009_remove_th_Compose.diff
@@ -1,13 +1,15 @@
---- a/nls/compose.dir.pre
-+++ b/nls/compose.dir.pre
-@@ -487,7 +487,9 @@ en_US.UTF-8/Compose: sv_SE.UTF-8
+Index: libx11/nls/compose.dir.pre
+===================================================================
+--- libx11.orig/nls/compose.dir.pre 2013-06-15 17:42:46.000000000 +0200
++++ libx11/nls/compose.dir.pre 2013-06-15 17:44:32.355730938 +0200
+@@ -484,7 +484,9 @@
en_US.UTF-8/Compose: ta_IN.UTF-8
en_US.UTF-8/Compose: te_IN.UTF-8
en_US.UTF-8/Compose: tg_TJ.UTF-8
--en_US.UTF-8/Compose: th_TH.UTF-8
+-th_TH.UTF-8/Compose: th_TH.UTF-8
+XCOMM Following entry commented to allow Thai XIM as default for X apps
+XCOMM See Debian bug#520509
-+XCOMM en_US.UTF-8/Compose: th_TH.UTF-8
- en_US.UTF-8/Compose: ti_ER.UTF-8
- en_US.UTF-8/Compose: ti_ET.UTF-8
- en_US.UTF-8/Compose: tig_ER.UTF-8
++XCOMM th_TH.UTF-8/Compose: th_TH.UTF-8
+ en_US.UTF-8/Compose: ti_ER.UTF-8
+ en_US.UTF-8/Compose: ti_ET.UTF-8
+ en_US.UTF-8/Compose: tig_ER.UTF-8
commit 36a337a967d3486143ef6f7bfa74ae1430ddbea4
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 15 17:52:45 2013 +0200
Refresh 008_remove_ko_Compose.diff.
diff --git a/debian/changelog b/debian/changelog
index 564ec97..df13501 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ libx11 (2:1.6.0-1) UNRELEASED; urgency=low
- Fix build with automake 1.13 (closes: #710467)
* Update 003_recognize_glibc_2.3.2_locale_names.diff.
* Update 006_tailor_pt_BR.UTF-8_Compose.diff.
+ * Refresh 008_remove_ko_Compose.diff.
-- Julien Cristau <jcristau@debian.org> Sat, 15 Jun 2013 13:24:49 +0200
diff --git a/debian/patches/008_remove_ko_Compose.diff b/debian/patches/008_remove_ko_Compose.diff
index f714e8b..a949d04 100644
--- a/debian/patches/008_remove_ko_Compose.diff
+++ b/debian/patches/008_remove_ko_Compose.diff
@@ -1,6 +1,8 @@
---- a/nls/compose.dir.pre
-+++ b/nls/compose.dir.pre
-@@ -175,7 +175,8 @@ iso8859-1/Compose: kw_GB.ISO8859-1
+Index: libx11/nls/compose.dir.pre
+===================================================================
+--- libx11.orig/nls/compose.dir.pre 2013-06-15 17:42:43.987732157 +0200
++++ libx11/nls/compose.dir.pre 2013-06-15 17:42:46.371732132 +0200
+@@ -182,7 +182,8 @@
iso8859-14/Compose: kw_GB.ISO8859-14
iso8859-15/Compose: kw_GB.ISO8859-15
iso8859-10/Compose: lg_UG.ISO8859-10
@@ -9,4 +11,4 @@
+XCOMM ko/Compose: ko_KR.eucKR
ibm-cp1133/Compose: lo_LA.IBM-CP1133
mulelao-1/Compose: lo_LA.MULELAO-1
- #if defined(__FreeBSD__)
+ iso8859-4/Compose: lt_LT.ISO8859-4
commit 97635f7dfc5debc606c13b1c75c15f660d53e58f
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 15 17:42:41 2013 +0200
Update 006_tailor_pt_BR.UTF-8_Compose.diff.
diff --git a/debian/changelog b/debian/changelog
index 917b571..564ec97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libx11 (2:1.6.0-1) UNRELEASED; urgency=low
- XmbLookupString man page no longer warns (closes: #300819)
- Fix build with automake 1.13 (closes: #710467)
* Update 003_recognize_glibc_2.3.2_locale_names.diff.
+ * Update 006_tailor_pt_BR.UTF-8_Compose.diff.
-- Julien Cristau <jcristau@debian.org> Sat, 15 Jun 2013 13:24:49 +0200
diff --git a/debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff b/debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff
index a4b5de4..05c7989 100644
--- a/debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff
+++ b/debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff
@@ -9,8 +9,8 @@ Not submitted upstream to X.Org.
Index: libx11/nls/pt_BR.UTF-8/Compose.pre
===================================================================
---- libx11.orig/nls/pt_BR.UTF-8/Compose.pre
-+++ libx11/nls/pt_BR.UTF-8/Compose.pre
+--- libx11.orig/nls/pt_BR.UTF-8/Compose.pre 2013-06-15 13:19:37.000000000 +0200
++++ libx11/nls/pt_BR.UTF-8/Compose.pre 2013-06-15 17:41:15.755733148 +0200
@@ -1,4275 +1,3 @@
-XCOMM UTF-8 (Unicode) compose sequence
-XCOMM David.Monniaux@ens.fr
@@ -1101,30 +1101,30 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
-<dead_acute> <Multi_key> <KP_Divide> <o> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
-<Multi_key> <acute> <KP_Divide> <o> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
-<Multi_key> <apostrophe> <KP_Divide> <o> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
--<dead_double_grave> <A> : "Ȁ" U0200 # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
--<dead_double_grave> <a> : "ȁ" U0201 # LATIN SMALL LETTER A WITH DOUBLE GRAVE
--<dead_inverted_breve> <A> : "Ȃ" U0202 # LATIN CAPITAL LETTER A WITH INVERTED BREVE
--<dead_inverted_breve> <a> : "ȃ" U0203 # LATIN SMALL LETTER A WITH INVERTED BREVE
--<dead_double_grave> <E> : "Ȅ" U0204 # LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
--<dead_double_grave> <e> : "ȅ" U0205 # LATIN SMALL LETTER E WITH DOUBLE GRAVE
--<dead_inverted_breve> <E> : "Ȇ" U0206 # LATIN CAPITAL LETTER E WITH INVERTED BREVE
--<dead_inverted_breve> <e> : "ȇ" U0207 # LATIN SMALL LETTER E WITH INVERTED BREVE
--<dead_double_grave> <I> : "Ȉ" U0208 # LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
--<dead_double_grave> <i> : "ȉ" U0209 # LATIN SMALL LETTER I WITH DOUBLE GRAVE
--<dead_inverted_breve> <I> : "Ȋ" U020A # LATIN CAPITAL LETTER I WITH INVERTED BREVE
--<dead_inverted_breve> <i> : "ȋ" U020B # LATIN SMALL LETTER I WITH INVERTED BREVE
--<dead_double_grave> <O> : "Ȍ" U020C # LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
--<dead_double_grave> <o> : "ȍ" U020D # LATIN SMALL LETTER O WITH DOUBLE GRAVE
--<dead_inverted_breve> <O> : "Ȏ" U020E # LATIN CAPITAL LETTER O WITH INVERTED BREVE
--<dead_inverted_breve> <o> : "ȏ" U020F # LATIN SMALL LETTER O WITH INVERTED BREVE
--<dead_double_grave> <R> : "Ȑ" U0210 # LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
--<dead_double_grave> <r> : "ȑ" U0211 # LATIN SMALL LETTER R WITH DOUBLE GRAVE
--<dead_inverted_breve> <R> : "Ȓ" U0212 # LATIN CAPITAL LETTER R WITH INVERTED BREVE
--<dead_inverted_breve> <r> : "ȓ" U0213 # LATIN SMALL LETTER R WITH INVERTED BREVE
--<dead_double_grave> <U> : "Ȕ" U0214 # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
--<dead_double_grave> <u> : "ȕ" U0215 # LATIN SMALL LETTER U WITH DOUBLE GRAVE
--<dead_inverted_breve> <U> : "Ȗ" U0216 # LATIN CAPITAL LETTER U WITH INVERTED BREVE
--<dead_inverted_breve> <u> : "ȗ" U0217 # LATIN SMALL LETTER U WITH INVERTED BREVE
+-<dead_doublegrave> <A> : "Ȁ" U0200 # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
+-<dead_doublegrave> <a> : "ȁ" U0201 # LATIN SMALL LETTER A WITH DOUBLE GRAVE
+-<dead_invertedbreve> <A> : "Ȃ" U0202 # LATIN CAPITAL LETTER A WITH INVERTED BREVE
+-<dead_invertedbreve> <a> : "ȃ" U0203 # LATIN SMALL LETTER A WITH INVERTED BREVE
+-<dead_doublegrave> <E> : "Ȅ" U0204 # LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
+-<dead_doublegrave> <e> : "ȅ" U0205 # LATIN SMALL LETTER E WITH DOUBLE GRAVE
+-<dead_invertedbreve> <E> : "Ȇ" U0206 # LATIN CAPITAL LETTER E WITH INVERTED BREVE
+-<dead_invertedbreve> <e> : "ȇ" U0207 # LATIN SMALL LETTER E WITH INVERTED BREVE
+-<dead_doublegrave> <I> : "Ȉ" U0208 # LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
+-<dead_doublegrave> <i> : "ȉ" U0209 # LATIN SMALL LETTER I WITH DOUBLE GRAVE
+-<dead_invertedbreve> <I> : "Ȋ" U020A # LATIN CAPITAL LETTER I WITH INVERTED BREVE
+-<dead_invertedbreve> <i> : "ȋ" U020B # LATIN SMALL LETTER I WITH INVERTED BREVE
+-<dead_doublegrave> <O> : "Ȍ" U020C # LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
+-<dead_doublegrave> <o> : "ȍ" U020D # LATIN SMALL LETTER O WITH DOUBLE GRAVE
+-<dead_invertedbreve> <O> : "Ȏ" U020E # LATIN CAPITAL LETTER O WITH INVERTED BREVE
+-<dead_invertedbreve> <o> : "ȏ" U020F # LATIN SMALL LETTER O WITH INVERTED BREVE
+-<dead_doublegrave> <R> : "Ȑ" U0210 # LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
+-<dead_doublegrave> <r> : "ȑ" U0211 # LATIN SMALL LETTER R WITH DOUBLE GRAVE
+-<dead_invertedbreve> <R> : "Ȓ" U0212 # LATIN CAPITAL LETTER R WITH INVERTED BREVE
+-<dead_invertedbreve> <r> : "ȓ" U0213 # LATIN SMALL LETTER R WITH INVERTED BREVE
+-<dead_doublegrave> <U> : "Ȕ" U0214 # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
+-<dead_doublegrave> <u> : "ȕ" U0215 # LATIN SMALL LETTER U WITH DOUBLE GRAVE
+-<dead_invertedbreve> <U> : "Ȗ" U0216 # LATIN CAPITAL LETTER U WITH INVERTED BREVE
+-<dead_invertedbreve> <u> : "ȗ" U0217 # LATIN SMALL LETTER U WITH INVERTED BREVE
-<dead_belowcomma> <S> : "Ș" U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW
-<dead_belowcomma> <s> : "ș" U0219 # LATIN SMALL LETTER S WITH COMMA BELOW
-<dead_belowcomma> <T> : "Ț" U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW
@@ -1386,8 +1386,8 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
-<dead_breve> <Cyrillic_u> : "ў" U045E # CYRILLIC SMALL LETTER SHORT U
-<Multi_key> <U> <Cyrillic_u> : "ў" U045E # CYRILLIC SMALL LETTER SHORT U
-<Multi_key> <b> <Cyrillic_u> : "ў" U045E # CYRILLIC SMALL LETTER SHORT U
--<dead_double_grave> <U0474> : "Ѷ" U0476 # CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
--<dead_double_grave> <U0475> : "ѷ" U0477 # CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
+-<dead_doublegrave> <U0474> : "Ѷ" U0476 # CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
+-<dead_doublegrave> <U0475> : "ѷ" U0477 # CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
-<Multi_key> <slash> <Cyrillic_GHE> : "Ғ" U0492 # CYRILLIC CAPITAL LETTER GHE WITH STROKE
-<Multi_key> <KP_Divide> <Cyrillic_GHE> : "Ғ" U0492 # CYRILLIC CAPITAL LETTER GHE WITH STROKE
-<Multi_key> <slash> <Cyrillic_ghe> : "ғ" U0493 # CYRILLIC SMALL LETTER GHE WITH STROKE
commit fa0aa380a726acf10a5f8515feac5f19bbf5a1c6
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 15 16:33:30 2013 +0200
Update 003_recognize_glibc_2.3.2_locale_names.diff
diff --git a/debian/changelog b/debian/changelog
index a883ff3..917b571 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libx11 (2:1.6.0-1) UNRELEASED; urgency=low
- Fix unbounded recursion when reading resource files (closes: #145048)
- XmbLookupString man page no longer warns (closes: #300819)
- Fix build with automake 1.13 (closes: #710467)
+ * Update 003_recognize_glibc_2.3.2_locale_names.diff.
-- Julien Cristau <jcristau@debian.org> Sat, 15 Jun 2013 13:24:49 +0200
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 fa03371..dbcb85e 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
@@ -26,12 +26,6 @@ Major housecleaning of X11's locale support.
* Turn off intrusion of Nynorsk into Nyanja's ISO 639 space. (Nynorsk is
nn, not ny.)
-* Retain support for a3 as an alias for az (Azerbaijani), though I'm dubious
- about it.
-
-* Turn off support for the bogus (and ancient) FreeBSD-ism of using
- "lt_LN.ISO8859-1" as a "generic" Latin-1 locale.
-
* Remove bogus "ee" locales for Estonian (et).
* Remove ISO 8859-15 support for languages that don't use that character
@@ -55,9 +49,11 @@ 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
---- a/nls/compose.dir.pre
-+++ b/nls/compose.dir.pre
-@@ -4,9 +4,17 @@ XCOMM The first word is the compose tabl
+Index: libx11/nls/compose.dir.pre
+===================================================================
+--- libx11.orig/nls/compose.dir.pre 2013-06-15 13:19:37.000000000 +0200
++++ libx11/nls/compose.dir.pre 2013-06-15 17:34:15.927737867 +0200
+@@ -4,8 +4,13 @@
XCOMM the second word is full locale name.
XCOMM
XCOMM
@@ -65,88 +61,29 @@ but any bit would help. --Nathanael
+XCOMM pages, Fujitsu's S90 or U90 character sets, or TIS620 yet.
+XCOMM
iso8859-1/Compose: C
-+XCOMM a3 is not an ISO 639 language code, but in Cyrillic, "Z" looks like "3".
-+koi8-c/Compose: a3_AZ.KOI8-C
+iso8859-1/Compose: aa_DJ.ISO8859-1
iso8859-1/Compose: af_ZA.ISO8859-1
+iso8859-15/Compose: an_ES.ISO8859-15
iso8859-6/Compose: ar_AA.ISO8859-6
-+iso8859-6/Compose: ar_AE.ISO8859-6
+ iso8859-6/Compose: ar_AE.ISO8859-6
iso8859-6/Compose: ar_BH.ISO8859-6
- iso8859-6/Compose: ar_DZ.ISO8859-6
- iso8859-6/Compose: ar_EG.ISO8859-6
-@@ -19,13 +27,17 @@ iso8859-6/Compose: ar_MA.ISO8859-6
- iso8859-6/Compose: ar_OM.ISO8859-6
- iso8859-6/Compose: ar_QA.ISO8859-6
- iso8859-6/Compose: ar_SA.ISO8859-6
-+iso8859-6/Compose: ar_SD.ISO8859-6
-+iso8859-6/Compose: ar_SY.ISO8859-6
- iso8859-6/Compose: ar_TN.ISO8859-6
- iso8859-6/Compose: ar_YE.ISO8859-6
- iso8859-9e/Compose: az_AZ.ISO8859-9E
--koi8-c/Compose: a3_AZ.KOI8-C
-+koi8-c/Compose: az_AZ.KOI8-C
-+iso8859-5/Compose: be_BY.ISO8859-5
- microsoft-cp1251/Compose: be_BY.CP1251
- iso8859-5/Compose: bg_BG.ISO8859-5
- microsoft-cp1251/Compose: bg_BG.CP1251
-+koi8-r/Compose: bg_BG.KOI8-R
- iso8859-1/Compose: br_FR.ISO8859-1
- iso8859-14/Compose: br_FR.ISO8859-14
- iso8859-15/Compose: br_FR.ISO8859-15
-@@ -46,6 +58,8 @@ iso8859-1/Compose: da_DK.ISO8859-1
- iso8859-15/Compose: da_DK.ISO8859-15
- iso8859-1/Compose: de_AT.ISO8859-1
- iso8859-15/Compose: de_AT.ISO8859-15
-+iso8859-1/Compose: de_BE.ISO8859-1
-+iso8859-15/Compose: de_BE.ISO8859-15
- iso8859-1/Compose: de_CH.ISO8859-1
- iso8859-15/Compose: de_CH.ISO8859-15
- iso8859-1/Compose: de_DE.ISO8859-1
-@@ -55,15 +69,26 @@ iso8859-15/Compose: de_LI.ISO8859-15
- iso8859-1/Compose: de_LU.ISO8859-1
- iso8859-15/Compose: de_LU.ISO8859-15
- iso8859-7/Compose: el_GR.ISO8859-7
-+iso8859-15/Compose: el_GR.ISO8859-15
- iso8859-1/Compose: en_AU.ISO8859-1
-+iso8859-1/Compose: en_BE.ISO8859-1
-+iso8859-15/Compose: en_BE.ISO8859-15
-+iso8859-1/Compose: en_BW.ISO8859-1
+@@ -70,12 +75,15 @@
+ iso8859-1/Compose: en_BW.ISO8859-1
iso8859-1/Compose: en_BZ.ISO8859-1
iso8859-1/Compose: en_CA.ISO8859-1
+iso8859-1/Compose: en_DK.ISO8859-1
+iso8859-15/Compose: en_DK.ISO8859-15
+ iso8859-1/Compose: en_EN.ISO8859-1
iso8859-1/Compose: en_GB.ISO8859-1
iso8859-15/Compose: en_GB.ISO8859-15
-+iso8859-1/Compose: en_HK.ISO8859-1
+ iso8859-1/Compose: en_HK.ISO8859-1
iso8859-1/Compose: en_IE.ISO8859-1
iso8859-15/Compose: en_IE.ISO8859-15
+iso8859-1/Compose: en_IN.ISO8859-1
-+iso8859-15/Compose: en_IN.ISO8859-15
+ iso8859-15/Compose: en_IN.ISO8859-15
iso8859-1/Compose: en_JM.ISO8859-1
iso8859-1/Compose: en_NZ.ISO8859-1
-+iso8859-1/Compose: en_PH.ISO8859-1
-+iso8859-1/Compose: en_SG.ISO8859-1
- iso8859-1/Compose: en_TT.ISO8859-1
- iso8859-1/Compose: en_UK.ISO8859-1
- iso8859-15/Compose: en_UK.ISO8859-15
-@@ -71,6 +96,7 @@ iso8859-1/Compose: en_US.ISO8859-1
- iso8859-15/Compose: en_US.ISO8859-15
- iso8859-1/Compose: en_ZA.ISO8859-1
- iso8859-15/Compose: en_ZA.ISO8859-15
-+iso8859-1/Compose: en_ZW.ISO8859-1
- iso8859-3/Compose: eo_XX.ISO8859-3
- iso8859-1/Compose: es_AR.ISO8859-1
- iso8859-1/Compose: es_BO.ISO8859-1
-@@ -90,6 +116,7 @@ iso8859-1/Compose: es_PE.ISO8859-1
- iso8859-1/Compose: es_PR.ISO8859-1
- iso8859-1/Compose: es_PY.ISO8859-1
- iso8859-1/Compose: es_SV.ISO8859-1
-+iso8859-1/Compose: es_US.ISO8859-1
- iso8859-1/Compose: es_UY.ISO8859-1
- iso8859-1/Compose: es_VE.ISO8859-1
- iso8859-1/Compose: et_EE.ISO8859-1
-@@ -98,6 +125,8 @@ iso8859-13/Compose: et_EE.ISO8859-13
+@@ -124,6 +132,8 @@
iso8859-15/Compose: et_EE.ISO8859-15
iso8859-1/Compose: eu_ES.ISO8859-1
iso8859-15/Compose: eu_ES.ISO8859-15
@@ -155,7 +92,7 @@ but any bit would help. --Nathanael
isiri-3342/Compose: fa_IR.ISIRI-3342
iso8859-1/Compose: fi_FI.ISO8859-1
iso8859-15/Compose: fi_FI.ISO8859-15
-@@ -131,11 +160,9 @@ iso8859-2/Compose: hr_HR.ISO8859-2
+@@ -157,11 +167,9 @@
iso8859-2/Compose: hu_HU.ISO8859-2
armscii-8/Compose: hy_AM.ARMSCII-8
iso8859-1/Compose: id_ID.ISO8859-1
@@ -167,7 +104,7 @@ but any bit would help. --Nathanael
iso8859-1/Compose: it_IT.ISO8859-1
iso8859-15/Compose: it_IT.ISO8859-15
ja/Compose: ja_JP.eucJP
-@@ -144,14 +171,20 @@ ja.JIS/Compose: ja_JP.JIS7
+@@ -170,10 +178,10 @@
georgian-academy/Compose: ka_GE.GEORGIAN-ACADEMY
georgian-ps/Compose: ka_GE.GEORGIAN-PS
iso8859-1/Compose: kl_GL.ISO8859-1
@@ -179,31 +116,22 @@ but any bit would help. --Nathanael
ko/Compose: ko_KR.eucKR
ibm-cp1133/Compose: lo_LA.IBM-CP1133
mulelao-1/Compose: lo_LA.MULELAO-1
--iso8859-1/Compose: lt_LN.ISO8859-1
-+#if defined(__FreeBSD__)
-+XCOMM most locales in FreeBSD 2.1.[56] do not work, allow use of FreeBSD's
-+XCOMM generic latin-1 locale name. N.B. "lt" is a bad code to use for a
-+XCOMM generic Latin-1 locale anyway because it is the country code for
-+XCOMM Lithuania, which by default uses Latin-7 (ISO-8859-13).
-+XCOMM iso8859-1/Compose: lt_LN.ISO8859-1
-+#endif
- iso8859-4/Compose: lt_LT.ISO8859-4
- iso8859-13/Compose: lt_LT.ISO8859-13
- iso8859-4/Compose: lv_LV.ISO8859-4
-@@ -178,25 +211,33 @@ iso8859-1/Compose: ny_NO.ISO8859-1
+@@ -202,15 +210,18 @@
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-15/Compose: pd_DE.ISO8859-15
-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-15/Compose: pd_US.ISO8859-15
++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
++XCOMM iso8859-1/Compose: pd_DE.ISO8859-1
++XCOMM iso8859-15/Compose: pd_DE.ISO8859-15
++XCOMM iso8859-1/Compose: pd_US.ISO8859-1
++XCOMM iso8859-15/Compose: pd_US.ISO8859-15
iso8859-1/Compose: ph_PH.ISO8859-1
iso8859-2/Compose: pl_PL.ISO8859-2
iso8859-1/Compose: pp_AN.ISO8859-1
@@ -212,130 +140,45 @@ but any bit would help. --Nathanael
iso8859-1/Compose: pt_PT.ISO8859-1
iso8859-15/Compose: pt_PT.ISO8859-15
iso8859-2/Compose: ro_RO.ISO8859-2
- koi8-r/Compose: ru_RU.KOI8-R
- iso8859-5/Compose: ru_RU.ISO8859-5
- microsoft-cp1251/Compose: ru_RU.CP1251
-+microsoft-cp1251/Compose: ru_UA.CP1251
- koi8-u/Compose: ru_UA.KOI8-U
- iso8859-1/Compose: rw_RW.ISO8859-1
Reply to: