xorg-server: Changes to 'ubuntu'
debian/changelog | 8 ++++++++
debian/rules | 10 +++++++---
2 files changed, 15 insertions(+), 3 deletions(-)
New commits:
commit ec1960838e2acfc6c09990db77d5d15c57c13eb6
Author: Alberto Milone <alberto.milone@canonical.com>
Date: Fri Jan 8 18:58:47 2010 +0100
* debian/rules:
- Make sure that /usr/lib/standard-x11/ld.so.conf points to
the libraries provided by mesa.
diff --git a/debian/changelog b/debian/changelog
index cf545df..7d40ede 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.7.3.902-1ubuntu2) lucid; urgency=low
+
+ * debian/rules:
+ - Make sure that /usr/lib/standard-x11/ld.so.conf points to
+ the libraries provided by mesa.
+
+ -- Alberto Milone <alberto.milone@canonical.com> Fri, 08 Jan 2010 18:55:52 +0100
+
xorg-server (2:1.7.3.902-1ubuntu1) lucid; urgency=low
[ Timo Aaltonen ]
diff --git a/debian/rules b/debian/rules
index 31193e5..b9ef54b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -217,12 +217,16 @@ binary-arch: build install
$(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
+ # Create an ld.so.conf which says where to find libGL from Mesa
$(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." \
+ echo "/usr/lib/mesa" \
> $(CURDIR)/debian/xserver-xorg-core/usr/lib/standard-x11/ld.so.conf
+ifeq ($(DEB_BUILD_ARCH),amd64)
+ # Add the path to 32bit libGL from Mesa (on 64 bit)
+ echo "/usr/lib32/mesa" \
+ >> $(CURDIR)/debian/xserver-xorg-core/usr/lib/standard-x11/ld.so.conf
+endif
# 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 \
Reply to: