debian/changelog | 21 +++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 17 +----------------
debian/xserver-xorg-core.links | 1 -
debian/xserver-xorg-core.postinst.in | 7 -------
debian/xserver-xorg-core.prerm.in | 20 --------------------
6 files changed, 23 insertions(+), 44 deletions(-)
New commits:
commit d6216c651bac42e822637de6e170307a3dba28d6
Author: Alberto Milone <alberto.mil...@canonical.com>
Date: Mon Jan 11 14:59:18 2010 +0100
* debian/patches/191-Xorg-add-an-extra-module-path.patch:
- Patch from Mandriva to allow the use of an extra-modules-dir so that
the modules installed in this dir will override the ones in the
default directory.
* debian/rules:
- Remove alternatives stuff introduced in a previous upload.
- Configure with --with-extra-module-dir="/usr/lib/xorg/extra-modules".
- Do not install libglx.so and libdri.so in a different place any more.
- Do not install ld.so.conf file any more. Mesa will deal with this.
* debian/xserver-xorg-core.links:
- Do not create link to /usr/lib/xvmcconfig-standard/XvMCConfig.
- Remove links file.
* debian/xserver-xorg-core.postinst.in:
- Do not install an alternative any more. Mesa will deal with this.
* debian/xserver-xorg-core.prerm.in:
- Remove file.
diff --git a/debian/changelog b/debian/changelog
index 46f9863..78438c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+xorg-server (2:1.7.3.902-1ubuntu4) lucid; urgency=low
+
+ * debian/patches/191-Xorg-add-an-extra-module-path.patch:
+ - Patch from Mandriva to allow the use of an extra-modules-dir so that
+ the modules installed in this dir will override the ones in the
+ default directory.
+ * debian/rules:
+ - Remove alternatives stuff introduced in a previous upload.
+ - Configure with --with-extra-module-dir="/usr/lib/xorg/extra-modules".
+ - Do not install libglx.so and libdri.so in a different place any more.
+ - Do not install ld.so.conf file any more. Mesa will deal with this.
+ * debian/xserver-xorg-core.links:
+ - Do not create link to /usr/lib/xvmcconfig-standard/XvMCConfig.
+ - Remove links file.
+ * debian/xserver-xorg-core.postinst.in:
+ - Do not install an alternative any more. Mesa will deal with this.
+ * debian/xserver-xorg-core.prerm.in:
+ - Remove file.
+
+ -- Alberto Milone <alberto.mil...@canonical.com> Mon, 11 Jan 2010 14:48:35
+0100
+
xorg-server (2:1.7.3.902-1ubuntu3) lucid; urgency=low
[ Julien Cristau ]
diff --git a/debian/patches/series b/debian/patches/series
index 14bfd24..641e603 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -32,3 +32,4 @@
188_default_primary_to_first_busid.patch
189_xserver_1.5.0_bg_none_root.patch
190_cache-xkbcomp_output_for_fast_start_up.patch
+191-Xorg-add-an-extra-module-path.patch
diff --git a/debian/rules b/debian/rules
index b9ef54b..c0ddca0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -74,6 +74,7 @@ confflags += \
--disable-debug \
$(config_tests) \
--with-int10=x86emu \
+ --with-extra-module-dir="/usr/lib/xorg/extra-modules" \
--with-os-vendor="$(VENDOR)" \
--with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION)
($(BUILDER))" \
--with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType,built-ins"
\
@@ -217,22 +218,6 @@ 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 ld.so.conf which says where to find libGL from Mesa
- $(INSTALL) -d $(CURDIR)/debian/xserver-xorg-core/usr/lib/standard-x11
- 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 \
- $(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/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.links b/debian/xserver-xorg-core.links
deleted file mode 100644
index 22e8730..0000000
--- a/debian/xserver-xorg-core.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/XvMCConfig /usr/lib/XvMCConfig-alt
diff --git a/debian/xserver-xorg-core.postinst.in
b/debian/xserver-xorg-core.postinst.in
index e16e2c8..102d919 100644
--- a/debian/xserver-xorg-core.postinst.in
+++ b/debian/xserver-xorg-core.postinst.in
@@ -14,13 +14,6 @@ case "$1" in
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/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
-
if dpkg --compare-versions "$2" lt 2:1.7.3.901-2; then
if [ `uname -s` = "Linux" ]; then
udevadm trigger --subsystem-match=input --action=change
diff --git a/debian/xserver-xorg-core.prerm.in
b/debian/xserver-xorg-core.prerm.in
deleted file mode 100644
index db68169..0000000
--- a/debian/xserver-xorg-core.prerm.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/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
