[Pkg-fglrx-devel] r280 - fglrx-driver/trunk/debian
Patrick Matthäi
pmatthaei at alioth.debian.org
Tue Aug 25 16:18:40 UTC 2009
Author: pmatthaei
Date: 2009-08-25 16:18:40 +0000 (Tue, 25 Aug 2009)
New Revision: 280
Modified:
fglrx-driver/trunk/debian/changelog
fglrx-driver/trunk/debian/fglrx-glx-ia32.postrm
fglrx-driver/trunk/debian/fglrx-glx-ia32.preinst
fglrx-driver/trunk/debian/fglrx-glx.postrm
fglrx-driver/trunk/debian/fglrx-glx.preinst
Log:
* Remove all hackish diversion handlings.
Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog 2009-08-23 20:55:28 UTC (rev 279)
+++ fglrx-driver/trunk/debian/changelog 2009-08-25 16:18:40 UTC (rev 280)
@@ -6,8 +6,9 @@
[ Patrick Matthäi ]
* Add acpid to recommends of fglrx-atieventsd, it is mostly useless without
the acpi daemon.
+ * Remove all hackish diversion handlings.
- -- Patrick Matthäi <pmatthaei at debian.org> Sun, 23 Aug 2009 22:54:10 +0200
+ -- Patrick Matthäi <pmatthaei at debian.org> Tue, 25 Aug 2009 18:18:16 +0200
fglrx-driver (1:9-8-1) unstable; urgency=high
Modified: fglrx-driver/trunk/debian/fglrx-glx-ia32.postrm
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.postrm 2009-08-23 20:55:28 UTC (rev 279)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.postrm 2009-08-25 16:18:40 UTC (rev 280)
@@ -16,14 +16,9 @@
# for details, see /usr/share/doc/packaging-manual/
case "$1" in
-
remove|purge|disappear)
- dpkg-divert --list | grep fglrx | grep ia32 | grep 'local diversion of' | cut -d' ' -f4 | while read i; do \
- dpkg-divert --rename --remove "$i"; done 2>/dev/null
- dpkg-divert --list | grep fglrx-glx-ia32 | grep "^diversion of" | cut -d' ' -f3 | while read i; do \
- dpkg-divert --package fglrx-glx-ia32 --rename --remove "$i"; done 2>/dev/null
- dpkg-divert --list | grep fglrx-driver | grep ia32 | grep "^diversion of" | cut -d' ' -f3 | while read i; do \
- dpkg-divert --package fglrx-driver --rename --remove "$i"; done 2>/dev/null
+ dpkg-divert --package fglrx-glx-ia32 --rename --remove /usr/lib32/libGL.so.1.2
+ dpkg-divert --package fglrx-glx-ia32 --rename --remove /usr/lib32/libGL.so.1
ldconfig
;;
Modified: fglrx-driver/trunk/debian/fglrx-glx-ia32.preinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.preinst 2009-08-23 20:55:28 UTC (rev 279)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.preinst 2009-08-25 16:18:40 UTC (rev 280)
@@ -14,20 +14,9 @@
case "$1" in
install)
- # Remove old diversion if needed.
- dpkg-divert --list | grep fglrx | grep ia32 | \
- grep 'local diversion of' | cut -d' ' -f4 | \
- grep 'libGL.so' | \
- while read i; do \
- dpkg-divert --rename --remove "$i"; done 2> /dev/null
- dpkg-divert --list | grep fglrx-driver | grep ia32 | \
- grep "^diversion of" | cut -d' ' -f3 | \
- grep 'libGL.so' | \
- while read i; do \
- dpkg-divert --package fglrx-driver --rename --remove "$i"; done 2> /dev/null
# Add new diversions.
mkdir -p /usr/lib32/fglrx/diversions
- dpkg-divert --package fglrx-glx-ia32 --divert /usr/lib32/fglrx/diversions/libGL.so.1.2 --rename /usr/lib32/libGL.so.1.2
+ dpkg-divert --package fglrx-glx-ia32 --divert /usr/lib32/fglrx/diversions/libGL.so.1.2 --rename /usr/lib32/libGL.so.1.2
dpkg-divert --package fglrx-glx-ia32 --divert /usr/lib32/fglrx/diversions/libGL.so.1 --rename /usr/lib32/libGL.so.1
;;
esac
Modified: fglrx-driver/trunk/debian/fglrx-glx.postrm
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx.postrm 2009-08-23 20:55:28 UTC (rev 279)
+++ fglrx-driver/trunk/debian/fglrx-glx.postrm 2009-08-25 16:18:40 UTC (rev 280)
@@ -19,9 +19,8 @@
case "$1" in
remove|purge|disappear)
- dpkg-divert --list | grep fglrx | grep -v ia32 | grep 'local diversion of' | cut -d' ' -f4 | while read i; do dpkg-divert --rename --remove "$i"; done 2>/dev/null
- dpkg-divert --list | grep fglrx-glx | grep -v ia32 | grep "^diversion of" | cut -d' ' -f3 | while read i; do \
- dpkg-divert --package fglrx-glx --rename --remove "$i"; done 2>/dev/null
+ dpkg-divert --package fglrx-glx --rename --remove /usr/lib/libGL.so.1.2
+ dpkg-divert --package fglrx-glx --rename --remove /usr/lib/libGL.so.1
ldconfig
;;
Modified: fglrx-driver/trunk/debian/fglrx-glx.preinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx.preinst 2009-08-23 20:55:28 UTC (rev 279)
+++ fglrx-driver/trunk/debian/fglrx-glx.preinst 2009-08-25 16:18:40 UTC (rev 280)
@@ -14,17 +14,6 @@
case "$1" in
install)
- # Remove old diversion if needed.
- dpkg-divert --list | grep fglrx | grep -v ia32 | \
- grep 'local diversion of' | cut -d' ' -f4 | \
- grep 'libGL.so' | \
- while read i; do \
- dpkg-divert --rename --remove "$i"; done 2> /dev/null
- dpkg-divert --list | grep fglrx-driver | grep -v ia32 | \
- grep "^diversion of" | cut -d' ' -f3 | \
- grep 'libGL.so' | \
- while read i; do \
- dpkg-divert --package fglrx-driver --rename --remove "$i"; done 2> /dev/null
# Add new diversion.
mkdir -p /usr/lib/fglrx/diversions
dpkg-divert --package fglrx-glx --divert /usr/lib/fglrx/diversions/libGL.so.1.2 --rename /usr/lib/libGL.so.1.2
More information about the Pkg-fglrx-devel
mailing list