[pkg-nvidia-devel] r975 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog nvidia-glx-dev.postinst nvidia-glx-dev.postrm nvidia-glx.init.in nvidia-glx.postrm.in nvidia-glx.prerm

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

Author: anbe-guest
Date: Wed Jun  2 07:49:36 2010
New Revision: 975

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=975
Log:
  * stop creating/removing /usr/lib/libGL.so in the maintainer scripts and the
    init script (closes: #422002, #546210)

Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.postinst
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.postrm
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.init.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.prerm

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=975&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Wed Jun  2 07:49:36 2010
@@ -26,6 +26,8 @@
   * add NEWS entry about X display manager startup timeouts and give hints
     where to increase the default timeouts
   * add/update old NEWS entries about the legacy drivers
+  * stop creating/removing /usr/lib/libGL.so in the maintainer scripts and the
+    init script (closes: #422002, #546210)
 
  -- Russ Allbery <rra at debian.org>  Wed, 26 May 2010 07:19:43 -0700
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.postinst?rev=975&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.postinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.postinst Wed Jun  2 07:49:36 2010
@@ -20,9 +20,6 @@
 
 case "$1" in
     configure)
-		if [ -e /etc/init.d/nvidia-glx ] ; then
-			invoke-rc.d nvidia-glx start
-		fi
 
         # <target: squeeze>
         if dpkg --compare-versions "$2" lt-nl 195.36.24-1 ; then

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.postrm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.postrm?rev=975&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.postrm (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.postrm Wed Jun  2 07:49:36 2010
@@ -22,8 +22,6 @@
 case "$1" in
     purge|remove)
 
-        rm /usr/lib/libGL.so || true
-	invoke-rc.d nvidia-glx start || true		
 
     ;;
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.init.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.init.in?rev=975&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.init.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.init.in Wed Jun  2 07:49:36 2010
@@ -29,13 +29,6 @@
 
 case "$1" in
   start|restart|reload|force-reload)
-    rm -f  /usr/lib/libGL.so || true 
-    if [ -L /usr/lib/nvidia/libGL.so.xlibmesa ] && [ -d /usr/share/doc/libgl1-mesa-dev ] ; then
-    	ln -s /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so
-    fi
-    if [ -d /usr/share/doc/nvidia-glx#LEGACY#-dev ] ; then
-        ln -s /usr/lib/libGL.so.#VERSION# /usr/lib/libGL.so
-    fi
     ;;
 
   stop) 

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in?rev=975&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in Wed Jun  2 07:49:36 2010
@@ -47,10 +47,6 @@
 
 case "$1" in
     remove|abort-install)
-        if [ remove = "$1" ] ; then
-            # remove file created by init script
-    	    rm /usr/lib/libGL.so || true
-        fi
 
 	dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libGL.so.1.xlibmesa /usr/lib/libGL.so.1 > /dev/null
 	dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.prerm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.prerm?rev=975&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.prerm (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.prerm Wed Jun  2 07:49:36 2010
@@ -19,8 +19,6 @@
 
 case "$1" in
     remove|upgrade|deconfigure)
-	rm -f /usr/lib/libGL.so || true
-	/etc/init.d/nvidia-glx start || true
     ;;
 
     failed-upgrade)