debian/changelog | 1 +
debian/libgl1-mesa-dri.install.in | 1 +
debian/libgl1-mesa-dri.install.linux.in | 1 +
debian/patches/14-fix-osmesa-build.diff | 17 +++++++----------
4 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 2f64e67568942a15b779c5f7951f7a9c084a82d3
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Tue Aug 21 09:43:01 2012 +0300
refresh patch 14 to actually apply
diff --git a/debian/patches/14-fix-osmesa-build.diff
b/debian/patches/14-fix-osmesa-build.diff
index 8699c49..61823ab 100644
--- a/debian/patches/14-fix-osmesa-build.diff
+++ b/debian/patches/14-fix-osmesa-build.diff
@@ -1,13 +1,10 @@
-diff --git a/src/mesa/drivers/osmesa/Makefile.am
b/src/mesa/drivers/osmesa/Makefile.am
-index dbee925..0afc1c7 100644
--- a/src/mesa/drivers/osmesa/Makefile.am
+++ b/src/mesa/drivers/osmesa/Makefile.am
-@@ -28,6 +28,7 @@ AM_CFLAGS = \
- -I$(top_srcdir)/include \
- -I$(top_srcdir)/src/mapi \
- -I$(top_srcdir)/src/mesa/ \
-+ -I$(top_builddir)/src/mapi \
- $(DEFINES) \
- $(API_DEFINES)
+@@ -28,6 +28,7 @@
+ -I$(top_srcdir)/include \
+ -I$(top_srcdir)/src/mapi \
+ -I$(top_srcdir)/src/mesa/ \
++ -I$(top_builddir)/src/mapi \
+ $(DEFINES) \
+ $(API_DEFINES)
-
commit 5657ef9c482c14a30473c9d3069706ae2ff6a826
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Tue Aug 21 09:28:17 2012 +0300
libgl1-mesa-dri.install*.in: Add libdricore.
diff --git a/debian/changelog b/debian/changelog
index c4ffff6..115532b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ mesa (8.1~git20120816.1597176f-1) UNRELEASED; urgency=low
* Update symbols.
* Added 14-fix-osmesa-build.diff, fixes glapi includes with out-of-tree
builds.
+ * libgl1-mesa-dri.install*.in: Add libdricore.
-- Julien Cristau <jcris...@debian.org> Fri, 03 Aug 2012 23:17:16 +0200
diff --git a/debian/libgl1-mesa-dri.install.in
b/debian/libgl1-mesa-dri.install.in
index 4a66df4..31a01bb 100644
--- a/debian/libgl1-mesa-dri.install.in
+++ b/debian/libgl1-mesa-dri.install.in
@@ -1,2 +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
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so*
diff --git a/debian/libgl1-mesa-dri.install.linux.in
b/debian/libgl1-mesa-dri.install.linux.in
index ee1acd8..0d9ca03 100644
--- a/debian/libgl1-mesa-dri.install.linux.in
+++ b/debian/libgl1-mesa-dri.install.linux.in
@@ -1,5 +1,6 @@
# Keep this part in sync with libgl1-mesa-dri.install:
build/dri/${DEB_HOST_MULTIARCH}/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so*
# This part is Linux-specific:
build/dri/${DEB_HOST_MULTIARCH}/gallium/r300_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri
--
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/e1t3iby-0002ve...@vasks.debian.org
