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

[Andreas Beckmann]

Author: anbe-guest
Date: 2011-08-16 12:54:36 +0000 (Tue, 16 Aug 2011)
New Revision: 721

Removed:
   fglrx-driver/trunk/debian/fglrx-driver.preinst
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/fglrx-driver.postinst
Log:
Move cleanup of old diversions from preinst to postinst.

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-08-11 10:23:08 UTC (rev 720)
+++ fglrx-driver/trunk/debian/changelog	2011-08-16 12:54:36 UTC (rev 721)
@@ -3,6 +3,7 @@
   [ Andreas Beckmann ]
   * Add more copyright statements and licenses to debian/copyright.
   * Let dh_installmodules handle the modprobe blacklist config.
+  * Move cleanup of old diversions from preinst to postinst.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Mon, 08 Aug 2011 17:54:32 +0200
 

Modified: fglrx-driver/trunk/debian/fglrx-driver.postinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.postinst	2011-08-11 10:23:08 UTC (rev 720)
+++ fglrx-driver/trunk/debian/fglrx-driver.postinst	2011-08-16 12:54:36 UTC (rev 721)
@@ -4,6 +4,11 @@
 
 case "$1" in
 	configure)
+		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
+		rmdir /usr/lib/fglrx/diversions 2>/dev/null || true
+
 		if ! grep -q fglrx /etc/X11/xorg.conf /etc/X11/xorg.conf.d/*.conf 2>/dev/null; then
 			echo "**********************************************"
 			echo "NOTE: the fglrx driver is not yet configued."

Deleted: fglrx-driver/trunk/debian/fglrx-driver.preinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.preinst	2011-08-11 10:23:08 UTC (rev 720)
+++ fglrx-driver/trunk/debian/fglrx-driver.preinst	2011-08-16 12:54:36 UTC (rev 721)
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-    install|upgrade)
-		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
-		rmdir /usr/lib/fglrx/diversions 2>/dev/null || true
-    ;;
-esac
-
-#DEBHELPER#