sync

18 files changed, 113 insertions, 97 deletions

diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index 00433440e..15f2bec76 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -76,7 +76,7 @@
 ./usr/X11R6/lib/libX11-xcb.a
 ./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
-./usr/X11R6/lib/libX11.so.15.0
+./usr/X11R6/lib/libX11.so.15.1
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXau.so.9.0
 ./usr/X11R6/lib/libXaw.so.14.0
@@ -137,13 +137,13 @@
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
 ./usr/X11R6/lib/libxcb-dri2.a
-./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2.so.0.1
 ./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
 ./usr/X11R6/lib/libxcb-glx.a
-./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-glx.so.0.1
 ./usr/X11R6/lib/libxcb-glx_pic.a
 ./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
@@ -185,13 +185,13 @@
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
 ./usr/X11R6/lib/libxcb-sync.a
-./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.1
 ./usr/X11R6/lib/libxcb-sync_pic.a
 ./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.1.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.1
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -212,7 +212,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.2
+./usr/X11R6/lib/libxcb.so.2.3
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
@@ -340,6 +340,7 @@
 ./usr/X11R6/share/xcb/xfixes.xml
 ./usr/X11R6/share/xcb/xinerama.xml
 ./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xkb.xml
 ./usr/X11R6/share/xcb/xprint.xml
 ./usr/X11R6/share/xcb/xproto.xml
 ./usr/X11R6/share/xcb/xselinux.xml
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index a811a6ec1..a243f88c6 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -120,7 +120,7 @@
 ./usr/X11R6/lib/libX11-xcb.a
 ./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
-./usr/X11R6/lib/libX11.so.15.0
+./usr/X11R6/lib/libX11.so.15.1
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXau.so.9.0
 ./usr/X11R6/lib/libXaw.so.14.0
@@ -184,13 +184,13 @@
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
 ./usr/X11R6/lib/libxcb-dri2.a
-./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2.so.0.1
 ./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
 ./usr/X11R6/lib/libxcb-glx.a
-./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-glx.so.0.1
 ./usr/X11R6/lib/libxcb-glx_pic.a
 ./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
@@ -232,13 +232,13 @@
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
 ./usr/X11R6/lib/libxcb-sync.a
-./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.1
 ./usr/X11R6/lib/libxcb-sync_pic.a
 ./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.1.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.1
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -259,7 +259,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.2
+./usr/X11R6/lib/libxcb.so.2.3
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
@@ -389,6 +389,7 @@
 ./usr/X11R6/share/xcb/xfixes.xml
 ./usr/X11R6/share/xcb/xinerama.xml
 ./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xkb.xml
 ./usr/X11R6/share/xcb/xprint.xml
 ./usr/X11R6/share/xcb/xproto.xml
 ./usr/X11R6/share/xcb/xselinux.xml
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index 042e16590..6ff3b1030 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -112,7 +112,7 @@
 ./usr/X11R6/lib/libX11-xcb.a
 ./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
-./usr/X11R6/lib/libX11.so.15.0
+./usr/X11R6/lib/libX11.so.15.1
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXau.so.9.0
 ./usr/X11R6/lib/libXaw.so.14.0
@@ -173,13 +173,13 @@
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
 ./usr/X11R6/lib/libxcb-dri2.a
-./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2.so.0.1
 ./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
 ./usr/X11R6/lib/libxcb-glx.a
-./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-glx.so.0.1
 ./usr/X11R6/lib/libxcb-glx_pic.a
 ./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
@@ -221,13 +221,13 @@
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
 ./usr/X11R6/lib/libxcb-sync.a
-./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.1
 ./usr/X11R6/lib/libxcb-sync_pic.a
 ./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.1.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.1
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -248,7 +248,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.2
+./usr/X11R6/lib/libxcb.so.2.3
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
@@ -376,6 +376,7 @@
 ./usr/X11R6/share/xcb/xfixes.xml
 ./usr/X11R6/share/xcb/xinerama.xml
 ./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xkb.xml
 ./usr/X11R6/share/xcb/xprint.xml
 ./usr/X11R6/share/xcb/xproto.xml
 ./usr/X11R6/share/xcb/xselinux.xml
diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
index 94fabdb5c..d631e2a1f 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -95,7 +95,7 @@
 ./usr/X11R6/lib/libX11-xcb.a
 ./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
-./usr/X11R6/lib/libX11.so.15.0
+./usr/X11R6/lib/libX11.so.15.1
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXau.so.9.0
 ./usr/X11R6/lib/libXaw.so.14.0
@@ -154,13 +154,13 @@
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
 ./usr/X11R6/lib/libxcb-dri2.a
-./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2.so.0.1
 ./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
 ./usr/X11R6/lib/libxcb-glx.a
-./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-glx.so.0.1
 ./usr/X11R6/lib/libxcb-glx_pic.a
 ./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
@@ -202,13 +202,13 @@
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
 ./usr/X11R6/lib/libxcb-sync.a
-./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.1
 ./usr/X11R6/lib/libxcb-sync_pic.a
 ./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.1.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.1
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -229,7 +229,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.2
+./usr/X11R6/lib/libxcb.so.2.3
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
@@ -301,6 +301,7 @@
 ./usr/X11R6/share/xcb/xfixes.xml
 ./usr/X11R6/share/xcb/xinerama.xml
 ./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xkb.xml
 ./usr/X11R6/share/xcb/xprint.xml
 ./usr/X11R6/share/xcb/xproto.xml
 ./usr/X11R6/share/xcb/xselinux.xml
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index e76dffd32..2b4d88610 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -75,7 +75,7 @@
 ./usr/X11R6/lib/libX11-xcb.a
 ./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
-./usr/X11R6/lib/libX11.so.15.0
+./usr/X11R6/lib/libX11.so.15.1
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXau.so.9.0
 ./usr/X11R6/lib/libXaw.so.14.0
@@ -136,13 +136,13 @@
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
 ./usr/X11R6/lib/libxcb-dri2.a
-./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2.so.0.1
 ./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
 ./usr/X11R6/lib/libxcb-glx.a
-./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-glx.so.0.1
 ./usr/X11R6/lib/libxcb-glx_pic.a
 ./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
@@ -184,13 +184,13 @@
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
 ./usr/X11R6/lib/libxcb-sync.a
-./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.1
 ./usr/X11R6/lib/libxcb-sync_pic.a
 ./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.1.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.1
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -211,7 +211,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.2
+./usr/X11R6/lib/libxcb.so.2.3
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
@@ -283,6 +283,7 @@
 ./usr/X11R6/share/xcb/xfixes.xml
 ./usr/X11R6/share/xcb/xinerama.xml
 ./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xkb.xml
 ./usr/X11R6/share/xcb/xprint.xml
 ./usr/X11R6/share/xcb/xproto.xml
 ./usr/X11R6/share/xcb/xselinux.xml
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 657178dbe..0bfbed975 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -120,7 +120,7 @@
 ./usr/X11R6/lib/libX11-xcb.a
 ./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
-./usr/X11R6/lib/libX11.so.15.0
+./usr/X11R6/lib/libX11.so.15.1
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXau.so.9.0
 ./usr/X11R6/lib/libXaw.so.14.0
@@ -184,13 +184,13 @@
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
 ./usr/X11R6/lib/libxcb-dri2.a
-./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2.so.0.1
 ./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
 ./usr/X11R6/lib/libxcb-glx.a
-./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-glx.so.0.1
 ./usr/X11R6/lib/libxcb-glx_pic.a
 ./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
@@ -232,13 +232,13 @@
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
 ./usr/X11R6/lib/libxcb-sync.a
-./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.1
 ./usr/X11R6/lib/libxcb-sync_pic.a
 ./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.1.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.1
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -259,7 +259,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.2
+./usr/X11R6/lib/libxcb.so.2.3
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
@@ -389,6 +389,7 @@
 ./usr/X11R6/share/xcb/xfixes.xml
 ./usr/X11R6/share/xcb/xinerama.xml
 ./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xkb.xml
 ./usr/X11R6/share/xcb/xprint.xml
 ./usr/X11R6/share/xcb/xproto.xml
 ./usr/X11R6/share/xcb/xselinux.xml
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index 3931d2284..e1c430339 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -75,7 +75,7 @@
 ./usr/X11R6/lib/libX11-xcb.a
 ./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
-./usr/X11R6/lib/libX11.so.15.0
+./usr/X11R6/lib/libX11.so.15.1
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXau.so.9.0
 ./usr/X11R6/lib/libXaw.so.14.0
@@ -133,13 +133,13 @@
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
 ./usr/X11R6/lib/libxcb-dri2.a
-./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2.so.0.1
 ./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
 ./usr/X11R6/lib/libxcb-glx.a
-./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-glx.so.0.1
 ./usr/X11R6/lib/libxcb-glx_pic.a
 ./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
@@ -181,13 +181,13 @@
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
 ./usr/X11R6/lib/libxcb-sync.a
-./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.1
 ./usr/X11R6/lib/libxcb-sync_pic.a
 ./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.1.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.1
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -208,7 +208,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.2
+./usr/X11R6/lib/libxcb.so.2.3
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
@@ -333,6 +333,7 @@
 ./usr/X11R6/share/xcb/xfixes.xml
 ./usr/X11R6/share/xcb/xinerama.xml
 ./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xkb.xml
 ./usr/X11R6/share/xcb/xprint.xml
 ./usr/X11R6/share/xcb/xproto.xml
 ./usr/X11R6/share/xcb/xselinux.xml
diff --git a/distrib/sets/lists/xbase/md.loongson b/distrib/sets/lists/xbase/md.loongson
index a088d7a9d..aab1458ea 100644
--- a/distrib/sets/lists/xbase/md.loongson
+++ b/distrib/sets/lists/xbase/md.loongson
@@ -110,7 +110,7 @@
 ./usr/X11R6/lib/libX11-xcb.a
 ./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
-./usr/X11R6/lib/libX11.so.15.0
+./usr/X11R6/lib/libX11.so.15.1
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXau.so.9.0
 ./usr/X11R6/lib/libXaw.so.14.0
@@ -163,11 +163,11 @@
 ./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dri2.a
-./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2.so.0.1
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-glx.a
-./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-glx.so.0.1
 ./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
 ./usr/X11R6/lib/libxcb-image.a
@@ -195,11 +195,11 @@
 ./usr/X11R6/lib/libxcb-shm.a
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-sync.a
-./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.1
 ./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.1.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.1
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
 ./usr/X11R6/lib/libxcb-xinerama.a
@@ -213,7 +213,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.a
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.2
+./usr/X11R6/lib/libxcb.so.2.3
 ./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
@@ -340,6 +340,7 @@
 ./usr/X11R6/share/xcb/xfixes.xml
 ./usr/X11R6/share/xcb/xinerama.xml
 ./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xkb.xml
 ./usr/X11R6/share/xcb/xprint.xml
 ./usr/X11R6/share/xcb/xproto.xml
 ./usr/X11R6/share/xcb/xselinux.xml
diff --git a/distrib/sets/lists/xbase/md.mac68k b/distrib/sets/lists/xbase/md.mac68k
index 697f08ee6..3cc742558 100644
--- a/distrib/sets/lists/xbase/md.mac68k
+++ b/distrib/sets/lists/xbase/md.mac68k
@@ -104,7 +104,7 @@
 ./usr/X11R6/lib/libX11-xcb.a
 ./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
-./usr/X11R6/lib/libX11.so.15.0
+./usr/X11R6/lib/libX11.so.15.1
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXau.so.9.0
 ./usr/X11R6/lib/libXaw.so.14.0
@@ -163,13 +163,13 @@
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
 ./usr/X11R6/lib/libxcb-dri2.a
-./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2.so.0.1
 ./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
 ./usr/X11R6/lib/libxcb-glx.a
-./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-glx.so.0.1
 ./usr/X11R6/lib/libxcb-glx_pic.a
 ./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
@@ -211,13 +211,13 @@
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
 ./usr/X11R6/lib/libxcb-sync.a
-./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.1
 ./usr/X11R6/lib/libxcb-sync_pic.a
 ./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.1.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.1
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -238,7 +238,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.2
+./usr/X11R6/lib/libxcb.so.2.3
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
@@ -312,6 +312,7 @@
 ./usr/X11R6/share/xcb/xfixes.xml
 ./usr/X11R6/share/xcb/xinerama.xml
 ./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xkb.xml
 ./usr/X11R6/share/xcb/xprint.xml
 ./usr/X11R6/share/xcb/xproto.xml
 ./usr/X11R6/share/xcb/xselinux.xml
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index 431839ffb..ea43404f5 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -113,7 +113,7 @@
 ./usr/X11R6/lib/libX11-xcb.a
 ./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
-./usr/X11R6/lib/libX11.so.15.0
+./usr/X11R6/lib/libX11.so.15.1
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXau.so.9.0
 ./usr/X11R6/lib/libXaw.so.14.0
@@ -174,13 +174,13 @@
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
 ./usr/X11R6/lib/libxcb-dri2.a
-./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2.so.0.1
 ./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
 ./usr/X11R6/lib/libxcb-glx.a
-./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-glx.so.0.1
 ./usr/X11R6/lib/libxcb-glx_pic.a
 ./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
@@ -222,13 +222,13 @@
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
 ./usr/X11R6/lib/libxcb-sync.a
-./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.1
 ./usr/X11R6/lib/libxcb-sync_pic.a
 ./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.1.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.1
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -249,7 +249,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.2
+./usr/X11R6/lib/libxcb.so.2.3
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
@@ -378,6 +378,7 @@
 ./usr/X11R6/share/xcb/xfixes.xml
 ./usr/X11R6/share/xcb/xinerama.xml
 ./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xkb.xml
 ./usr/X11R6/share/xcb/xprint.xml
 ./usr/X11R6/share/xcb/xproto.xml
 ./usr/X11R6/share/xcb/xselinux.xml
diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
index 9c42ad024..5683a2ba1 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -76,7 +76,7 @@
 ./usr/X11R6/lib/libX11-xcb.a
 ./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
-./usr/X11R6/lib/libX11.so.15.0
+./usr/X11R6/lib/libX11.so.15.1
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXau.so.9.0
 ./usr/X11R6/lib/libXaw.so.14.0
@@ -137,13 +137,13 @@
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
 ./usr/X11R6/lib/libxcb-dri2.a
-./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2.so.0.1
 ./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
 ./usr/X11R6/lib/libxcb-glx.a
-./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-glx.so.0.1
 ./usr/X11R6/lib/libxcb-glx_pic.a
 ./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
@@ -185,13 +185,13 @@
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
 ./usr/X11R6/lib/libxcb-sync.a
-./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.1
 ./usr/X11R6/lib/libxcb-sync_pic.a
 ./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.1.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.1
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -212,7 +212,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.2
+./usr/X11R6/lib/libxcb.so.2.3
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/modules/dri/swrast_dri.so
@@ -288,6 +288,7 @@
 ./usr/X11R6/share/xcb/xfixes.xml
 ./usr/X11R6/share/xcb/xinerama.xml
 ./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xkb.xml
 ./usr/X11R6/share/xcb/xprint.xml
 ./usr/X11R6/share/xcb/xproto.xml
 ./usr/X11R6/share/xcb/xselinux.xml
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index 5bb329247..4716313b5 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -110,7 +110,7 @@
 ./usr/X11R6/lib/libX11-xcb.a
 ./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
-./usr/X11R6/lib/libX11.so.15.0
+./usr/X11R6/lib/libX11.so.15.1
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXau.so.9.0
 ./usr/X11R6/lib/libXaw.so.14.0
@@ -163,11 +163,11 @@
 ./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dri2.a
-./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2.so.0.1
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-glx.a
-./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-glx.so.0.1
 ./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
 ./usr/X11R6/lib/libxcb-image.a
@@ -195,11 +195,11 @@
 ./usr/X11R6/lib/libxcb-shm.a
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-sync.a
-./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.1
 ./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.1.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.1
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
 ./usr/X11R6/lib/libxcb-xinerama.a
@@ -213,7 +213,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.a
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.2
+./usr/X11R6/lib/libxcb.so.2.3
 ./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
@@ -340,6 +340,7 @@
 ./usr/X11R6/share/xcb/xfixes.xml
 ./usr/X11R6/share/xcb/xinerama.xml
 ./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xkb.xml
 ./usr/X11R6/share/xcb/xprint.xml
 ./usr/X11R6/share/xcb/xproto.xml
 ./usr/X11R6/share/xcb/xselinux.xml
diff --git a/distrib/sets/lists/xbase/md.socppc b/distrib/sets/lists/xbase/md.socppc
index abdfda3cd..e3b6ad128 100644
--- a/distrib/sets/lists/xbase/md.socppc
+++ b/distrib/sets/lists/xbase/md.socppc
@@ -112,7 +112,7 @@
 ./usr/X11R6/lib/libX11-xcb.a
 ./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
-./usr/X11R6/lib/libX11.so.15.0
+./usr/X11R6/lib/libX11.so.15.1
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXau.so.9.0
 ./usr/X11R6/lib/libXaw.so.14.0
@@ -173,13 +173,13 @@
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
 ./usr/X11R6/lib/libxcb-dri2.a
-./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2.so.0.1
 ./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
 ./usr/X11R6/lib/libxcb-glx.a
-./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-glx.so.0.1
 ./usr/X11R6/lib/libxcb-glx_pic.a
 ./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
@@ -221,13 +221,13 @@
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
 ./usr/X11R6/lib/libxcb-sync.a
-./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.1
 ./usr/X11R6/lib/libxcb-sync_pic.a
 ./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.1.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.1
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -248,7 +248,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.2
+./usr/X11R6/lib/libxcb.so.2.3
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
@@ -376,6 +376,7 @@
 ./usr/X11R6/share/xcb/xfixes.xml
 ./usr/X11R6/share/xcb/xinerama.xml
 ./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xkb.xml
 ./usr/X11R6/share/xcb/xprint.xml
 ./usr/X11R6/share/xcb/xproto.xml
 ./usr/X11R6/share/xcb/xselinux.xml
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index abdfda3cd..e3b6ad128 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -112,7 +112,7 @@
 ./usr/X11R6/lib/libX11-xcb.a
 ./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
-./usr/X11R6/lib/libX11.so.15.0
+./usr/X11R6/lib/libX11.so.15.1
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXau.so.9.0
 ./usr/X11R6/lib/libXaw.so.14.0
@@ -173,13 +173,13 @@
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
 ./usr/X11R6/lib/libxcb-dri2.a
-./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2.so.0.1
 ./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
 ./usr/X11R6/lib/libxcb-glx.a
-./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-glx.so.0.1
 ./usr/X11R6/lib/libxcb-glx_pic.a
 ./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
@@ -221,13 +221,13 @@
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
 ./usr/X11R6/lib/libxcb-sync.a
-./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.1
 ./usr/X11R6/lib/libxcb-sync_pic.a
 ./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.1.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.1
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -248,7 +248,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.2
+./usr/X11R6/lib/libxcb.so.2.3
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
@@ -376,6 +376,7 @@
 ./usr/X11R6/share/xcb/xfixes.xml
 ./usr/X11R6/share/xcb/xinerama.xml
 ./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xkb.xml
 ./usr/X11R6/share/xcb/xprint.xml
 ./usr/X11R6/share/xcb/xproto.xml
 ./usr/X11R6/share/xcb/xselinux.xml
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index 998025cc0..bdbd97972 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -113,7 +113,7 @@
 ./usr/X11R6/lib/libX11-xcb.a
 ./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
-./usr/X11R6/lib/libX11.so.15.0
+./usr/X11R6/lib/libX11.so.15.1
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXau.so.9.0
 ./usr/X11R6/lib/libXaw.so.14.0
@@ -174,13 +174,13 @@
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
 ./usr/X11R6/lib/libxcb-dri2.a
-./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2.so.0.1
 ./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
 ./usr/X11R6/lib/libxcb-glx.a
-./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-glx.so.0.1
 ./usr/X11R6/lib/libxcb-glx_pic.a
 ./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
@@ -222,13 +222,13 @@
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
 ./usr/X11R6/lib/libxcb-sync.a
-./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.1
 ./usr/X11R6/lib/libxcb-sync_pic.a
 ./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.1.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.1
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -249,7 +249,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.2
+./usr/X11R6/lib/libxcb.so.2.3
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
@@ -378,6 +378,7 @@
 ./usr/X11R6/share/xcb/xfixes.xml
 ./usr/X11R6/share/xcb/xinerama.xml
 ./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xkb.xml
 ./usr/X11R6/share/xcb/xprint.xml
 ./usr/X11R6/share/xcb/xproto.xml
 ./usr/X11R6/share/xcb/xselinux.xml
diff --git a/distrib/sets/lists/xbase/md.vax b/distrib/sets/lists/xbase/md.vax
index b129f43bb..f6f802f02 100644
--- a/distrib/sets/lists/xbase/md.vax
+++ b/distrib/sets/lists/xbase/md.vax
@@ -182,6 +182,7 @@
 ./usr/X11R6/share/xcb/xfixes.xml
 ./usr/X11R6/share/xcb/xinerama.xml
 ./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xkb.xml
 ./usr/X11R6/share/xcb/xprint.xml
 ./usr/X11R6/share/xcb/xproto.xml
 ./usr/X11R6/share/xcb/xselinux.xml
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index 042e16590..6ff3b1030 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -112,7 +112,7 @@
 ./usr/X11R6/lib/libX11-xcb.a
 ./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
-./usr/X11R6/lib/libX11.so.15.0
+./usr/X11R6/lib/libX11.so.15.1
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXau.so.9.0
 ./usr/X11R6/lib/libXaw.so.14.0
@@ -173,13 +173,13 @@
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
 ./usr/X11R6/lib/libxcb-dri2.a
-./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2.so.0.1
 ./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
 ./usr/X11R6/lib/libxcb-glx.a
-./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-glx.so.0.1
 ./usr/X11R6/lib/libxcb-glx_pic.a
 ./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
@@ -221,13 +221,13 @@
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
 ./usr/X11R6/lib/libxcb-sync.a
-./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.1
 ./usr/X11R6/lib/libxcb-sync_pic.a
 ./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.1.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.1
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -248,7 +248,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.2
+./usr/X11R6/lib/libxcb.so.2.3
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
@@ -376,6 +376,7 @@
 ./usr/X11R6/share/xcb/xfixes.xml
 ./usr/X11R6/share/xcb/xinerama.xml
 ./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xkb.xml
 ./usr/X11R6/share/xcb/xprint.xml
 ./usr/X11R6/share/xcb/xproto.xml
 ./usr/X11R6/share/xcb/xselinux.xml
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index 9b4f46bb0..32a6c3206 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -3385,7 +3385,6 @@
 ./usr/X11R6/share/doc/libSM/SMlib.xml
 ./usr/X11R6/share/doc/libSM/xsmp.xml
 ./usr/X11R6/share/doc/libX11
-./usr/X11R6/share/doc/libX11/Compose
 ./usr/X11R6/share/doc/libXaw
 ./usr/X11R6/share/doc/libXaw/AsciiSink.xml
 ./usr/X11R6/share/doc/libXaw/AsciiSource.xml