[pkg-nvidia-devel] r761 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog control nvidia-glx.postrm.in

[rra at users.alioth.debian.org]

Author: rra
Date: Wed Apr  7 04:51:26 2010
New Revision: 761

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=761
Log:
Clean up nvidia-glx postrm handling

* Do not remove /usr/lib/libGL.so on purge of nvidia-glx.  At that
  point, we've removed our diversion, so this is someone else's file and
  we shouldn't be deleting it.
* Remove our diversions on aborted installations of nvidia-glx, since we
  may have gotten far enough to create them.
* Document the nvidia-glx postrm cases and rationale in more detail in
  comments in the postrm.  Thanks, Sven Joachim.  (Closes: #575272)

Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/control
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=761&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Wed Apr  7 04:51:26 2010
@@ -16,6 +16,15 @@
     already runs that target under $(ROOT_CMD), so this provokes errors
     from fakeroot about nesting invocations.  Nothing this target does
     requires fakeroot.  Thanks, Bastian Kleineidam.  (Closes:  #416594)
+  * nvidia-glx-dev should depend on libx11-dev since GL/glx.h includes
+    headers from it.  Thanks, Baruch Even.  (Closes: #433178)
+  * Do not remove /usr/lib/libGL.so on purge of nvidia-glx.  At that
+    point, we've removed our diversion, so this is someone else's file and
+    we shouldn't be deleting it.
+  * Remove our diversions on aborted installations of nvidia-glx, since we
+    may have gotten far enough to create them.
+  * Document the nvidia-glx postrm cases and rationale in more detail in
+    comments in the postrm.  Thanks, Sven Joachim.  (Closes: #575272)
 
  -- Andres Mejia <mcitadel at gmail.com>  Thu, 18 Mar 2010 18:44:40 -0400
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=761&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Wed Apr  7 04:51:26 2010
@@ -54,7 +54,7 @@
 
 Package: nvidia-glx-dev
 Architecture: i386 amd64
-Depends: nvidia-glx (= ${binary:Version}), ${misc:Depends}
+Depends: nvidia-glx (= ${binary:Version}), libx11-dev, ${misc:Depends}
 Provides: libgl-dev
 Conflicts: libgl-dev, mesa-common-dev
 Replaces: libgl-dev

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=761&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in Wed Apr  7 04:51:26 2010
@@ -1,25 +1,34 @@
 #! /bin/sh
 # postrm script for nvidia-glx
-#
-# see: dh_installdeb(1)
 
 set -e
 
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
-# for details, see /usr/share/doc/packaging-manual/
+# Rationale:
+#
+# Remove our diversions at the remove stage, since even if we have
+# configuration files left, we want to put back everything we moved.  Do not
+# try to do this again on purge since remove will have already been called,
+# and since the rm of /usr/lib/libGL.so will remove someone else's version at
+# that point.
+#
+# In the abort-install case, we may have gotten far enough to create our
+# diversions in our preinst, so back out of them.  Don't remove
+# /usr/lib/libGL.so, since that may still be owned by another package and
+# since we don't create that in preinst.
+#
+# Leave all of our diversions alone during upgrades or aborted upgrades, since
+# we're staying installed in all cases and the diversions are still correct.
+#
+# It's not clear what to do on disappear, but for now leave everything alone
+# and assume that our overwriting package will have logic to take over the
+# diversions and doesn't want us messing with them.
 
 case "$1" in
-    remove|purge)
-        # remove file created by init script
-    	rm /usr/lib/libGL.so || true
+    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
 	
@@ -37,7 +46,7 @@
 		
     ;;
     
-    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    upgrade|failed-upgrade|abort-upgrade|disappear|purge)
 
 
         ;;