debian/changelog | 8 ++++++++
debian/rules | 13 +++++++++++++
debian/xserver-xorg-core.links | 1 +
debian/xserver-xorg-core.postinst.in | 7 +++++++
debian/xserver-xorg-core.prerm.in | 20 ++++++++++++++++++++
5 files changed, 49 insertions(+)
New commits:
commit 5f14c395e39fa92f36d0637ddd3a4874e073c0bd
Author: Alberto Milone <alberto.mil...@canonical.com>
Date: Mon Jan 4 12:09:51 2010 +0100
Update changelog.
diff --git a/debian/changelog b/debian/changelog
index 8c71a2e..ee21df3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.7.3.901-1ubuntu5) lucid; urgency=low
+
+ * Use alternatives to make it easier to switch between X11 and 3rd
+ party modules.
+ * Add link to /usr/lib/XvMCConfig and use it for alternatives.
+
+ -- Alberto Milone <alberto.mil...@canonical.com> Mon, 04 Jan 2010 12:08:17
+0100
+
xorg-server (2:1.7.3.901-1ubuntu4) lucid; urgency=low
* xvfb: Depend again on xauth. Depend on x11-xkb-utils. LP: #500102.
commit ce9c6f194c86939ae0c35c83cf7979149a9fe2c2
Author: Alberto Milone <alberto.mil...@canonical.com>
Date: Fri Jan 1 17:52:29 2010 +0100
Use alternatives to make it easier to switch between X11 and 3rd party
modules.
diff --git a/debian/rules b/debian/rules
index abd059b..eb631e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -221,6 +221,19 @@ binary-arch: build install
$(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg/serverminver
$(INSTALL) -m 755 -d
debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core
$(INSTALL) -m 755 debian/xserver-xorg-core.bug.script
debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core/script
+
+ # Create an empty ld.so.conf
+ $(INSTALL) -d $(CURDIR)/debian/xserver-xorg-core/usr/lib/standard-x11
+ echo "# This file is knowingly empty since the libraries are in the
standard\n\
+ # search path. Please do not remove this file." \
+ > $(CURDIR)/debian/xserver-xorg-core/usr/lib/standard-x11/ld.so.conf
+
+ # 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/
+ mv
$(CURDIR)/debian/xserver-xorg-core/usr/lib/xorg/modules/extensions/libglx.so \
+
$(CURDIR)/debian/xserver-xorg-core/usr/lib/xorg/modules/extensions/standard/
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.links b/debian/xserver-xorg-core.links
new file mode 100644
index 0000000..22e8730
--- /dev/null
+++ b/debian/xserver-xorg-core.links
@@ -0,0 +1 @@
+/usr/lib/XvMCConfig /usr/lib/XvMCConfig-alt
diff --git a/debian/xserver-xorg-core.postinst.in
b/debian/xserver-xorg-core.postinst.in
index a8cb2a2..88024f8 100644
--- a/debian/xserver-xorg-core.postinst.in
+++ b/debian/xserver-xorg-core.postinst.in
@@ -13,6 +13,13 @@ case "$1" in
remove_conffile_commit /etc/X11/xserver/SecurityPolicy
rmdir /etc/X11/xserver 2>/dev/null || true
fi
+
+ # 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 /etc/X11/XvMCConfig xvmcconfig /usr/lib/XvMCConfig-alt
esac
#DEBHELPER#
diff --git a/debian/xserver-xorg-core.prerm.in
b/debian/xserver-xorg-core.prerm.in
new file mode 100644
index 0000000..db68169
--- /dev/null
+++ b/debian/xserver-xorg-core.prerm.in
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+THIS_PACKAGE=xserver-xorg-core
+THIS_SCRIPT=prerm
+
+#INCLUDE_SHELL_LIB#
+
+case "$1" in
+remove|upgrade)
+ if [ ! -f /usr/lib/standard-x11/standard.conf ]; then
+ update-alternatives --remove gl_conf /usr/lib/standard-x11/standard.conf
+ fi
+ ;;
+esac
+
+#DEBHELPER#
+
+# vim:set ai et sts=2 sw=2 tw=0:
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
