mesa: Changes to 'ubuntu'
debian/changelog | 15 +++++++++++++--
debian/libgl1-mesa-swx11-dev.links.in | 1 +
debian/libopenvg1-mesa-dev.links.in | 1 +
debian/rules | 1 +
4 files changed, 16 insertions(+), 2 deletions(-)
New commits:
commit aa9d50d8f43efbc600cd28751448862935b0ed13
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Wed Aug 10 17:34:11 2011 +1000
Upload to oneiric
diff --git a/debian/changelog b/debian/changelog
index d21d14e..9770c22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.11-0ubuntu3) UNRELEASED; urgency=low
+mesa (7.11-0ubuntu3) oneiric; urgency=low
[ Christopher James Halse Rogers ]
* debian/libopenvg1-mesa-dev.links.in:
commit 95f1cfc0a6f23acdc8df373425b65dbc894eecc5
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Wed Aug 10 12:58:44 2011 +1000
Fix the long-broken libgl1-mesa-swx11-dev
diff --git a/debian/changelog b/debian/changelog
index 42c3b0c..d21d14e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,11 +4,16 @@ mesa (7.11-0ubuntu3) UNRELEASED; urgency=low
* debian/libopenvg1-mesa-dev.links.in:
- Install a symlink to libOpenVG.so so that the linker can actually find
it.
+ * debian/rules:
+ * debian/libgl1-mesa-swx11-dev.links.in:
+ - Make linking against libGL in libgl1-mesa-swx11-dev actually work. This
+ seems to have been broken since Ubuntu 10.04 without complaint, so it's
+ fairly clear that no-one actually uses this package.
[ Robert Hooker ]
* Correct gbm.h install location in libgbm-dev.
- -- Christopher James Halse Rogers <raof@ubuntu.com> Wed, 10 Aug 2011 12:26:53 +1000
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Wed, 10 Aug 2011 12:58:15 +1000
mesa (7.11-0ubuntu2) oneiric; urgency=low
diff --git a/debian/libgl1-mesa-swx11-dev.links.in b/debian/libgl1-mesa-swx11-dev.links.in
new file mode 100644
index 0000000..7726605
--- /dev/null
+++ b/debian/libgl1-mesa-swx11-dev.links.in
@@ -0,0 +1 @@
+/usr/lib/${DEB_HOST_MULTIARCH}/mesa/libGL.so /usr/lib/${DEB_HOST_MULTIARCH}/libGL.so
diff --git a/debian/rules b/debian/rules
index 2516c61..0635431 100755
--- a/debian/rules
+++ b/debian/rules
@@ -274,6 +274,7 @@ install: build
libegl1-mesa-drivers.install libegl1-mesa-dev.install \
libgl1-mesa-dev.install libgl1-mesa-dev.links \
libgl1-mesa-swx11-dev.install libgl1-mesa-swx11.install \
+ libgl1-mesa-swx11-dev.links \
libgl1-mesa-glx.postinst libgl1-mesa-glx.prerm \
libgl1-mesa-swx11.postinst libgl1-mesa-swx11.prerm \
libgbm1.install libgbm-dev.install \
commit 4167a5cee28974d7f099602885cd896898a4c3e6
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Wed Aug 10 10:58:01 2011 +1000
Fix libopenvg1-mesa-dev by actually adding the {libdir}/mesa-egl/libOpenVG.so → {libdir}/libOpenVG.so link
diff --git a/debian/changelog b/debian/changelog
index 8d9c194..b87c9b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ mesa (7.11-0ubuntu3) UNRELEASED; urgency=low
* debian/libgbm-dev.install.in:
- Install gbm.h in the right place.
+ * debian/libopenvg1-mesa-dev.links.in:
+ - Install a symlink to libOpenVG.so so that the linker can actually find
+ it.
- -- Christopher James Halse Rogers <raof@ubuntu.com> Wed, 10 Aug 2011 10:14:04 +1000
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Wed, 10 Aug 2011 10:56:43 +1000
mesa (7.11-0ubuntu2) oneiric; urgency=low
diff --git a/debian/libopenvg1-mesa-dev.links.in b/debian/libopenvg1-mesa-dev.links.in
new file mode 100644
index 0000000..7a80081
--- /dev/null
+++ b/debian/libopenvg1-mesa-dev.links.in
@@ -0,0 +1 @@
+/usr/lib/${DEB_HOST_MULTIARCH}/mesa-egl/libOpenVG.so /usr/lib/${DEB_HOST_MULTIARCH}/libOpenVG.so
commit 41895f77adc0eb53566534ccf0c950e06c756672
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Wed Aug 10 10:47:24 2011 +1000
Install gbm.h in the right place
diff --git a/debian/changelog b/debian/changelog
index 0f35c6bc..8d9c194 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (7.11-0ubuntu3) UNRELEASED; urgency=low
+
+ * debian/libgbm-dev.install.in:
+ - Install gbm.h in the right place.
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Wed, 10 Aug 2011 10:14:04 +1000
+
mesa (7.11-0ubuntu2) oneiric; urgency=low
* No change rebuild against new libwayland-dev. Fixes PowerPC build.
diff --git a/debian/libgbm-dev.install.in b/debian/libgbm-dev.install.in
index f5b413a..6f9e50a 100644
--- a/debian/libgbm-dev.install.in
+++ b/debian/libgbm-dev.install.in
@@ -1,3 +1,3 @@
dri/usr/lib/${DEB_HOST_MULTIARCH}/libgbm.so usr/lib/${DEB_HOST_MULTIARCH}
dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/gbm.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
-dri/usr/include/gbm.h usr/include/gbm.h
+dri/usr/include/gbm.h usr/include
Reply to: