debian/rules | 4 ++-- debian/xserver-xorg-core.postinst.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 32d219657bcd6adeed41eb139690dbdf74bca625 Author: Alberto Milone <[email protected]> Date: Thu Jan 7 16:37:03 2010 +0100 Install libglx.so and libdri.so in /usr/lib/standard-x11 as X seems to prefer the file in /usr/lib/xorg/modules/extensions/standard/ over links in /usr/lib/xorg/modules/extensions/. diff --git a/debian/rules b/debian/rules index eb631e3..d65f150 100755 --- a/debian/rules +++ b/debian/rules @@ -231,9 +231,9 @@ binary-arch: build install # Keep the following files separate from other extensions so that we can use alternatives $(INSTALL) -d $(CURDIR)/debian/xserver-xorg-core/usr/lib/xorg/modules/extensions/standard mv $(CURDIR)/debian/xserver-xorg-core/usr/lib/xorg/modules/extensions/libdri.so \ - $(CURDIR)/debian/xserver-xorg-core/usr/lib/xorg/modules/extensions/standard/ + $(CURDIR)/debian/xserver-xorg-core/usr/lib/standard-x11/ mv $(CURDIR)/debian/xserver-xorg-core/usr/lib/xorg/modules/extensions/libglx.so \ - $(CURDIR)/debian/xserver-xorg-core/usr/lib/xorg/modules/extensions/standard/ + $(CURDIR)/debian/xserver-xorg-core/usr/lib/standard-x11/ ifeq ($(DEB_HOST_ARCH_OS), linux) install -d debian/xserver-xorg-core/lib/udev/rules.d install -m 644 debian/local/64-xorg-xkb.rules debian/xserver-xorg-core/lib/udev/rules.d diff --git a/debian/xserver-xorg-core.postinst.in b/debian/xserver-xorg-core.postinst.in index 3e31fbb..0df4640 100644 --- a/debian/xserver-xorg-core.postinst.in +++ b/debian/xserver-xorg-core.postinst.in @@ -17,8 +17,8 @@ case "$1" in # Use alternatives to make it easier to switch between X11 and 3rd party modules update-alternatives \ --install /etc/ld.so.conf.d/GL.conf gl_conf /usr/lib/standard-x11/ld.so.conf 500 \ - --slave /usr/lib/xorg/modules/extensions/libdri.so libdri.so /usr/lib/xorg/modules/extensions/standard/libdri.so \ - --slave /usr/lib/xorg/modules/extensions/libglx.so libglx.so /usr/lib/xorg/modules/extensions/standard/libglx.so \ + --slave /usr/lib/xorg/modules/extensions/libdri.so libdri.so /usr/lib/standard-x11/libdri.so \ + --slave /usr/lib/xorg/modules/extensions/libglx.so libglx.so /usr/lib/standard-x11/libglx.so \ --slave /usr/lib/XvMCConfig xvmcconfig /usr/lib/xvmcconfig-standard/XvMCConfig esac -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
