[pkg-nvidia-devel] r1293 - in /packages/nvidia-graphics-drivers/trunk/debian: libgl1-nvidia-glx-ia32.preinst libgl1-nvidia-glx.preinst

[anbe-guest at users.alioth.debian.org]

Author: anbe-guest
Date: Sun Jul  4 17:44:07 2010
New Revision: 1293

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1293
Log:
do the diversion migration only during initial install of libgl1-nvidia-glx*

Modified:
    packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.preinst
    packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.preinst

Modified: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.preinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.preinst?rev=1293&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.preinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.preinst Sun Jul  4 17:44:07 2010
@@ -4,13 +4,14 @@
 
 #DIVERT_QUIET="--quiet"
 
+# <target: squeeze>
 exists()
 {
 	test -e "$1" || test -L "$1"
 }
 
-case "$1" in
-    install|upgrade)
+if [ "$1" = "install" ]
+then
 
 	# the destination directory for the diversions
 	test -d /usr/lib32/nvidia/diversions || \
@@ -52,6 +53,13 @@
 	done
 	# </target: squeeze>
 
+fi
+# </target: squeeze>
+
+
+case "$1" in
+    install|upgrade)
+
 	# make new diversions
 	dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
 		/usr/lib32/nvidia/diversions/libGL.so \

Modified: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.preinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.preinst?rev=1293&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.preinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.preinst Sun Jul  4 17:44:07 2010
@@ -4,13 +4,14 @@
 
 #DIVERT_QUIET="--quiet"
 
+# <target: squeeze>
 exists()
 {
 	test -e "$1" || test -L "$1"
 }
 
-case "$1" in
-    install|upgrade)
+if [ "$1" = "install" ]
+then
 
 	# the destination directory for the diversions
 	test -d /usr/lib/nvidia/diversions || \
@@ -62,6 +63,17 @@
 	done
 	# </target: squeeze>
 
+fi
+# </target: squeeze>
+
+
+case "$1" in
+    install|upgrade)
+
+	# the destination directory for the diversions
+	test -d /usr/lib/nvidia/diversions || \
+		mkdir -p /usr/lib/nvidia/diversions || true
+
 	# make new diversions
 	dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
 		/usr/lib/nvidia/diversions/libGL.so \