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

[Patrick Matthäi]

Author: pmatthaei
Date: 2011-07-04 18:46:45 +0000 (Mon, 04 Jul 2011)
New Revision: 635

Removed:
   fglrx-driver/trunk/debian/fglrx-glx.preinst
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/fglrx-driver.preinst
Log:
* Do not remove old diversions, which are handled by glx-diversions now.


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-07-04 18:20:47 UTC (rev 634)
+++ fglrx-driver/trunk/debian/changelog	2011-07-04 18:46:45 UTC (rev 635)
@@ -3,8 +3,9 @@
   * Do not pass the DISP_AUTH_KEY visible on the command line visible for
     everyone.
     Closes: #625868
+  * Do not remove old diversions, which are handled by glx-diversions now.
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Mon, 04 Jul 2011 20:17:42 +0200
+ -- Patrick Matthäi <pmatthaei at debian.org>  Mon, 04 Jul 2011 20:46:08 +0200
 
 fglrx-driver (1:11-6-2) unstable; urgency=high
 

Modified: fglrx-driver/trunk/debian/fglrx-driver.preinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.preinst	2011-07-04 18:20:47 UTC (rev 634)
+++ fglrx-driver/trunk/debian/fglrx-driver.preinst	2011-07-04 18:46:45 UTC (rev 635)
@@ -7,9 +7,6 @@
 		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

Deleted: fglrx-driver/trunk/debian/fglrx-glx.preinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx.preinst	2011-07-04 18:20:47 UTC (rev 634)
+++ fglrx-driver/trunk/debian/fglrx-glx.preinst	2011-07-04 18:46:45 UTC (rev 635)
@@ -1,17 +0,0 @@
-#!/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#