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

[Patrick Matthäi]

Author: pmatthaei
Date: 2011-06-22 20:42:28 +0000 (Wed, 22 Jun 2011)
New Revision: 609

Added:
   fglrx-driver/trunk/debian/fglrx-glx.preinst
Modified:
   fglrx-driver/trunk/debian/fglrx-driver.preinst
Log:
Remove old diversions.


Modified: fglrx-driver/trunk/debian/fglrx-driver.preinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.preinst	2011-06-22 20:17:11 UTC (rev 608)
+++ fglrx-driver/trunk/debian/fglrx-driver.preinst	2011-06-22 20:42:28 UTC (rev 609)
@@ -4,9 +4,12 @@
 
 case "$1" in
     install|upgrade)
-		if [ -f /usr/lib/fglrx/diversions/libdri.so ] ; then
+		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
+		if [ -f /usr/lib/fglrx/diversions/libglx.so ]; then
+			dpkg-divert --package fglrx-driver --rename --remove /usr/lib/xorg/modules/extensions/libglx.so || true
+		fi
 		rmdir /usr/lib/fglrx/diversions 2>/dev/null || true
     ;;
 esac

Added: fglrx-driver/trunk/debian/fglrx-glx.preinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx.preinst	                        (rev 0)
+++ fglrx-driver/trunk/debian/fglrx-glx.preinst	2011-06-22 20:42:28 UTC (rev 609)
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    install|upgrade)
+		if [ -f /usr/lib/fglrx/diversions/libGL.so.1 ]; then
+			dpkg-divert --package fglrx-glx --rename --remove /usr/lib/libGL.so.1 || true
+		fi
+		if [ -f /usr/lib/fglrx/diversions/libGL.so.1.2 ]; then
+			dpkg-divert --package fglrx-glx --rename --remove /usr/lib/libGL.so.1.2 || true
+		fi
+		rmdir /usr/lib/fglrx/diversions 2>/dev/null || true
+    ;;
+esac
+
+#DEBHELPER#