[Pkg-fglrx-devel] r371 - fglrx-driver/trunk/debian

[Patrick Matthäi]

Author: pmatthaei
Date: 2010-02-28 11:43:24 +0000 (Sun, 28 Feb 2010)
New Revision: 371

Modified:
   fglrx-driver/trunk/debian/fglrx-driver.postrm
   fglrx-driver/trunk/debian/fglrx-driver.preinst
Log:
Better patch to fix #571124.


Modified: fglrx-driver/trunk/debian/fglrx-driver.postrm
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.postrm	2010-02-23 17:25:23 UTC (rev 370)
+++ fglrx-driver/trunk/debian/fglrx-driver.postrm	2010-02-28 11:43:24 UTC (rev 371)
@@ -27,7 +27,9 @@
     ;;
 
 	remove)
-		dpkg-divert --package fglrx-driver --rename --remove /usr/lib/xorg/modules/extensions/libdri.so || true
+		if [ -f /usr/lib/fglrx/diversions/libdri.so ] ; then
+			dpkg-divert --package fglrx-driver --rename --remove /usr/lib/xorg/modules/extensions/libdri.so || true
+		fi
 		dpkg-divert --package fglrx-driver --rename --remove /usr/lib/xorg/modules/extensions/libglx.so
 	;;
 

Modified: fglrx-driver/trunk/debian/fglrx-driver.preinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.preinst	2010-02-23 17:25:23 UTC (rev 370)
+++ fglrx-driver/trunk/debian/fglrx-driver.preinst	2010-02-28 11:43:24 UTC (rev 371)
@@ -31,12 +31,13 @@
             prep_mv_conffile /etc/fglrxrc
             prep_mv_conffile /etc/fglrxprofiles.csv
         fi
-
-	# Add new diversions.
-	mkdir -p /usr/lib/fglrx/diversions
-	dpkg-divert --package fglrx-driver --divert /usr/lib/fglrx/diversions/libglx.so --rename /usr/lib/xorg/modules/extensions/libglx.so
-	# Delete old diversion.
-	dpkg-divert --package fglrx-driver --rename --remove /usr/lib/xorg/modules/extensions/libdri.so || true
+		# Add new diversions.
+		mkdir -p /usr/lib/fglrx/diversions
+		dpkg-divert --package fglrx-driver --divert /usr/lib/fglrx/diversions/libglx.so --rename /usr/lib/xorg/modules/extensions/libglx.so
+		# Delete old diversion.
+		if [ -f /usr/lib/fglrx/diversions/libdri.so ] ; then
+			dpkg-divert --package fglrx-driver --rename --remove /usr/lib/xorg/modules/extensions/libdri.so || true
+		fi
     ;;
 esac