[Pkg-fglrx-devel] r1189 - fglrx-driver/branches/10-9-squeeze/debian

[Andreas Beckmann]

Author: anbe
Date: 2013-02-16 18:14:29 +0000 (Sat, 16 Feb 2013)
New Revision: 1189

Modified:
   fglrx-driver/branches/10-9-squeeze/debian/changelog
   fglrx-driver/branches/10-9-squeeze/debian/fglrx-driver.postinst
   fglrx-driver/branches/10-9-squeeze/debian/fglrx-driver.preinst
Log:
move removal of old libdri.so diversion to postinst

Modified: fglrx-driver/branches/10-9-squeeze/debian/changelog
===================================================================
--- fglrx-driver/branches/10-9-squeeze/debian/changelog	2013-02-16 18:12:00 UTC (rev 1188)
+++ fglrx-driver/branches/10-9-squeeze/debian/changelog	2013-02-16 18:14:29 UTC (rev 1189)
@@ -1,6 +1,9 @@
 fglrx-driver (1:10-9-3squeeze1) UNRELEASED; urgency=low
 
   * fglrx-glx{,-ia32}.preinst: Create diversions on upgrades, too.
+  * fglrx-driver.preinst: Move removal of old libdri.so diversion to postinst.
+    The fglrx-driver package in lenny shipped the diverted file, so on
+    upgrades from lenny this still exists at the time the preinst is run.
 
  -- Andreas Beckmann <anbe at debian.org>  Thu, 14 Feb 2013 05:01:43 +0100
 

Modified: fglrx-driver/branches/10-9-squeeze/debian/fglrx-driver.postinst
===================================================================
--- fglrx-driver/branches/10-9-squeeze/debian/fglrx-driver.postinst	2013-02-16 18:12:00 UTC (rev 1188)
+++ fglrx-driver/branches/10-9-squeeze/debian/fglrx-driver.postinst	2013-02-16 18:14:29 UTC (rev 1189)
@@ -31,6 +31,10 @@
 			mv_conffile /etc/fglrxrc           /etc/ati/fglrxrc
 			mv_conffile /etc/fglrxprofiles.csv /etc/ati/fglrxprofiles.csv
 		fi
+		# 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
 		# Update /etc/default/fglrx-driver based on debconf.
 		if [ -f /etc/default/fglrx-driver ] ; then
 			db_get fglrx-driver/acpi_switch

Modified: fglrx-driver/branches/10-9-squeeze/debian/fglrx-driver.preinst
===================================================================
--- fglrx-driver/branches/10-9-squeeze/debian/fglrx-driver.preinst	2013-02-16 18:12:00 UTC (rev 1188)
+++ fglrx-driver/branches/10-9-squeeze/debian/fglrx-driver.preinst	2013-02-16 18:14:29 UTC (rev 1189)
@@ -34,10 +34,6 @@
 		# 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