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

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

Author: anbe-guest
Date: Tue Aug 24 19:13:55 2010
New Revision: 1420

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1420
Log:
Remove workaround for dpkg-divert bug #581544, fixed in dpkg 1.15.8.

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

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=1420&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Tue Aug 24 19:13:55 2010
@@ -1,3 +1,10 @@
+nvidia-graphics-drivers (195.36.31-3) unstable; urgency=low
+
+  [ Andreas Beckmann ]
+  * Remove workaround for dpkg-divert bug #581544, fixed in dpkg 1.15.8.
+
+ -- Andreas Beckmann <debian at abeckmann.de>  Tue, 24 Aug 2010 19:27:52 +0200
+
 nvidia-graphics-drivers (195.36.31-2) unstable; urgency=low
 
   [ Andreas Beckmann ]

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm?rev=1420&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm Tue Aug 24 19:13:55 2010
@@ -33,19 +33,11 @@
 case "$1" in
     remove|abort-install)
 
-	# work around dpkg-divert bug #581544: useless errors on not writable destination if source does not exist
-	if [ -d /usr/lib/nvidia ] && [ ! -d /usr/lib/xorg/modules/extensions ]; then
-	    mkdir -p /usr/lib/xorg/modules/extensions
-	fi
-
 	dpkg-divert $DIVERT_QUIET --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
 		/usr/lib/nvidia/diversions/libglx.so \
 		/usr/lib/xorg/modules/extensions/libglx.so
 
 	rmdir /usr/lib/nvidia/diversions /usr/lib/nvidia 2>/dev/null || true
-
-	# work around dpkg-divert bug #581544: useless errors on not writable destination if source does not exist
-	rmdir /usr/lib/xorg/modules/extensions /usr/lib/xorg/modules /usr/lib/xorg 2>/dev/null || true
 
     ;;
 esac