Module Name: src
Committed By: martin
Date: Wed Sep 9 09:14:20 UTC 2015
Modified Files:
src/distrib/sets/lists/xbase [netbsd-7]: shl.mi
src/external/mit/xorg/lib/libxcb/xkb [netbsd-7]: Makefile
Log Message:
Pull up following revision(s) (requested by mrg in ticket #974):
distrib/sets/lists/xbase/shl.mi: revision 1.61
external/mit/xorg/lib/libxcb/xkb/Makefile: revision 1.2
libxcb-xkb.so has the wrong version, fix it. patch as provided by
Yorick Hardy in PR 49873.
To generate a diff of this commit:
cvs rdiff -u -r1.55.4.3 -r1.55.4.4 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.1 -r1.1.6.1 src/external/mit/xorg/lib/libxcb/xkb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.55.4.3 src/distrib/sets/lists/xbase/shl.mi:1.55.4.4
--- src/distrib/sets/lists/xbase/shl.mi:1.55.4.3 Thu Mar 26 10:01:03 2015
+++ src/distrib/sets/lists/xbase/shl.mi Wed Sep 9 09:14:20 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.55.4.3 2015/03/26 10:01:03 martin Exp $
+# $NetBSD: shl.mi,v 1.55.4.4 2015/09/09 09:14:20 martin Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -421,8 +421,8 @@
./usr/X11R7/lib/libxcb-xinerama.so.0 -unknown- xorg
./usr/X11R7/lib/libxcb-xinerama.so.0.1 -unknown- xorg
./usr/X11R7/lib/libxcb-xkb.so -unknown- xorg
-./usr/X11R7/lib/libxcb-xkb.so.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-xkb.so.0.1 -unknown- xorg
+./usr/X11R7/lib/libxcb-xkb.so.1 -unknown- xorg
+./usr/X11R7/lib/libxcb-xkb.so.1.0 -unknown- xorg
./usr/X11R7/lib/libxcb-xtest.so -unknown- xorg
./usr/X11R7/lib/libxcb-xtest.so.0 -unknown- xorg
./usr/X11R7/lib/libxcb-xtest.so.0.1 -unknown- xorg
Index: src/external/mit/xorg/lib/libxcb/xkb/Makefile
diff -u src/external/mit/xorg/lib/libxcb/xkb/Makefile:1.1 src/external/mit/xorg/lib/libxcb/xkb/Makefile:1.1.6.1
--- src/external/mit/xorg/lib/libxcb/xkb/Makefile:1.1 Mon Mar 17 07:25:35 2014
+++ src/external/mit/xorg/lib/libxcb/xkb/Makefile Wed Sep 9 09:14:20 2015
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2014/03/17 07:25:35 mrg Exp $
+# $NetBSD: Makefile,v 1.1.6.1 2015/09/09 09:14:20 martin Exp $
XCBEXT= xkb
-.include "../xcb.mk"
-
SHLIB_MAJOR= 1
SHLIB_MINOR= 0
+
+.include "../xcb.mk"
