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

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

Author: anbe-guest
Date: Sun May 30 20:01:40 2010
New Revision: 966

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=966
Log:
nvidia-glx: work around dpkg-divert bug #581544: useless errors on not writable destination if source does not exist

Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    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=966&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sun May 30 20:01:40 2010
@@ -18,6 +18,8 @@
   * nvidia-glx: add Pre-Depends: dpkg (>= 1.15.7.2)
   * nvidia-glx: switch to dpkg-maintscript-helper for removal of obsolete
     config file /etc/default/nvidia-glx
+  * nvidia-glx: work around dpkg-divert bug #581544: useless errors on not
+    writable destination if source does not exist
 
  -- Russ Allbery <rra at debian.org>  Wed, 26 May 2010 07:19:43 -0700
 

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=966&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in Sun May 30 20:01:40 2010
@@ -54,6 +54,11 @@
 
 	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
+
+	# 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 --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libglx.so.xlibmesa /usr/lib/xorg/modules/extensions/libglx.so > /dev/null
 
@@ -62,6 +67,9 @@
 	if [ -d /usr/lib/nvidia ]; then
 		rmdir /usr/lib/nvidia/ || true;
 	fi
+
+	# 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
 
     ;;