[pkg-nvidia-devel] r1252 - in /packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian: nvidia-glx-legacy-96xx-dev.postrm nvidia-glx-legacy-96xx-dev.preinst.in nvidia-glx-legacy-96xx-ia32.postrm nvidia-glx-legacy-96xx.postrm.in nvidia-glx-legacy-96xx.preinst

anbe-guest at users.alioth.debian.org anbe-guest at users.alioth.debian.org
Thu Jul 1 18:26:37 UTC 2010


Author: anbe-guest
Date: Thu Jul  1 18:26:37 2010
New Revision: 1252

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1252
Log:
remove dead code and init script references

Modified:
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-dev.postrm
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-dev.preinst.in
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.postrm
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.postrm.in
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.preinst

Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-dev.postrm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-dev.postrm?rev=1252&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-dev.postrm (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-dev.postrm Thu Jul  1 18:26:37 2010
@@ -7,22 +7,8 @@
 
 case "$1" in
     remove|purge)
-#	dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
-#	dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
-        rm /usr/lib/libGL.so || true
-	/etc/init.d/nvidia-glx start || true		
-#	ln -s /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so
-	
 
 	dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa  /usr/lib/libGL.a > /dev/null
-
-#	dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
-#	dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
-#	dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/share/nvidia-glx/diversions/glxtokens.h /usr/include/GL/glxtokens.h > /dev/null
-
-#	dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
-#	dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
-#	dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/share/nvidia-glx/diversions/glxtokens.h /usr/include/GL/glxtokens.h > /dev/null
 
 	if [ -d /usr/lib/nvidia/ ]; then
 		rmdir /usr/lib/nvidia || true;

Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-dev.preinst.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-dev.preinst.in?rev=1252&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-dev.preinst.in (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-dev.preinst.in Thu Jul  1 18:26:37 2010
@@ -8,51 +8,11 @@
 case "$1" in
     install|upgrade)
         # diversion transition
-	if [ -d /usr/share/nvidia-glx/diversions/ ] ; then
-		rm -f /usr/lib/libGL.so 
-	        rm -f /usr/lib/libGL.a 
-        	dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/share/nvidia-glx/diversions/libGL.so /usr/lib/libGL.so > /dev/null
-		dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/share/nvidia-glx/diversions/libGL.a  /usr/lib/libGL.a > /dev/null
-
-		rmdir  /usr/share/nvidia-glx/diversions/ || true
-		rmdir /usr/share/nvidia-glx || true
-
-	fi
-	
-	if [ -d /usr/share/nvidia-glx/diversions ] ; then 
-		rm -f /usr/lib/libGL.so 
-		rm -f /usr/lib/libGL.a
-	
-		dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/share/nvidia-glx/diversions/libGL.so /usr/lib/libGL.so > /dev/null
-		dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/share/nvidia-glx/diversions/libGL.a /usr/lib/libGL.a > /dev/null
-				
-
-                rmdir  /usr/share/nvidia-glx/diversions || true
-		rmdir /usr/share/nvidia-glx || true
-	fi				                
-						
 
 	if [ ! -d /usr/lib/nvidia ]; then
 		mkdir -p /usr/lib/nvidia || true
 	fi
 
-# to remove old old old gl header diversions
-
-
-	if [ -e /usr/share/nvidia-glx/diversions/gl.h ]; then
-	  if [ -e /usr/include/GL/gl.h ]; then 
-	  	rm -f /usr/include/GL/gl.h /usr/include/GL/glx.h /usr/include/GL/glxtokens.h
-	  fi		
-	  dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
-	  dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
-	  dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/share/nvidia-glx/diversions/glxext.h /usr/include/GL/glxext.h > /dev/null
-
-	  dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
-	  dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
-	  dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/share/nvidia-glx/diversions/glxext.h /usr/include/GL/glxext.h > /dev/null
-
-	fi
-        
 	# make sure these diversions don't exist anymore
 	if dpkg-divert --list /usr/lib/libGL.so | grep 'nvidia-glx-legacy-96xx-dev' > /dev/null ; then 
 		dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
@@ -66,22 +26,6 @@
 	if dpkg-divert --list /usr/X11R6/lib/libGL.so | grep 'nvidia-glx-legacy-96xx-dev' > /dev/null ; then 
 		dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null	
 	fi
-#	dpkg-divert --add --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
-#	dpkg-divert --add --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
-#	rm /usr/lib/libGL.so || true
-	
-#	ln -s /usr/lib/libGL.so.#VERSION# /usr/lib/libGL.so || true
-	
-	
-#	dpkg-divert --add --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null
-
-#	dpkg-divert --add --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
-#	dpkg-divert --add --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
-#	dpkg-divert --add --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/share/nvidia-glx/diversions/glxtokens.h /usr/include/GL/glxtokens.h > /dev/null
-
-#	dpkg-divert --add --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
-#	dpkg-divert --add --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
-#	dpkg-divert --add --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/share/nvidia-glx/diversions/glxtokens.h /usr/include/GL/glxtokens.h > /dev/null
 
   ;;
 

Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.postrm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.postrm?rev=1252&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.postrm (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.postrm Thu Jul  1 18:26:37 2010
@@ -33,9 +33,6 @@
 		rmdir /emul/ia32-linux/usr/lib/nvidia || true;
         test -d /usr/lib32/nvidia && \
 	                rmdir /usr/lib32/nvidia || true;
-			
-			
-	ldconfig
 		
     ;;
     

Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.postrm.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.postrm.in?rev=1252&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.postrm.in (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.postrm.in Thu Jul  1 18:26:37 2010
@@ -19,7 +19,6 @@
 case "$1" in
     remove|purge)
         # remove file created by init script
-    	rm /usr/lib/libGL.so || true
 	dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx --divert /usr/lib/nvidia/libGL.so.1.xlibmesa /usr/lib/libGL.so.1 > /dev/null
 	dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx --divert /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null
 	
@@ -28,11 +27,10 @@
 	dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx --divert /usr/lib/nvidia/libglx.so.xlibmesa /usr/lib/xorg/modules/extensions/libglx.so > /dev/null
 
 	dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
-	rm -f /usr/lib/xorg/modules/extensions/libglx.so.#VERSION# 2> /dev/null || true
+
 	if [ -d /usr/lib/nvidia ]; then
 		rmdir /usr/lib/nvidia/ || true;
 	fi
-	ldconfig
 		
     ;;
     
@@ -48,11 +46,6 @@
 esac
 
 
-#rm -f /usr/lib/xorg/modules/extensions/libglx.so.#VERSION# 2> /dev/null || true
-
-    
-
-
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
 

Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.preinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.preinst?rev=1252&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.preinst (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.preinst Thu Jul  1 18:26:37 2010
@@ -16,38 +16,7 @@
 case "$1" in
     install|upgrade)
 	
-	
-	# Hack right now.
-	# rm -f /usr/X11R6/lib/modules/extensions/libglx.so.1.0.5336  2>/dev/null || true
-	
 	# clean up from old diversions
-	if [ -d /usr/share/nvidia-glx-legacy-96xx/diversions ]; then
-		rm -f /usr/lib/libGL.so.1
-		rm -f /usr/lib/libGL.so.1.2
-		
-		dpkg-divert --remove --rename  --package nvidia-glx-legacy-96xx --divert /usr/share/nvidia-glx-legacy-96xx/diversions/libGL.so.1 /usr/lib/libGL.so.1 > /dev/null
-		dpkg-divert --remove  --rename  --package nvidia-glx-legacy-96xx --divert /usr/share/nvidia-glx-legacy-96xx/diversions/libGL.so.1.2 /usr/lib/libGL.so.1.2 > /dev/null
-
-		rm -f /usr/lib/xorg/modules/extensions/libGLcore.a
-		rm -f /usr/lib/xorg/modules/extensions/libglx.a
-		dpkg-divert --remove --rename  --package nvidia-glx-legacy-96xx --divert /usr/share/nvidia-glx-legacy-96xx/diversions/libGLcore.a /usr/lib/xorg/modules/extensions/libGLcore.a > /dev/null
-		dpkg-divert --remove --rename   --package nvidia-glx-legacy-96xx --divert /usr/share/nvidia-glx-legacy-96xx/diversions/libglx.a /usr/lib/xorg/modules/extensions/libglx.a > /dev/null
-
-		rmdir /usr/share/nvidia-glx-legacy-96xx/diversions || true;
-		rmdir /usr/share/nvidia-glx-legacy-96xx || true;
-	fi
-	if [ -d /usr/share/nvidia-glx-legacy-96xx/diversions ]; then
-
-		rm -f /usr/lib/libGL.so.1
-		rm -f /usr/lib/libGL.so.1.2
-		
-		dpkg-divert --remove  --rename --package nvidia-glx-legacy-96xx --divert /usr/share/nvidia-glx-legacy-96xx/diversions/libGL.so.1 /usr/lib/libGL.so.1 > /dev/null
-		dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx --divert /usr/share/nvidia-glx-legacy-96xx/diversions/libGL.so.1.2 /usr/lib/libGL.so.1.2 > /dev/null
-
-		rmdir /usr/share/nvidia-glx-legacy-96xx/diversions || true;
-		rmdir /usr/share/nvidia-glx-legacy-96xx || true;
-	fi
-	# remove X11R6 diversions
 	
         if dpkg-divert --list /usr/X11R6/lib/libGL.so.1 | grep 'nvidia-glx-legacy-96xx' > /dev/null ; then
 		dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx --divert /usr/X11R6/lib/nvidia/libGL.so.1.xlibmesa /usr/X11R6/lib/libGL.so.1 > /dev/null




More information about the Pkg-nvidia-devel mailing list