debian/changelog                             |    7 +++++++
 debian/control                               |    1 +
 debian/libegl1-mesa-drivers.install.linux.in |    4 ++--
 debian/libegl1-mesa.install.in               |    2 --
 4 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 65d6ef0f61a93c5b2b92ab576e5fbf3db28fb627
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date:   Tue Mar 13 15:21:58 2012 +0200

    Ship libwayland-egl.so.* only in libegl1-mesa-drivers, replace the old 
libegl-mesa.

diff --git a/debian/changelog b/debian/changelog
index 2a30ce1..77ecef7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (8.0.1-0ubuntu3) UNRELEASED; urgency=low
+
+  * Ship libwayland-egl.so.* only in libegl1-mesa-drivers, replace
+    the old libegl-mesa.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com>  Tue, 13 Mar 2012 15:20:55 +0200
+
 mesa (8.0.1-0ubuntu2) precise; urgency=low
 
   * debian/libegl1-mesa-dev.install.linux.in:
diff --git a/debian/control b/debian/control
index b081d9c..3b77dda 100644
--- a/debian/control
+++ b/debian/control
@@ -283,6 +283,7 @@ Depends:
  libglapi-mesa (= ${binary:Version}),
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
+Replaces: libegl1-mesa (<= 8.0.1-0ubuntu2)
 Description: free implementation of the EGL API -- hardware drivers
  This package contains the EGL native platform graphics interface library.
  EGL provides a platform-agnostic mechanism for creating rendering surfaces
diff --git a/debian/libegl1-mesa-drivers.install.linux.in 
b/debian/libegl1-mesa-drivers.install.linux.in
index 5001e0a..d370557 100644
--- a/debian/libegl1-mesa-drivers.install.linux.in
+++ b/debian/libegl1-mesa-drivers.install.linux.in
@@ -2,5 +2,5 @@
 dri/usr/lib/${DEB_HOST_MULTIARCH}/egl/egl_gallium.so 
usr/lib/${DEB_HOST_MULTIARCH}/egl
 
 # Wayland support, only on Linux:
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1 
usr/lib/${DEB_HOST_MULTIARCH}
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1.0 
usr/lib/${DEB_HOST_MULTIARCH}
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1 
usr/lib/${DEB_HOST_MULTIARCH}/mesa-egl
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1.0 
usr/lib/${DEB_HOST_MULTIARCH}/mesa-egl
diff --git a/debian/libegl1-mesa.install.in b/debian/libegl1-mesa.install.in
index 527bfd3..9510445 100644
--- a/debian/libegl1-mesa.install.in
+++ b/debian/libegl1-mesa.install.in
@@ -1,3 +1 @@
 dri/usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so.1* 
usr/lib/${DEB_HOST_MULTIARCH}/mesa-egl
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1 
usr/lib/${DEB_HOST_MULTIARCH}/mesa-egl
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1.0 
usr/lib/${DEB_HOST_MULTIARCH}/mesa-egl


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1s7rqi-0006ke...@vasks.debian.org

Reply via email to