debian/changelog | 9 +++++++-- debian/rules | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-)
New commits: commit 06af3b7fbfd23193ddb1dbc24b96a0893ddc6e09 Author: Christopher James Halse Rogers <[email protected]> Date: Fri Jul 8 13:39:37 2011 +1000 Release to oneiric diff --git a/debian/changelog b/debian/changelog index a90356c..04d3087 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.10.2.902-1ubuntu2) UNRELEASED; urgency=low +xorg-server (2:1.10.2.902-1ubuntu2) oneiric; urgency=low [ Bryce Harrington ] * rules: patch needs to depend on stampdir, else it doesn't get created, commit ec4c89d33901f8801fe5226ffaf9700805b71bf2 Author: Christopher James Halse Rogers <[email protected]> Date: Fri Jul 8 13:18:51 2011 +1000 Search also search for GLX modules in the multiarch path. Fixes the proprietary drivers after a mesa upgrade moves extra-modules to the multiarch path diff --git a/debian/changelog b/debian/changelog index ec089d5..a90356c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,12 @@ xorg-server (2:1.10.2.902-1ubuntu2) UNRELEASED; urgency=low * Fix event handling when neither X nor Y coordinates are set (LP: #806256) - Added 504_fix_no_coords.patch - -- Chase Douglas <[email protected]> Thu, 07 Jul 2011 11:49:02 -0700 + [ Christopher James Halse Rogers ] + * rules: Add both /usr/lib/xorg/extra-modules and + /usr/lib/$MULTIARCH/xorg/extra-modules for extra modules. + Fixes GLX for the proprietary drivers after a mesa upgrade (LP: #807209) + + -- Christopher James Halse Rogers <[email protected]> Fri, 08 Jul 2011 13:16:59 +1000 xorg-server (2:1.10.2.902-1ubuntu1) oneiric; urgency=low diff --git a/debian/rules b/debian/rules index 402d050..e30caa0 100755 --- a/debian/rules +++ b/debian/rules @@ -29,6 +29,7 @@ endif CPPFLAGS += -DPRE_RELEASE=0 +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) @@ -99,7 +100,7 @@ confflags += \ --disable-debug \ $(config_tests) \ --with-int10=x86emu \ - --with-extra-module-dir="/usr/lib/xorg/extra-modules" \ + --with-extra-module-dir="/usr/lib/${DEB_HOST_MULTIARCH}/xorg/extra-modules,/usr/lib/xorg/extra-modules" \ --with-os-vendor="$(VENDOR)" \ --with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION) ($(BUILDER))" \ --with-xkb-path=/usr/share/X11/xkb \ -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
