[pkg-nvidia-devel] r1410 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog libgl1-nvidia-glx.postinst

[rra at users.alioth.debian.org]

Author: rra
Date: Sun Aug 15 22:46:00 2010
New Revision: 1410

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1410
Log:
Create /usr/lib/nvidia/diversions in libgl1-nvidia-glx postinst

* The old nvidia-glx postrm would remove /usr/lib/nvidia/diversions out
  from under us, so ensure that it exists in the postinst of
  libgl1-nvidia-glx before creating diversions.

Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.postinst

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=1410&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sun Aug 15 22:46:00 2010
@@ -45,6 +45,9 @@
   [ Russ Allbery ]
   * Fix determination of the package name in nvidia-kernel-source when
     generating *.changes files.  (Closes: #589949)
+  * The old nvidia-glx postrm would remove /usr/lib/nvidia/diversions out
+    from under us, so ensure that it exists in the postinst of
+    libgl1-nvidia-glx before creating diversions.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Tue, 10 Aug 2010 13:30:47 +0200
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.postinst?rev=1410&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.postinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.postinst Sun Aug 15 22:46:00 2010
@@ -2,7 +2,8 @@
 set -e
 
 
-# A trigger that handles creating/removing /usr/lib/libGL.so
+# A trigger that handles the alternatives for /usr/lib/libGL.so and
+# /usr/lib/libGL.so.1.
 if [ "$1" = "triggered" ]; then
 
 	if [ -L /usr/lib/nvidia/diversions/libGL.so.1 ]; then
@@ -87,6 +88,11 @@
 
 if [ "$1" = "configure" ]
 then
+	# The old nvidia-glx postrm would delete /usr/lib/nvidia/diversions
+	# out from under us, so create it if it doesn't exist.
+	if [ ! -d /usr/lib/nvidia/diversions ] ; then
+		install -d -m 755 /usr/lib/nvidia/diversions
+	fi
 
 	# make new diversions
 	dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \