[pkg-nvidia-devel] r1422 - in /packages/nvidia-graphics-drivers/trunk/debian: libgl1-nvidia-alternatives-ia32.postinst libglx-nvidia-alternatives.postinst nvidia-glx.postinst

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

Author: anbe-guest
Date: Tue Aug 24 22:48:20 2010
New Revision: 1422

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1422
Log:
reindent and simplify

Modified:
    packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives-ia32.postinst
    packages/nvidia-graphics-drivers/trunk/debian/libglx-nvidia-alternatives.postinst
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postinst

Modified: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives-ia32.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives-ia32.postinst?rev=1422&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives-ia32.postinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives-ia32.postinst Tue Aug 24 22:48:20 2010
@@ -95,11 +95,6 @@
 		/usr/lib32/nvidia/diversions/libGL.so.1.2 \
 		/usr/lib32/libGL.so.1.2
 
-fi
-
-
-if [ "$1" = "configure" ]; then
-
 	# activate our trigger
 	dpkg-trigger /usr/lib32/libGL.so.1
 	dpkg-trigger /usr/lib32/libGL.so

Modified: packages/nvidia-graphics-drivers/trunk/debian/libglx-nvidia-alternatives.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libglx-nvidia-alternatives.postinst?rev=1422&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libglx-nvidia-alternatives.postinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libglx-nvidia-alternatives.postinst Tue Aug 24 22:48:20 2010
@@ -31,12 +31,10 @@
 
 	# <target: squeeze>
 	# take over diversion from nvidia-glx*
-        if true
-	then
-		file_orig="/usr/lib/xorg/modules/extensions/libglx.so"
-		file_old_divert="/usr/lib/nvidia/libglx.so.xlibmesa"
-		file_new_divert="/usr/lib/nvidia/diversions/libglx.so"
-		old_diverter="`dpkg-divert --listpackage $file_orig`"
+	file_orig="/usr/lib/xorg/modules/extensions/libglx.so"
+	file_old_divert="/usr/lib/nvidia/libglx.so.xlibmesa"
+	file_new_divert="/usr/lib/nvidia/diversions/libglx.so"
+	old_diverter="`dpkg-divert --listpackage $file_orig`"
 
 	if [ -n "$old_diverter" ] \
 		&& [ "$old_diverter" != "$DPKG_MAINTSCRIPT_PACKAGE" ]
@@ -61,11 +59,11 @@
 				"$file_orig"
 		fi
 	fi
-		if exists "$file_old_divert"
-		then
-			echo "ERROR: $file_old_divert does still exist. Aborting."
-			exit 1
-		fi
+
+	if exists "$file_old_divert"
+	then
+		echo "ERROR: $file_old_divert does still exist. Aborting."
+		exit 1
 	fi
 	# </target: squeeze>
 
@@ -87,10 +85,6 @@
 		/usr/lib/nvidia/diversions/libglx.so \
 		/usr/lib/xorg/modules/extensions/libglx.so
 
-fi
-
-if [ "$1" = "configure" ]; then
-
 	# activate our trigger
 	dpkg-trigger /usr/lib/xorg/modules/extensions/libglx.so
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postinst?rev=1422&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postinst Tue Aug 24 22:48:20 2010
@@ -8,8 +8,8 @@
 # </target: squeeze>
 
 
-case "$1" in
-    configure)
+if [ "$1" = "configure" ]
+then
 
 	# <target: squeeze>
 	if dpkg --compare-versions "$2" lt-nl 195.36.24-3 ; then
@@ -47,8 +47,7 @@
 
 	update-alternatives --install /usr/lib/xorg/modules/extensions/libglx.so libglx.so /usr/lib/nvidia/libglx.so 42
 
-    ;;
-esac
+fi
 
 
 #DEBHELPER#