Package: libxklavier10 Version: 2.1-1 Severity: normal Tags: patch Hi,
xorg 7.0 is available in experimental and will be uploaded very soon into unstable. XKB files will be provided by the xkb-data package, and will be moved into /usr/share/X11/xkb. The attached patch should make libxklavier work with this release. Denis
diff -ur libxklavier-2.1.orig/debian/rules libxklavier-2.1/debian/rules --- libxklavier-2.1.orig/debian/rules 2006-03-23 23:46:40.000000000 +0100 +++ libxklavier-2.1/debian/rules 2006-03-23 23:47:51.000000000 +0100 @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/class/gnome.mk -DEB_CONFIGURE_EXTRA_FLAGS := --with-xkb-base=/etc/X11/xkb --enable-doxygen +DEB_CONFIGURE_EXTRA_FLAGS := --with-xkb-base=/usr/share/X11/xkb --enable-doxygen clean:: -make -C doc/html maintainer-clean diff -ur libxklavier-2.1.orig/libxklavier/xklavier_config_xkb.c libxklavier-2.1/libxklavier/xklavier_config_xkb.c --- libxklavier-2.1.orig/libxklavier/xklavier_config_xkb.c 2005-12-03 14:26:58.000000000 +0100 +++ libxklavier-2.1/libxklavier/xklavier_config_xkb.c 2006-03-24 22:04:58.000000000 +0100 @@ -22,9 +22,9 @@ #endif /* For "bad" X servers we hold our own copy */ -#define XML_CFG_FALLBACK_PATH ( DATA_DIR "/xfree86.xml" ) +#define XML_CFG_FALLBACK_PATH ( DATA_DIR "/xorg.xml" ) -#define XKBCOMP ( XKB_BASE "/xkbcomp" ) +#define XKBCOMP "xkbcomp" #define XK_XKB_KEYS #include <X11/keysymdef.h>
