mesa: Changes to 'ubuntu'
debian/changelog | 2 ++
debian/control | 2 +-
debian/libgl1-mesa-dri.install.in | 1 -
debian/libgl1-mesa-dri.install.linux.in | 1 -
debian/patches/13-llvm-config-pick-a-version.diff | 4 ++--
5 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 86a093b4f9b0a8353e827793b60b8ca70b96630e
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Mon Aug 20 12:39:07 2012 +0300
undo changes to llvm versions that were mistakenly committed
diff --git a/debian/control b/debian/control
index 300ce95..eec1de0 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Build-Depends:
libudev-dev [linux-any],
flex,
bison,
-# llvm-3.1-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
+ llvm-3.1-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
libwayland-dev (>= 0.95.0) [linux-any],
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
diff --git a/debian/patches/13-llvm-config-pick-a-version.diff b/debian/patches/13-llvm-config-pick-a-version.diff
index 1bc8d04..4a60c1e 100644
--- a/debian/patches/13-llvm-config-pick-a-version.diff
+++ b/debian/patches/13-llvm-config-pick-a-version.diff
@@ -9,10 +9,10 @@ receives bug fixes quickly, so pick 3.1 for now.
if test "x$enable_gallium_llvm" = xyes; then
if test "x$llvm_prefix" != x; then
- AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no], ["$llvm_prefix/bin"])
-+ AC_PATH_PROG([LLVM_CONFIG], [llvm-config-3.0], [no], ["$llvm_prefix/bin"])
++ AC_PATH_PROG([LLVM_CONFIG], [llvm-config-3.1], [no], ["$llvm_prefix/bin"])
else
- AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no])
-+ AC_PATH_PROG([LLVM_CONFIG], [llvm-config-3.0], [no])
++ AC_PATH_PROG([LLVM_CONFIG], [llvm-config-3.1], [no])
fi
if test "x$LLVM_CONFIG" != xno; then
commit 1e0312fcf5e78a116cc6c4aec2921cc1c2c5d658
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Mon Aug 20 12:10:07 2012 +0300
libgl1-mesa-dri.*install.in: Drop libglsl.so, it's included in libdricore.so now.
diff --git a/debian/changelog b/debian/changelog
index 6fdd7a9..789d454 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ mesa (8.1~git20120816.1597176f-0ubuntu1) UNRELEASED; urgency=low
reworked to apply
* not-installed, libegl1-mesa-drivers-install.linux.in: Updated to
match the single-pass build.
+ * libgl1-mesa-dri.*install.in: Drop libglsl.so, it's included in
+ libdricore.so now.
-- Timo Aaltonen <tjaalton@ubuntu.com> Fri, 17 Aug 2012 11:08:47 +0300
diff --git a/debian/libgl1-mesa-dri.install.in b/debian/libgl1-mesa-dri.install.in
index acc3c84..b80d5eb 100644
--- a/debian/libgl1-mesa-dri.install.in
+++ b/debian/libgl1-mesa-dri.install.in
@@ -1,4 +1,3 @@
# If this part gets modified, make sure to update .install.$os as well:
build/dri/${DEB_HOST_MULTIARCH}/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
-build/dri/${DEB_HOST_MULTIARCH}/libglsl.so usr/lib/${DEB_HOST_MULTIARCH}/dri
build/dri/${DEB_HOST_MULTIARCH}/libdricore.so usr/lib/${DEB_HOST_MULTIARCH}/dri
diff --git a/debian/libgl1-mesa-dri.install.linux.in b/debian/libgl1-mesa-dri.install.linux.in
index 7e62d9e..6fe22bd 100644
--- a/debian/libgl1-mesa-dri.install.linux.in
+++ b/debian/libgl1-mesa-dri.install.linux.in
@@ -1,6 +1,5 @@
# Keep this part in sync with libgl1-mesa-dri.install:
build/dri/${DEB_HOST_MULTIARCH}/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
-build/dri/${DEB_HOST_MULTIARCH}/libglsl.so usr/lib/${DEB_HOST_MULTIARCH}/dri
build/dri/${DEB_HOST_MULTIARCH}/libdricore.so usr/lib/${DEB_HOST_MULTIARCH}/dri
# This part is Linux-specific:
Reply to: