summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Joachim <svenjoac@gmx.de>2014-03-05 21:27:08 +0100
committerAndreas Boll <andreas.boll.dev@gmail.com>2014-03-19 22:02:23 +0100
commit6d4e41f6701ce600d260743ca6697dad3414981e (patch)
tree76da6363f09e7b7feb3d78c1f6b43c9234011b74
parent834aba4f446414025d5d4fff6b678c6d0a8f470a (diff)
downloadmesa-6d4e41f6701ce600d260743ca6697dad3414981e.tar.gz
Drop dependency of libegl1-mesa-drivers on libgl1-mesa-dri
This was only necessary due to egl_gallium.so being linked against libllvmradeon, and there is no shared llvmradeon library anymore. Conflicts: debian/changelog debian/control
-rw-r--r--debian/changelog4
-rw-r--r--debian/control2
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index e11ae3f7d1..fece1ca546 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
mesa (10.1.0-3) UNRELEASED; urgency=medium
+ [ Andreas Boll ]
* Build OpenCL only on architectures where we have LLVM enabled.
* Actually enable radeonsi on kfreebsd.
+ [ Sven Joachim ]
+ * Drop dependency of libegl1-mesa-drivers on libgl1-mesa-dri again.
+
-- Andreas Boll <andreas.boll.dev@gmail.com> Wed, 19 Mar 2014 21:23:46 +0100
mesa (10.1.0-2) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 35f3ed037f..7d78cb924a 100644
--- a/debian/control
+++ b/debian/control
@@ -323,8 +323,6 @@ Depends:
libegl1-mesa (= ${binary:Version}),
libglapi-mesa (= ${binary:Version}),
libwayland-egl1-mesa (= ${binary:Version}),
-# for libllvmradeon
- libgl1-mesa-dri (= ${binary:Version}) [any-i386 any-amd64],
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: free implementation of the EGL API -- hardware drivers