mesa: Changes to 'ubuntu'
debian/changelog | 5 +++++
debian/libgl1-mesa-glx.prerm | 2 +-
debian/libgl1-mesa-swx11.prerm | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit cc764d409b8aa789be3ec7cac5e2717c3f1c7fab
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Sun Mar 27 01:39:24 2011 -0700
Fix alternatives removal on removal of libgl1-mesa-{swx11,glx}
diff --git a/debian/changelog b/debian/changelog
index 2fbef1b..6d1279c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
mesa (7.10.1-0ubuntu4) UNRELEASED; urgency=low
+ [ Robert Hooker ]
* Cherry-pick upstream commit 6c324777a685d28d0a81d23157e4863240552999
to fix a major performance problem with unity on Intel
Sandybridge GPUs.
+ [ Steve Langasek ]
+ * Fix alternatives removal on removal of libgl1-mesa-{swx11,glx}: the
+ files are in /usr/lib/mesa, not /usr/lib/GL.
+
-- Robert Hooker <sarvatt@ubuntu.com> Wed, 23 Mar 2011 15:51:12 -0400
mesa (7.10.1-0ubuntu3) natty; urgency=low
diff --git a/debian/libgl1-mesa-glx.prerm b/debian/libgl1-mesa-glx.prerm
index d3d78e4..8310ec6 100644
--- a/debian/libgl1-mesa-glx.prerm
+++ b/debian/libgl1-mesa-glx.prerm
@@ -8,7 +8,7 @@ THIS_SCRIPT=prerm
case "$1" in
remove)
# Use alternatives to make it easier to switch between Mesa and 3rd party modules
- update-alternatives --remove gl_conf /usr/lib/GL/ld.so.conf
+ update-alternatives --remove gl_conf /usr/lib/mesa/ld.so.conf
# explicit ldconfig due to alternatives
ldconfig
diff --git a/debian/libgl1-mesa-swx11.prerm b/debian/libgl1-mesa-swx11.prerm
index 3683002..a9bb78f 100644
--- a/debian/libgl1-mesa-swx11.prerm
+++ b/debian/libgl1-mesa-swx11.prerm
@@ -8,7 +8,7 @@ THIS_SCRIPT=prerm
case "$1" in
remove)
# Use alternatives to make it easier to switch between Mesa and 3rd party modules
- update-alternatives --remove gl_conf /usr/lib/GL/ld.so.conf
+ update-alternatives --remove gl_conf /usr/lib/mesa/ld.so.conf
# explicit ldconfig due to alternatives
ldconfig
Reply to: