ChangeLog | 202 ++++ configure.ac | 45 cpprules.in | 10 debian/changelog | 9 debian/control | 2 debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff | 73 - debian/rules | 2 man/AllPlanes.man | 8 man/BlackPixelOfScreen.man | 6 man/DisplayOfCCC.man | 10 man/ImageByteOrder.man | 8 man/IsCursorKey.man | 6 man/Makefile.am | 999 +++++++++++---------- man/XAddHost.man | 2 man/XAllocClassHint.man | 28 man/XAllocColor.man | 6 man/XAllocIconSize.man | 28 man/XAllocSizeHints.man | 28 man/XAllocStandardColormap.man | 8 man/XAllocWMHints.man | 28 man/XAnyEvent.man | 50 - man/XButtonEvent.man | 50 - man/XChangeKeyboardControl.man | 4 man/XChangeKeyboardMapping.man | 4 man/XChangeSaveSet.man | 2 man/XChangeWindowAttributes.man | 14 man/XCirculateEvent.man | 50 - man/XCirculateRequestEvent.man | 50 - man/XClearArea.man | 2 man/XClientMessageEvent.man | 52 - man/XColormapEvent.man | 52 - man/XConfigureEvent.man | 50 - man/XConfigureRequestEvent.man | 50 - man/XConfigureWindow.man | 12 man/XCopyArea.man | 2 man/XCreateColormap.man | 10 man/XCreateFontCursor.man | 6 man/XCreateFontSet.man | 6 man/XCreateGC.man | 32 man/XCreateIC.man | 8 man/XCreateOC.man | 4 man/XCreatePixmap.man | 2 man/XCreateRegion.man | 4 man/XCreateWindow.man | 14 man/XCreateWindowEvent.man | 50 - man/XCrossingEvent.man | 50 - man/XDefineCursor.man | 4 man/XDestroyWindow.man | 12 man/XDestroyWindowEvent.man | 50 - man/XDrawArc.man | 6 man/XDrawImageString.man | 8 man/XDrawLine.man | 6 man/XDrawPoint.man | 6 man/XDrawRectangle.man | 6 man/XDrawString.man | 6 man/XDrawText.man | 6 man/XEmptyRegion.man | 4 man/XErrorEvent.man | 52 - man/XExposeEvent.man | 50 - man/XExtentsOfFontSet.man | 6 man/XFillRectangle.man | 6 man/XFilterEvent.man | 2 man/XFlush.man | 8 man/XFocusChangeEvent.man | 50 - man/XFontSetExtents.man | 6 man/XFontsOfFontSet.man | 10 man/XGetEventData.man | 2 man/XGetVisualInfo.man | 2 man/XGetWindowAttributes.man | 4 man/XGetWindowProperty.man | 4 man/XGetXCBConnection.man | 4 man/XGrabButton.man | 8 man/XGrabKey.man | 8 man/XGrabKeyboard.man | 8 man/XGrabPointer.man | 8 man/XGrabServer.man | 8 man/XGraphicsExposeEvent.man | 52 - man/XGravityEvent.man | 50 - man/XIconifyWindow.man | 14 man/XIfEvent.man | 8 man/XInitImage.man | 2 man/XInstallColormap.man | 8 man/XInternAtom.man | 4 man/XIntersectRegion.man | 6 man/XKeymapEvent.man | 50 - man/XListFonts.man | 4 man/XLoadFont.man | 6 man/XLookupKeysym.man | 6 man/XMapEvent.man | 50 - man/XMapRequestEvent.man | 50 - man/XMapWindow.man | 12 man/XNextEvent.man | 8 man/XOpenDisplay.man | 6 man/XOpenIM.man | 8 man/XOpenOM.man | 4 man/XParseGeometry.man | 2 man/XPolygonRegion.man | 6 man/XPropertyEvent.man | 52 - man/XPutBackEvent.man | 8 man/XQueryBestSize.man | 16 man/XQueryColor.man | 6 man/XQueryPointer.man | 4 man/XQueryTree.man | 15 man/XRaiseWindow.man | 12 man/XReadBitmapFile.man | 4 man/XRecolorCursor.man | 6 man/XReparentEvent.man | 50 - man/XReparentWindow.man | 2 man/XResizeRequestEvent.man | 50 - man/XSelectionClearEvent.man | 52 - man/XSelectionEvent.man | 50 - man/XSelectionRequestEvent.man | 52 - man/XSendEvent.man | 8 man/XSetArcMode.man | 18 man/XSetClipOrigin.man | 18 man/XSetCommand.man | 26 man/XSetErrorHandler.man | 4 man/XSetEventQueueOwner.man | 4 man/XSetFillStyle.man | 16 man/XSetFont.man | 16 man/XSetFontPath.man | 4 man/XSetICFocus.man | 8 man/XSetICValues.man | 8 man/XSetInputFocus.man | 2 man/XSetLineAttributes.man | 16 man/XSetPointerMapping.man | 4 man/XSetState.man | 16 man/XSetTextProperty.man | 26 man/XSetTile.man | 16 man/XSetTransientForHint.man | 26 man/XSetWMClientMachine.man | 26 man/XSetWMColormapWindows.man | 28 man/XSetWMIconName.man | 28 man/XSetWMName.man | 28 man/XSetWMProperties.man | 30 man/XSetWMProtocols.man | 28 man/XStoreBytes.man | 2 man/XStoreColors.man | 6 man/XStringListToTextProperty.man | 28 man/XStringToKeysym.man | 2 man/XSynchronize.man | 2 man/XTextExtents.man | 4 man/XTextWidth.man | 4 man/XUnmapEvent.man | 50 - man/XUnmapWindow.man | 12 man/XVisibilityEvent.man | 50 - man/XWarpPointer.man | 2 man/XcmsAllocColor.man | 4 man/XcmsCCCOfColormap.man | 10 man/XcmsCIELabQueryMaxC.man | 6 man/XcmsCIELuvQueryMaxC.man | 6 man/XcmsColor.man | 6 man/XcmsConvertColors.man | 10 man/XcmsCreateCCC.man | 10 man/XcmsDefaultCCC.man | 10 man/XcmsQueryBlack.man | 6 man/XcmsQueryColor.man | 6 man/XcmsSetWhitePoint.man | 10 man/XcmsStoreColor.man | 4 man/XcmsTekHVCQueryMaxC.man | 6 man/XmbDrawImageString.man | 10 man/XmbDrawString.man | 10 man/XmbDrawText.man | 10 man/XmbLookupString.man | 2 man/XmbResetIC.man | 8 man/XmbTextEscapement.man | 4 man/XmbTextExtents.man | 4 man/XmbTextListToTextProperty.man | 4 man/XmbTextPerCharExtents.man | 4 man/XrmEnumerateDatabase.man | 6 man/XrmGetFileDatabase.man | 6 man/XrmGetResource.man | 8 man/XrmInitialize.man | 8 man/XrmMergeDatabases.man | 6 man/XrmPutResource.man | 8 man/XrmUniqueQuark.man | 8 man/xkb/Makefile.am | 2 man/xkb/XkbActionCtrls.man | 9 man/xkb/XkbAddDeviceLedInfo.man | 15 man/xkb/XkbAddGeomColor.man | 15 man/xkb/XkbAddGeomDoodad.man | 15 man/xkb/XkbAddGeomKey.man | 7 man/xkb/XkbAddGeomKeyAlias.man | 15 man/xkb/XkbAddGeomOutline.man | 11 man/xkb/XkbAddGeomOverlay.man | 15 man/xkb/XkbAddGeomOverlayKey.man | 15 man/xkb/XkbAddGeomOverlayRow.man | 15 man/xkb/XkbAddGeomProperty.man | 15 man/xkb/XkbAddGeomRow.man | 11 man/xkb/XkbAddGeomSection.man | 23 man/xkb/XkbAddGeomShape.man | 15 man/xkb/XkbAddSymInterpret.man | 19 man/xkb/XkbAllocClientMap.man | 15 man/xkb/XkbAllocCompatMap.man | 15 man/xkb/XkbAllocControls.man | 11 man/xkb/XkbAllocDeviceInfo.man | 15 man/xkb/XkbAllocDeviceLedInfo.man | 11 man/xkb/XkbAllocGeomColors.man | 11 man/xkb/XkbAllocGeomDoodads.man | 11 man/xkb/XkbAllocGeomKeyAliases.man | 11 man/xkb/XkbAllocGeomKeys.man | 11 man/xkb/XkbAllocGeomOutlines.man | 11 man/xkb/XkbAllocGeomOverlayKey.man | 11 man/xkb/XkbAllocGeomOverlayRows.man | 13 man/xkb/XkbAllocGeomOverlays.man | 11 man/xkb/XkbAllocGeomPoints.man | 11 man/xkb/XkbAllocGeomProps.man | 11 man/xkb/XkbAllocGeomRows.man | 11 man/xkb/XkbAllocGeomSectionDoodads.man | 14 man/xkb/XkbAllocGeomSections.man | 11 man/xkb/XkbAllocGeomShapes.man | 11 man/xkb/XkbAllocGeometry.man | 11 man/xkb/XkbAllocIndicatorMaps.man | 7 man/xkb/XkbAllocKeyboard.man | 5 man/xkb/XkbAllocNames.man | 19 man/xkb/XkbAllocServerMap.man | 15 man/xkb/XkbApplyCompatMapToKey.man | 15 man/xkb/XkbBell.man | 21 man/xkb/XkbBellEvent.man | 19 man/xkb/XkbChangeControls.man | 15 man/xkb/XkbChangeDeviceInfo.man | 15 man/xkb/XkbChangeEnabledControls.man | 19 man/xkb/XkbChangeIndicators.man | 19 man/xkb/XkbChangeMap.man | 15 man/xkb/XkbChangeNames.man | 15 man/xkb/XkbChangeTypesOfKey.man | 27 man/xkb/XkbComputeRowBounds.man | 15 man/xkb/XkbComputeSectionBounds.man | 11 man/xkb/XkbComputeShapeBounds.man | 7 man/xkb/XkbComputeShapeTop.man | 11 man/xkb/XkbCopyKeyType.man | 11 man/xkb/XkbCopyKeyTypes.man | 15 man/xkb/XkbDeviceBell.man | 33 man/xkb/XkbDeviceBellEvent.man | 33 man/xkb/XkbFindOverlayForKey.man | 15 man/xkb/XkbForceBell.man | 13 man/xkb/XkbForceDeviceBell.man | 29 man/xkb/XkbFreeClientMap.man | 15 man/xkb/XkbFreeCompatMap.man | 15 man/xkb/XkbFreeComponentList.man | 7 man/xkb/XkbFreeControls.man | 15 man/xkb/XkbFreeDeviceInfo.man | 15 man/xkb/XkbFreeGeomColors.man | 19 man/xkb/XkbFreeGeomDoodads.man | 15 man/xkb/XkbFreeGeomKeyAliases.man | 19 man/xkb/XkbFreeGeomKeys.man | 19 man/xkb/XkbFreeGeomOutlines.man | 19 man/xkb/XkbFreeGeomOverlayKeys.man | 19 man/xkb/XkbFreeGeomOverlayRows.man | 19 man/xkb/XkbFreeGeomOverlays.man | 19 man/xkb/XkbFreeGeomPoints.man | 19 man/xkb/XkbFreeGeomProperties.man | 19 man/xkb/XkbFreeGeomRows.man | 19 man/xkb/XkbFreeGeomSections.man | 19 man/xkb/XkbFreeGeomShapes.man | 19 man/xkb/XkbFreeGeometry.man | 15 man/xkb/XkbFreeIndicatorMaps.man | 7 man/xkb/XkbFreeKeyboard.man | 15 man/xkb/XkbFreeNames.man | 15 man/xkb/XkbFreeServerMap.man | 15 man/xkb/XkbGetAccessXTimeout.man | 31 man/xkb/XkbGetAutoRepeatRate.man | 19 man/xkb/XkbGetAutoResetControls.man | 15 man/xkb/XkbGetBounceKeysDelay.man | 15 man/xkb/XkbGetCompatMap.man | 15 man/xkb/XkbGetControls.man | 15 man/xkb/XkbGetControlsChanges.man | 15 man/xkb/XkbGetDetectableAutorepeat.man | 11 man/xkb/XkbGetDeviceButtonActions.man | 23 man/xkb/XkbGetDeviceInfo.man | 25 man/xkb/XkbGetDeviceInfoChanges.man | 15 man/xkb/XkbGetDeviceLedInfo.man | 23 man/xkb/XkbGetGeometry.man | 11 man/xkb/XkbGetIndicatorChanges.man | 19 man/xkb/XkbGetIndicatorMap.man | 15 man/xkb/XkbGetIndicatorState.man | 15 man/xkb/XkbGetKeyActions.man | 19 man/xkb/XkbGetKeyBehaviors.man | 19 man/xkb/XkbGetKeyExplicitComponents.man | 22 man/xkb/XkbGetKeyModifierMap.man | 19 man/xkb/XkbGetKeySyms.man | 19 man/xkb/XkbGetKeyTypes.man | 19 man/xkb/XkbGetKeyVirtualModMap.man | 19 man/xkb/XkbGetKeyboard.man | 15 man/xkb/XkbGetKeyboardByName.man | 27 man/xkb/XkbGetMap.man | 15 man/xkb/XkbGetNameChanges.man | 15 man/xkb/XkbGetNamedGeometry.man | 17 man/xkb/XkbGetNamedIndicator.man | 31 man/xkb/XkbGetNames.man | 15 man/xkb/XkbGetSlowKeysDelay.man | 15 man/xkb/XkbGetState.man | 15 man/xkb/XkbGetStickyKeysOptions.man | 15 man/xkb/XkbGetUpdatedMap.man | 15 man/xkb/XkbGetVirtualMods.man | 15 man/xkb/XkbGetXlibControls.man | 7 man/xkb/XkbIgnoreExtension.man | 9 man/xkb/XkbInitCanonicalKeyTypes.man | 15 man/xkb/XkbKeyAction.man | 15 man/xkb/XkbKeyActionEntry.man | 21 man/xkb/XkbKeyActionsPtr.man | 13 man/xkb/XkbKeyGroupInfo.man | 13 man/xkb/XkbKeyGroupWidth.man | 17 man/xkb/XkbKeyGroupsWidth.man | 13 man/xkb/XkbKeyHasActions.man | 13 man/xkb/XkbKeyNumActions.man | 13 man/xkb/XkbKeyNumGroups.man | 13 man/xkb/XkbKeyNumSyms.man | 13 man/xkb/XkbKeySymEntry.man | 21 man/xkb/XkbKeySymsOffset.man | 13 man/xkb/XkbKeySymsPtr.man | 13 man/xkb/XkbKeyType.man | 15 man/xkb/XkbKeyTypeIndex.man | 15 man/xkb/XkbKeyTypesForCoreSymbols.man | 27 man/xkb/XkbKeycodeToKeysym.man | 19 man/xkb/XkbKeysymToModifiers.man | 11 man/xkb/XkbLatchGroup.man | 15 man/xkb/XkbLatchModifiers.man | 19 man/xkb/XkbLibraryVersion.man | 11 man/xkb/XkbListComponents.man | 19 man/xkb/XkbLockGroup.man | 15 man/xkb/XkbLockModifiers.man | 19 man/xkb/XkbLookupKeyBinding.man | 31 man/xkb/XkbLookupKeySym.man | 25 man/xkb/XkbModActionVMods.man | 9 man/xkb/XkbNoteControlsChanges.man | 15 man/xkb/XkbNoteDeviceChanges.man | 15 man/xkb/XkbNoteIndicatorChanges.man | 15 man/xkb/XkbNoteNameChanges.man | 15 man/xkb/XkbOpenDisplay.man | 29 man/xkb/XkbOutOfRangeGroupInfo.man | 9 man/xkb/XkbOutOfRangeGroupNumber.man | 9 man/xkb/XkbPtrActionX.man | 9 man/xkb/XkbPtrActionY.man | 9 man/xkb/XkbQueryExtension.man | 27 man/xkb/XkbRefreshKeyboardMapping.man | 9 man/xkb/XkbResizeDeviceButtonActions.man | 11 man/xkb/XkbResizeKeyActions.man | 15 man/xkb/XkbResizeKeySyms.man | 15 man/xkb/XkbResizeKeyType.man | 23 man/xkb/XkbSAActionSetCtrls.man | 15 man/xkb/XkbSAGroup.man | 9 man/xkb/XkbSAPtrDfltValue.man | 9 man/xkb/XkbSARedirectSetVMods.man | 13 man/xkb/XkbSARedirectSetVModsMask.man | 13 man/xkb/XkbSARedirectVMods.man | 9 man/xkb/XkbSARedirectVModsMask.man | 9 man/xkb/XkbSAScreen.man | 7 man/xkb/XkbSASetGroup.man | 15 man/xkb/XkbSASetPtrDfltValue.man | 13 man/xkb/XkbSASetScreen.man | 13 man/xkb/XkbSelectEventDetails.man | 23 man/xkb/XkbSelectEvents.man | 19 man/xkb/XkbSetAccessXTimeout.man | 31 man/xkb/XkbSetAutoRepeatRate.man | 19 man/xkb/XkbSetAutoResetControls.man | 19 man/xkb/XkbSetBounceKeysDelay.man | 15 man/xkb/XkbSetCompatMap.man | 19 man/xkb/XkbSetControls.man | 15 man/xkb/XkbSetDebuggingFlags.man | 35 man/xkb/XkbSetDetectableAutorepeat.man | 15 man/xkb/XkbSetDeviceButtonActions.man | 27 man/xkb/XkbSetDeviceInfo.man | 15 man/xkb/XkbSetIgnoreLockMods.man | 27 man/xkb/XkbSetIndicatorMap.man | 15 man/xkb/XkbSetMap.man | 15 man/xkb/XkbSetModActionVMods.man | 13 man/xkb/XkbSetNamedIndicator.man | 31 man/xkb/XkbSetNames.man | 23 man/xkb/XkbSetPtrActionX.man | 13 man/xkb/XkbSetPtrActionY.man | 13 man/xkb/XkbSetServerInternalMods.man | 27 man/xkb/XkbSetXlibControls.man | 15 man/xkb/XkbTranslateKeyCode.man | 25 man/xkb/XkbTranslateKeySym.man | 27 man/xkb/XkbUpdateMapFromCore.man | 27 man/xkb/XkbVirtualModsToReal.man | 15 nls/Makefile.am | 6 nls/compose-check.pl | 163 +++ nls/el_GR.UTF-8/Compose.pre | 8 nls/en_US.UTF-8/Compose.pre | 205 ++++ nls/iso8859-2/Compose.pre | 4 nls/localerules.in | 5 nls/pt_BR.UTF-8/Compose.pre | 64 - src/ConnDis.c | 2 src/CrGlCur.c | 2 src/XKeysymDB | 1 387 files changed, 3491 insertions(+), 4206 deletions(-)
New commits: commit fb033937692e5c0553ee4ac20c2391f657ca2b10 Author: Julien Cristau <[email protected]> Date: Mon Oct 12 15:28:26 2009 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index a83700b..768a3d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libx11 (2:1.3-1) UNRELEASED; urgency=low +libx11 (2:1.3-1) experimental; urgency=low * libx11-6.symbols: mark some more stuff as private. * libx11-6.symbols: add kfreebsd-amd64 tag for 64-bit symbols. @@ -10,7 +10,7 @@ libx11 (2:1.3-1) UNRELEASED; urgency=low * Fix 006_tailor_pt_BR.UTF-8_Compose.diff to apply on new upstream. * Bump Standards-Version to 3.8.3. - -- Julien Cristau <[email protected]> Sun, 11 Oct 2009 20:25:38 +0200 + -- Julien Cristau <[email protected]> Mon, 12 Oct 2009 15:28:23 +0200 libx11 (2:1.2.99.901-1) experimental; urgency=low commit 029b7f853738550a87afb9fb1d600870c3aa962b Author: Julien Cristau <[email protected]> Date: Mon Oct 12 15:28:04 2009 +0200 Fix some (mostly unused) DEB_BUILD_OPTIONS parsing diff --git a/debian/rules b/debian/rules index 523d646..620485a 100755 --- a/debian/rules +++ b/debian/rules @@ -27,7 +27,7 @@ endif # much crap to bother specifying it through --exclude arguments. # It alters dh_install call in binary_indep, as it is the first one called # from binary target. -ifneq (,$(findstring checkinstall,$(DEB_BUILD_OPTIONS))) +ifneq (,$(filter checkinstall,$(DEB_BUILD_OPTIONS))) dhinstallindepflags := --fail-missing else dhinstallindepflags := -i commit ccdd94b44ad49feabc53f089d0cb381aea9900ac Author: Julien Cristau <[email protected]> Date: Mon Oct 12 15:27:06 2009 +0200 Bump Standards-Version to 3.8.3. diff --git a/debian/changelog b/debian/changelog index a27e7df..a83700b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ libx11 (2:1.3-1) UNRELEASED; urgency=low * Cherry-pick patch from upstream git to avoid an error in configure due to underquoting. * Fix 006_tailor_pt_BR.UTF-8_Compose.diff to apply on new upstream. + * Bump Standards-Version to 3.8.3. -- Julien Cristau <[email protected]> Sun, 11 Oct 2009 20:25:38 +0200 diff --git a/debian/control b/debian/control index a9226f0..015abea 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends: automake, libtool, xutils-dev (>= 1:7.4+4) -Standards-Version: 3.8.2 +Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libx11 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libx11.git commit c992a8ce90261486c045cab6203219eb042e5453 Author: Julien Cristau <[email protected]> Date: Sun Oct 11 20:34:52 2009 +0200 Fix 006_tailor_pt_BR.UTF-8_Compose.diff to apply on new upstream. diff --git a/debian/changelog b/debian/changelog index 17959f6..a27e7df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ libx11 (2:1.3-1) UNRELEASED; urgency=low * New upstream release. * Cherry-pick patch from upstream git to avoid an error in configure due to underquoting. + * Fix 006_tailor_pt_BR.UTF-8_Compose.diff to apply on new upstream. -- Julien Cristau <[email protected]> Sun, 11 Oct 2009 20:25:38 +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 9af0cc0..395d834 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 2009-07-19 20:36:43.000000000 +0200 -+++ libx11/nls/pt_BR.UTF-8/Compose.pre 2009-07-19 20:36:47.000000000 +0200 +--- libx11.orig/nls/pt_BR.UTF-8/Compose.pre ++++ libx11/nls/pt_BR.UTF-8/Compose.pre @@ -1,4275 +1,3 @@ -XCOMM UTF-8 (Unicode) compose sequence -XCOMM [email protected] @@ -212,6 +212,7 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre -XCOMM -XCOMM group 1: cluster jamos made of three basic jamos - +-/* The following block gets overridden by later shorter compositions - <Multi_key> <U1107> <U1109> <U1100> : "ᄢ" U1122 : ᄇᅠ ᄉᅠ ᄀᅠ = ᄢᅠ - <Multi_key> <U1107> <U1109> <U1103> : "ᄣ" U1123 : ᄇᅠ ᄉᅠ ᄃᅠ = ᄣᅠ - <Multi_key> <U1107> <U1109> <U1107> : "ᄤ" U1124 : ᄇᅠ ᄉᅠ ᄇᅠ = ᄤᅠ @@ -234,6 +235,7 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre - <Multi_key> <U11af> <U11ba> <U11ba> : "ᇖ" U11d6 : ᅟᅠᆯ ᅟᅠᆺ ᅟᅠᆺ = ᅟᅠᇖ - <Multi_key> <U11b7> <U11ba> <U11ba> : "ᇞ" U11de : ᅟᅠᆷ ᅟᅠᆺ ᅟᅠᆺ = ᅟᅠᇞ - <Multi_key> <U11bc> <U11a8> <U11a8> : "ᇭ" U11ed : ᅟᅠᆼ ᅟᅠᆨ ᅟᅠᆨ = ᅟᅠᇭ +- */ - <Multi_key> <U1100> <U1100> : "ᄁ" U1101 : ᄀᅠ ᄀᅠ = ᄁᅠ - <Multi_key> <U1103> <U1103> : "ᄄ" U1104 : ᄃᅠ ᄃᅠ = ᄄᅠ - <Multi_key> <U1107> <U1107> : "ᄈ" U1108 : ᄇᅠ ᄇᅠ = ᄈᅠ @@ -608,10 +610,11 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre -<Multi_key> <semicolon> <A> : "Ą" U0104 # LATIN CAPITAL LETTER A WITH OGONEK -<dead_ogonek> <a> : "ą" U0105 # LATIN SMALL LETTER A WITH OGONEK -<Multi_key> <semicolon> <a> : "ą" U0105 # LATIN SMALL LETTER A WITH OGONEK -+include "/usr/share/X11/locale/en_US.UTF-8/Compose" - <dead_acute> <C> : "Ç" Ccedilla # LATIN CAPITAL LETTER C WITH CEDILLA +-<dead_acute> <C> : "Ç" Ccedilla # LATIN CAPITAL LETTER C WITH CEDILLA -<Multi_key> <acute> <C> : "Ć" U0106 # LATIN CAPITAL LETTER C WITH ACUTE -<Multi_key> <apostrophe> <C> : "Ć" U0106 # LATIN CAPITAL LETTER C WITH ACUTE ++include "X11_LOCALEDATADIR/en_US.UTF-8/Compose" ++<dead_acute> <C> : "Ç" Ccedilla # LATIN CAPITAL LETTER C WITH CEDILLA <dead_acute> <c> : "ç" ccedilla # LATIN SMALL LETTER C WITH CEDILLA -<Multi_key> <acute> <c> : "ć" U0107 # LATIN SMALL LETTER C WITH ACUTE -<Multi_key> <apostrophe> <c> : "ć" U0107 # LATIN SMALL LETTER C WITH ACUTE @@ -1063,18 +1066,18 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre -<dead_acute> <dead_abovering> <A> : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE -<dead_acute> <Multi_key> <o> <A> : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE -<Multi_key> <acute> <dead_abovering> <A> : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE --<Multi_key> <acute> <o> <A> : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE +-XCOMM <Multi_key> <acute> <o> <A> : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE -<Multi_key> <apostrophe> <dead_abovering> <A> : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE --<Multi_key> <apostrophe> <o> <A> : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE +-XCOMM <Multi_key> <apostrophe> <o> <A> : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE -<dead_acute> <aring> : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE -<Multi_key> <acute> <aring> : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE -<Multi_key> <apostrophe> <aring> : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE -<dead_acute> <dead_abovering> <a> : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE -<dead_acute> <Multi_key> <o> <a> : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE -<Multi_key> <acute> <dead_abovering> <a> : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE --<Multi_key> <acute> <o> <a> : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE +-XCOMM <Multi_key> <acute> <o> <a> : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE -<Multi_key> <apostrophe> <dead_abovering> <a> : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE --<Multi_key> <apostrophe> <o> <a> : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE +-XCOMM <Multi_key> <apostrophe> <o> <a> : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE -<dead_acute> <AE> : "Ǽ" U01FC # LATIN CAPITAL LETTER AE WITH ACUTE -<Multi_key> <acute> <AE> : "Ǽ" U01FC # LATIN CAPITAL LETTER AE WITH ACUTE -<Multi_key> <apostrophe> <AE> : "Ǽ" U01FC # LATIN CAPITAL LETTER AE WITH ACUTE @@ -1521,14 +1524,12 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre -<Multi_key> <U0cc6> <U0cd6> : "ೈ" U0CC8 # KANNADA VOWEL SIGN AI -<Multi_key> <U0cc6> <U0cc2> : "ೊ" U0CCA # KANNADA VOWEL SIGN O -<Multi_key> <U0cca> <U0cd5> : "ೋ" U0CCB # KANNADA VOWEL SIGN OO --<Multi_key> <U0cc6> <U0cc2> <U0cd5> : "ೋ" U0CCB # KANNADA VOWEL SIGN OO -<Multi_key> <U0d46> <U0d3e> : "ൊ" U0D4A # MALAYALAM VOWEL SIGN O -<Multi_key> <U0d47> <U0d3e> : "ോ" U0D4B # MALAYALAM VOWEL SIGN OO -<Multi_key> <U0d46> <U0d57> : "ൌ" U0D4C # MALAYALAM VOWEL SIGN AU -<Multi_key> <U0dd9> <U0dca> : "ේ" U0DDA # SINHALA VOWEL SIGN DIGA KOMBUVA -<Multi_key> <U0dd9> <U0dcf> : "ො" U0DDC # SINHALA VOWEL SIGN KOMBUVA HAA AELA-PILLA -<Multi_key> <U0ddc> <U0dca> : "ෝ" U0DDD # SINHALA VOWEL SIGN KOMBUVA HAA DIGA AELA-PILLA --<Multi_key> <U0dd9> <U0dcf> <U0dca> : "ෝ" U0DDD # SINHALA VOWEL SIGN KOMBUVA HAA DIGA AELA-PILLA -<Multi_key> <U0dd9> <U0ddf> : "ෞ" U0DDE # SINHALA VOWEL SIGN KOMBUVA HAA GAYANUKITTA -<Multi_key> <U0fb7> <U0f42> : "གྷ" U0F43 # TIBETAN LETTER GHA -<Multi_key> <U0fb7> <U0f4c> : "ཌྷ" U0F4D # TIBETAN LETTER DDHA @@ -1570,7 +1571,7 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre -<Multi_key> <acute> <comma> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE -<Multi_key> <acute> <cedilla> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE -<Multi_key> <apostrophe> <dead_cedilla> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE --<Multi_key> <apostrophe> <comma> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE +-XCOMM <Multi_key> <apostrophe> <comma> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE -<Multi_key> <apostrophe> <cedilla> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE -<dead_acute> <ccedilla> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE -<Multi_key> <acute> <ccedilla> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE @@ -1582,7 +1583,7 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre -<Multi_key> <acute> <comma> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE -<Multi_key> <acute> <cedilla> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE -<Multi_key> <apostrophe> <dead_cedilla> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE --<Multi_key> <apostrophe> <comma> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE +-XCOMM <Multi_key> <apostrophe> <comma> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE -<Multi_key> <apostrophe> <cedilla> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE -<dead_abovedot> <D> : "Ḋ" U1E0A # LATIN CAPITAL LETTER D WITH DOT ABOVE -<Multi_key> <period> <D> : "Ḋ" U1E0A # LATIN CAPITAL LETTER D WITH DOT ABOVE @@ -1921,13 +1922,13 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre -<dead_abovedot> <dead_caron> <S> : "Ṧ" U1E66 # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE -<dead_abovedot> <Multi_key> <c> <S> : "Ṧ" U1E66 # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE -<Multi_key> <period> <dead_caron> <S> : "Ṧ" U1E66 # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE --<Multi_key> <period> <c> <S> : "Ṧ" U1E66 # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE +-XCOMM <Multi_key> <period> <c> <S> : "Ṧ" U1E66 # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE -<dead_abovedot> <scaron> : "ṧ" U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE -<Multi_key> <period> <scaron> : "ṧ" U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE -<dead_abovedot> <dead_caron> <s> : "ṧ" U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE --<dead_abovedot> <Multi_key> <c> <s> : "ṧ" U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE +-XCOMM <dead_abovedot> <Multi_key> <c> <s> : "ṧ" U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE -<Multi_key> <period> <dead_caron> <s> : "ṧ" U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE --<Multi_key> <period> <c> <s> : "ṧ" U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE +-XCOMM <Multi_key> <period> <c> <s> : "ṧ" U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE -<dead_abovedot> <U1e62> : "Ṩ" U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE -<Multi_key> <period> <U1e62> : "Ṩ" U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE -<dead_abovedot> <dead_belowdot> <S> : "Ṩ" U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE @@ -2134,10 +2135,10 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre -<dead_acute> <Multi_key> <U> <A> : "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE -<dead_acute> <Multi_key> <b> <A> : "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE -<Multi_key> <acute> <dead_breve> <A> : "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE --<Multi_key> <acute> <U> <A> : "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE +-XCOMM <Multi_key> <acute> <U> <A> : "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE -<Multi_key> <acute> <b> <A> : "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE -<Multi_key> <apostrophe> <dead_breve> <A> : "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE --<Multi_key> <apostrophe> <U> <A> : "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE +-XCOMM <Multi_key> <apostrophe> <U> <A> : "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE -<Multi_key> <apostrophe> <b> <A> : "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE -<dead_acute> <abreve> : "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE -<Multi_key> <acute> <abreve> : "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE @@ -2146,10 +2147,10 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre -<dead_acute> <Multi_key> <U> <a> : "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE -<dead_acute> <Multi_key> <b> <a> : "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE -<Multi_key> <acute> <dead_breve> <a> : "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE --<Multi_key> <acute> <U> <a> : "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE +-XCOMM <Multi_key> <acute> <U> <a> : "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE -<Multi_key> <acute> <b> <a> : "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE -<Multi_key> <apostrophe> <dead_breve> <a> : "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE --<Multi_key> <apostrophe> <U> <a> : "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE +-XCOMM <Multi_key> <apostrophe> <U> <a> : "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE -<Multi_key> <apostrophe> <b> <a> : "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE -<dead_grave> <Abreve> : "Ằ" U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE -<Multi_key> <grave> <Abreve> : "Ằ" U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE @@ -2157,7 +2158,7 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre -<dead_grave> <Multi_key> <U> <A> : "Ằ" U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE -<dead_grave> <Multi_key> <b> <A> : "Ằ" U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE -<Multi_key> <grave> <dead_breve> <A> : "Ằ" U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE --<Multi_key> <grave> <U> <A> : "Ằ" U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE +-XCOMM <Multi_key> <grave> <U> <A> : "Ằ" U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE -<Multi_key> <grave> <b> <A> : "Ằ" U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE -<dead_grave> <abreve> : "ằ" U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE -<Multi_key> <grave> <abreve> : "ằ" U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE @@ -2165,7 +2166,7 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre -<dead_grave> <Multi_key> <U> <a> : "ằ" U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE -<dead_grave> <Multi_key> <b> <a> : "ằ" U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE -<Multi_key> <grave> <dead_breve> <a> : "ằ" U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE --<Multi_key> <grave> <U> <a> : "ằ" U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE +-XCOMM <Multi_key> <grave> <U> <a> : "ằ" U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE -<Multi_key> <grave> <b> <a> : "ằ" U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE -<dead_hook> <Abreve> : "Ẳ" U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE -<Multi_key> <question> <Abreve> : "Ẳ" U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE @@ -2173,7 +2174,7 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre -<dead_hook> <Multi_key> <U> <A> : "Ẳ" U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE -<dead_hook> <Multi_key> <b> <A> : "Ẳ" U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE -<Multi_key> <question> <dead_breve> <A> : "Ẳ" U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE --<Multi_key> <question> <U> <A> : "Ẳ" U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE +-XCOMM <Multi_key> <question> <U> <A> : "Ẳ" U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE -<Multi_key> <question> <b> <A> : "Ẳ" U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE -<dead_hook> <abreve> : "ẳ" U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE -<Multi_key> <question> <abreve> : "ẳ" U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE @@ -2181,7 +2182,7 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre -<dead_hook> <Multi_key> <U> <a> : "ẳ" U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE -<dead_hook> <Multi_key> <b> <a> : "ẳ" U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE -<Multi_key> <question> <dead_breve> <a> : "ẳ" U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE --<Multi_key> <question> <U> <a> : "ẳ" U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE +-XCOMM <Multi_key> <question> <U> <a> : "ẳ" U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE -<Multi_key> <question> <b> <a> : "ẳ" U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE -<dead_tilde> <Abreve> : "Ẵ" U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE -<Multi_key> <asciitilde> <Abreve> : "Ẵ" U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE @@ -2189,7 +2190,7 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre -<dead_tilde> <Multi_key> <U> <A> : "Ẵ" U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE -<dead_tilde> <Multi_key> <b> <A> : "Ẵ" U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE -<Multi_key> <asciitilde> <dead_breve> <A> : "Ẵ" U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE --<Multi_key> <asciitilde> <U> <A> : "Ẵ" U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE +-XCOMM <Multi_key> <asciitilde> <U> <A> : "Ẵ" U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE -<Multi_key> <asciitilde> <b> <A> : "Ẵ" U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE -<dead_tilde> <abreve> : "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE -<Multi_key> <asciitilde> <abreve> : "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE @@ -2197,7 +2198,7 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre -<dead_tilde> <Multi_key> <U> <a> : "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE -<dead_tilde> <Multi_key> <b> <a> : "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE -<Multi_key> <asciitilde> <dead_breve> <a> : "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE --<Multi_key> <asciitilde> <U> <a> : "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE +-XCOMM <Multi_key> <asciitilde> <U> <a> : "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE -<Multi_key> <asciitilde> <b> <a> : "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE -<dead_breve> <U1ea0> : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW -<Multi_key> <U> <U1ea0> : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW @@ -3660,9 +3661,9 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre -<Multi_key> <underscore> <parenright> : "₎" U208E # SUBSCRIPT RIGHT PARENTHESIS -<Multi_key> <underbar> <parenright> : "₎" U208E # SUBSCRIPT RIGHT PARENTHESIS -<dead_circumflex> <Multi_key> <S> <M> : "℠" U2120 # SERVICE MARK --<Multi_key> <asciicircum> <S> <M> : "℠" U2120 # SERVICE MARK +-<Multi_key> <S> <M> : "℠" U2120 # SERVICE MARK -<dead_circumflex> <Multi_key> <T> <M> : "™" U2122 # TRADE MARK SIGN --<Multi_key> <asciicircum> <T> <M> : "™" U2122 # TRADE MARK SIGN +-<Multi_key> <T> <M> : "™" U2122 # TRADE MARK SIGN -<Multi_key> <1> <3> : "⅓" U2153 # VULGAR FRACTION ONE THIRD -<Multi_key> <2> <3> : "⅔" U2154 # VULGAR FRACTION TWO THIRDS -<Multi_key> <1> <5> : "⅕" U2155 # VULGAR FRACTION ONE FIFTH @@ -4250,25 +4251,25 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre -<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 +-XCOMM <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 +-XCOMM <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 +-XCOMM <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 +-XCOMM <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 +-XCOMM <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 +-XCOMM <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 +-XCOMM <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 +-XCOMM <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 +-XCOMM <Multi_key> <U1d1ba> <U1d165> <U1d16f> : "𝆺𝅥𝅯" U1D1C0 # MUSICAL SYMBOL FUSA BLACK - -XCOMM -XCOMM Khmer digraphs commit e1ccb386d62b0caf7d4423dd1325fe4d628a1af4 Author: Julien Cristau <[email protected]> Date: Tue Oct 6 16:11:24 2009 +0200 configure: quote argument to m4_pattern_forbid Without this, configure spits out ../configure: line 12364: ac_fn_c_check_member: command not found ../configure: line 12378: ac_fn_c_check_type: command not found Also anchor the pattern to make it stricter. Signed-off-by: Julien Cristau <[email protected]> (cherry picked from commit 854269d55cdda8caf425515bfed2855e211a5ada) diff --git a/configure.ac b/configure.ac index 655ea40..dedcf8b 100644 --- a/configure.ac +++ b/configure.ac @@ -94,7 +94,7 @@ dnl If you're seeing an error here, be sure you installed the lib/xtrans module dnl first and if it's not in the default location, that you set the ACLOCAL dnl environment variable to find it, such as: dnl ACLOCAL="aclocal -I ${PREFIX}/share/aclocal" -m4_pattern_forbid(XTRANS_CONNECTION_FLAGS) +m4_pattern_forbid([^XTRANS_CONNECTION_FLAGS$]) # Transport selection macro from xtrans.m4 XTRANS_CONNECTION_FLAGS diff --git a/debian/changelog b/debian/changelog index 311100c..17959f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ libx11 (2:1.3-1) UNRELEASED; urgency=low * Run dpkg-gensymbols with -c4 to catch mismatches between the symbols file and the library. * New upstream release. + * Cherry-pick patch from upstream git to avoid an error in configure due to + underquoting. -- Julien Cristau <[email protected]> Sun, 11 Oct 2009 20:25:38 +0200 commit 5a9ffe0444889007c8536bde64d19d31949f58cd Author: Julien Cristau <[email protected]> Date: Sun Oct 11 20:27:44 2009 +0200 Bump changelogs diff --git a/ChangeLog b/ChangeLog index 2d0b18e..79e6b70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,205 @@ +commit d54caf1c9c55af8247621b7ba6afb20b23699839 +Author: Peter Hutterer <[email protected]> +Date: Fri Oct 2 10:59:08 2009 +1000 + + libX11 1.3 + + Signed-off-by: Peter Hutterer <[email protected]> + +commit dd201bcf9e7f8863b7ef32273a5ef021678133c1 +Author: Peter Hutterer <[email protected]> +Date: Fri Oct 2 12:10:29 2009 +1000 + + nls: remove duplicate Compose sequences from pt_BR.UTF-8 + + Signed-off-by: Peter Hutterer <[email protected]> + +commit a293ae9e83739067fc92db1a39c262857bc2283e +Author: Peter Hutterer <[email protected]> +Date: Fri Sep 25 11:19:41 2009 +1000 + + Add XF86TouchpadToggle to XKeysymDB + + Lenovo laptops provide a key to enable or disable the touchpad and the + trackstick. This key is usually located on Fn + F8. + + Signed-off-by: Peter Hutterer <[email protected]> + Acked-by: Adam Jackson <[email protected]> + +commit 69839f8903a24eab08f17a781b3797fb64dce9cf +Author: Alan Coopersmith <[email protected]> +Date: Sun Sep 27 10:34:16 2009 -0700 + + Bug 24173: libX11 from git fails to build with automake older then 1.11 + + AM_CONDITIONAL must come *before* the AC_OUTPUT that creates the + Makefiles, instead of after. + <http://bugs.freedesktop.org/show_bug.cgi?id=24173> + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit f5effd041f58ef07703cca2b4f396758811e1eec +Author: Alan Coopersmith <[email protected]> +Date: Wed Apr 15 10:59:23 2009 -0700 + + Resolve conflicting Compose sequences in iso8859-2, el_GR.UTF-8 & pt_BR.UTF-8 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 3843778358d3a0cd6a2d07dba5dd061248053ac9 +Author: Alan Coopersmith <[email protected]> +Date: Wed Apr 15 10:56:09 2009 -0700 + + Add perl script to check for duplicate or conflicting compose file entries + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 19cc5e1fa17a285045662820a8b4de2a0f9a194d +Author: Alan Coopersmith <[email protected]> +Date: Fri Sep 18 17:10:04 2009 -0700 + + Use make rules instead of shell for loops to generate shadow man pages + + Allows parallel make and simpler build logs/error reporting + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 7dabcac973d0b6692a3cd62bd6d8e0467b24200b +Author: Alan Coopersmith <[email protected]> +Date: Fri Sep 18 16:58:53 2009 -0700 + + Add AM_SILENT_RULES support for cpp rules for man & nls files + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit bfa19cddd8546b4930a773f3bbd81137c362d82b +Author: Alan Coopersmith <[email protected]> +Date: Fri Sep 18 16:58:16 2009 -0700 + + Update to using xorg-macros 1.3 & XORG_DEFAULT_OPTIONS + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 51396066c8003a96a6399c9a4bed2a81e512b582 +Author: Mikko Niskanen <[email protected]> +Date: Fri Sep 4 10:11:15 2009 +1000 + + Fix wrong typedef on HP-UX (#18998) + + shl_dt doesn't exist, the type is shl_t. + + X.Org Bug 18998 <http://bugs.freedesktop.org/show_bug.cgi?id=18998> + + Signed-off-by: Peter Hutterer <[email protected]> + +commit 615220a312b9430a580fe6dcf51703c6ef244f66 +Author: Paul Bender <[email protected]> +Date: Fri Sep 4 09:57:10 2009 +1000 + + Don't require xdmcp in configure.ac (#22583) + + X.Org Bug 22583 <http://bugs.freedesktop.org/show_bug.cgi?id=22583> + + Signed-off-by: Peter Hutterer <[email protected]> + +commit 20f9ecd86ad2a9ac6966f7eee32234cb5ef77c29 +Author: Peter Hutterer <[email protected]> +Date: Thu Sep 3 14:02:44 2009 +1000 + + man: fix parameters to XkbAllocGeomOverlay{Rows|Keys} (#23499) + + X.Org Bug 23499 <http://bugs.freedesktop.org/show_bug.cgi?id=23499> + + Signed-off-by: Peter Hutterer <[email protected]> + +commit c2814a614dc4d9409bfa0f44c18bfd69ad7f7b85 +Author: Peter Hutterer <[email protected]> +Date: Thu Sep 3 12:05:25 2009 +1000 + + man: XQueryTree may return BadWindow. (#23416) + + X.Org Bug 23416 <http://bugs.freedesktop.org/show_bug.cgi?id=XXX> + + Signed-off-by: Peter Hutterer <[email protected]> + +commit dbe98d456ccc6eeca9fa3e241a3db0a4d83c5a65 +Author: Alan Coopersmith <[email protected]> +Date: Fri Aug 28 23:07:58 2009 +0800 + + Fix version tag in .TH line of several XKB man pages + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit bf24400936c10af6f5aa0c75cfe2207ab9b680b4 +Author: Alan Coopersmith <[email protected]> +Date: Fri Aug 28 23:04:38 2009 +0800 + + XkbSetDeviceButtonActions.man: remove non-existent actions argument + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 53affa9335116f2d367f041e6502a411d4619e47 +Author: Alan Coopersmith <[email protected]> +Date: Fri Aug 28 23:00:17 2009 +0800 + + XkbQueryExtension.man: Arguments should be pointers + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 6233948885acc5873a5abddfff235afec555f3c2 +Author: Alan Coopersmith <[email protected]> +Date: Fri Aug 28 22:53:03 2009 +0800 + + XkbSAActionSetCtrls.man: Fix typo in formatting macro + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 28a9ca57cdec4aa9ca92322f963b01f0c2daf47a +Author: Alan Coopersmith <[email protected]> +Date: Fri Aug 28 22:49:31 2009 +0800 + + Convert Xkb API man pages to ANSI prototypes + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit fa2eecca85baab9616f7143cc1a853a594b4a90c +Author: James Cloos <[email protected]> +Date: Mon Aug 24 06:35:17 2009 -0400 + + Add some (Serbian) Cyrillic NFD sequences. + + A number of characters in use in the various countries which use the + Cyrillic script do not appear as pre-composed characters in The UCS + or Unicode; they are only available as combining-character sequences. + + This commit adds support for using (prefix) dead keys and Multi_key- + initiated sequences to enter a number of these combining-character + sequences. This ensures that users can enter these scripts even + when using the current Cyrillic keymaps, which lack support for + the combining characters. + + Please see the discussions on the xkb mailing list. + + Signed-off-by: James Cloos <[email protected]> + +commit d1bdc909f9246119696c8b0d9afb7bd8afb71b60 +Author: Julien Cristau <[email protected]> +Date: Wed Aug 5 18:14:23 2009 +0200 + + man/xkb: delete spurious newline in .TH headers + +commit ee723b83b24682db833a2f0abd96cd319b8a62af +Author: Julien Cristau <[email protected]> +Date: Wed Aug 5 16:45:19 2009 +0200 + + man: use __libmansuffix__ instead of 3X11 for references to other pages + +commit 595e204feb82c798a92eea41fea03be6476ac181 +Author: Julien Cristau <[email protected]> +Date: Wed Aug 5 16:43:36 2009 +0200 + + man/xkb: use __libmansuffix__ instead of hardcoding 3Xkb for manpage sections + commit 9da7e230d5320e1556ad2084fcd06ee7994385ea Author: Peter Hutterer <[email protected]> Date: Wed Aug 5 14:15:02 2009 +1000 diff --git a/debian/changelog b/debian/changelog index 506b342..311100c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,12 @@ -libx11 (2:1.2.99.901-2) UNRELEASED; urgency=low +libx11 (2:1.3-1) UNRELEASED; urgency=low * libx11-6.symbols: mark some more stuff as private. * libx11-6.symbols: add kfreebsd-amd64 tag for 64-bit symbols. -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
