[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

mesa: Changes to 'ubuntu'



 debian/changelog                |    9 +++++++++
 debian/libgl1-mesa-glx.postinst |    5 +++--
 2 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 10f76b6b997e84e388ee9b91b4eeac397ff0c92c
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Wed Jan 20 13:16:49 2010 +0100

    * debian/libgl1-mesa-glx.postinst:
      - Pass LDCONFIG_NOTRIGGER=y to ldconfig as it needs to be run
        immediately as we're changing /etc/ld.so.conf.d/ with
        alternatives.

diff --git a/debian/changelog b/debian/changelog
index f81b38e..90996b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mesa (7.7-0ubuntu8) UNRELEASED; urgency=low
+
+  * debian/libgl1-mesa-glx.postinst:
+    - Pass LDCONFIG_NOTRIGGER=y to ldconfig as it needs to be run
+      immediately as we're changing /etc/ld.so.conf.d/ with
+      alternatives.
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Wed, 20 Jan 2010 13:12:56 +0100
+
 mesa (7.7-0ubuntu7) lucid; urgency=low
 
   * debian/libgl1-mesa-glx.postinst
diff --git a/debian/libgl1-mesa-glx.postinst b/debian/libgl1-mesa-glx.postinst
index 2a8a485..3365113 100644
--- a/debian/libgl1-mesa-glx.postinst
+++ b/debian/libgl1-mesa-glx.postinst
@@ -12,8 +12,9 @@ case "$1" in
     --install /etc/ld.so.conf.d/GL.conf gl_conf /usr/lib/mesa/ld.so.conf 500 \
     --slave /usr/lib/xorg/extra-modules xorg_extra_modules /usr/lib/xorg/x11-extra-modules
 
-  # explicit ldconfig due to alternatives
-  ldconfig
+  # ldconfig needs to be run immediately as we're changing /etc/ld.so.conf.d/ with
+  # alternatives.
+  LDCONFIG_NOTRIGGER=y ldconfig
 
 esac
 


Reply to: