debian/control | 3 ++- debian/rules | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
New commits: commit 23b3623c40629a44d6b3e91a9b58ee0121b66704 Author: Steve Langasek <[email protected]> Date: Sun Mar 27 16:30:54 2011 -0700 multiarch DRI path compatibility Set a DRI search path that includes both multiarch and pre-multiarch directories, and have the new libgl1-mesa-dri* Break: the old libgl1-mesa-glx and xserver-xorg-core that only know to look in the old directory. (Using projected version numbers for the versions of these packages that will enter the archive with multiarch support; fix this with the real version numbers once known) diff --git a/debian/control b/debian/control index 0be7bbd..605f4fe 100644 --- a/debian/control +++ b/debian/control @@ -454,7 +454,7 @@ Depends: Suggests: libglide3 Conflicts: xlibmesa-dri (<< 1:7.0.0) Replaces: xlibmesa-dri (<< 1:7.0.0) -Breaks: xserver-xorg-core (<< 2:1.5), libgl1-mesa-glx (<< 7.2) +Breaks: xserver-xorg-core (<< 2:1.9.99.903-3), libgl1-mesa-glx (<< 7.10-6) Multi-Arch: same Description: A free implementation of the OpenGL API -- DRI modules This version of Mesa provides GLX and DRI capabilities: it is capable of @@ -496,6 +496,7 @@ Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends}, +Breaks: xserver-xorg-core (<< 2:1.9.99.903-3), libgl1-mesa-glx (<< 7.10-6) Multi-Arch: same Description: A free implementation of the OpenGL API -- Extra DRI modules This version of Mesa provides GLX and DRI capabilities: it is capable of diff --git a/debian/rules b/debian/rules index dde256d..fbb1e6e 100755 --- a/debian/rules +++ b/debian/rules @@ -102,7 +102,7 @@ confflags-dri = \ --with-driver=dri \ --with-dri-drivers="$(DRI_DRIVERS)" \ --with-dri-driverdir=/usr/lib/$(DEB_HOST_MULTIARCH)/dri \ - --with-dri-searchpath='\$$$${ORIGIN}/dri' \ + --with-dri-searchpath=/usr/lib/$(DEB_HOST_MULTIARCH)/dri:/usr/lib/dri \ --enable-glx-tls \ $(confflags_DIRECT_RENDERING) \ $(confflags_EGL) \ -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
