mesa: Changes to 'ubuntu'
debian/changelog | 12 +++++++++---
debian/libegl1-mesa-dev.install.linux.in | 2 +-
2 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit af071f7eb2cce284cbd65e64c4f81bdd00e0c260
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Fri Feb 24 13:43:33 2012 +1100
Fix libEGL.so symlink
diff --git a/debian/changelog b/debian/changelog
index 8c4ae49..2a30ce1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+mesa (8.0.1-0ubuntu2) precise; urgency=low
+
+ * debian/libegl1-mesa-dev.install.linux.in:
+ * debian/libegl1-mesa-dev.install.in:
+ - Reinstate handling of libEGL.so symlink accidentally dropped in merge;
+ we install this in $libdir/mesa-egl so proprietary drivers may divert
+ this via alternates.
+ Fixes libqt-x11 FTBFS (and anything else that tried to build against
+ EGL).
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Fri, 24 Feb 2012 13:43:12 +1100
+
mesa (8.0.1-0ubuntu1) precise; urgency=low
* Merge from Debian experimental.
diff --git a/debian/libegl1-mesa-dev.install.in b/debian/libegl1-mesa-dev.install.in
index 51abf94..a519271 100644
--- a/debian/libegl1-mesa-dev.install.in
+++ b/debian/libegl1-mesa-dev.install.in
@@ -1,5 +1,5 @@
# This file gets tweaked in an os-specific fashion (see libegl1-mesa-dev.install.linux.in)
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so usr/lib/${DEB_HOST_MULTIARCH}
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so usr/lib/${DEB_HOST_MULTIARCH}/mesa-egl
dri/usr/include/EGL usr/include
dri/usr/include/KHR usr/include
dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/egl.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
diff --git a/debian/libegl1-mesa-dev.install.linux.in b/debian/libegl1-mesa-dev.install.linux.in
index 13565b7..e67025b 100644
--- a/debian/libegl1-mesa-dev.install.linux.in
+++ b/debian/libegl1-mesa-dev.install.linux.in
@@ -1,5 +1,5 @@
# OS-independent part (from libegl1-mesa-dev.install.in):
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so usr/lib/${DEB_HOST_MULTIARCH}
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so usr/lib/${DEB_HOST_MULTIARCH}/mesa-egl
dri/usr/include/EGL usr/include
dri/usr/include/KHR usr/include
dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/egl.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
Reply to: