Summary
Description: The git repository for the ATI/AMD fglrx packaging scripts.
Last Change: Thu 2/4/10 2:40
Recent Commits
>
--git a/Ubuntu/ChangeLog b/Ubuntu/ChangeLog
index 194509a..ba7678b 100755
--- a/Ubuntu/ChangeLog
+++ b/Ubuntu/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-08 Mario Limonciello <superm1@ubuntu.com>
+ * dists/intrepid/{xorg-driver-fglrx.preinst,xorg-driver-fglrx.postrm,xorg-driver-fglrx.install.in}:
+ - Divert the real libdri, but install the AMD one
+
2008-08-06 Mario Limonciello <superm1@ubuntu.com>
* dists/intrepid/control:
- Adjust build depends to include libgl1-mesa-glx for symlink
diff --git a/Ubuntu/dists/intrepid/xorg-driver-fglrx.install.in b/Ubuntu/dists/intrepid/xorg-driver-fglrx.install.in
index 3f17114..f2c45dc 100644
--- a/Ubuntu/dists/intrepid/xorg-driver-fglrx.install.in
+++ b/Ubuntu/dists/intrepid/xorg-driver-fglrx.install.in
@@ -18,3 +18,4 @@ arch/#ARCH#/usr/X11R6/#LIBDIR#/modules/dri #DRIDIR#
#XARCH#/usr/X11R6/#LIBDIR#/modules/*.so #XMODDIR#
#XARCH#/usr/X11R6/#LIBDIR#/modules/drivers #XMODDIR#
#XARCH#/usr/X11R6/#LIBDIR#/modules/linux #XMODDIR#
+#XARCH#/usr/X11R6/#LIBDIR#/modules/extensions #XMODDIR#
diff --git a/Ubuntu/dists/intrepid/xorg-driver-fglrx.postrm b/Ubuntu/dists/intrepid/xorg-driver-fglrx.postrm
index 7f6d9ed..3e10d3c 100644
--- a/Ubuntu/dists/intrepid/xorg-driver-fglrx.postrm
+++ b/Ubuntu/dists/intrepid/xorg-driver-fglrx.postrm
@@ -22,6 +22,7 @@ case "$1" in
remove|purge)
dpkg-divert --remove --rename --package $PKGNAME --divert /usr/lib/fglrx/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null
dpkg-divert --remove --rename --package $PKGNAME --divert /usr/lib32/fglrx/libGL.so.1.2.xlibmesa /usr/lib32/libGL.so.1.2 > /dev/null
+ dpkg-divert --remove --rename --package $PKGNAME --divert /usr/lib/fglrx/libdri.so.xlibmesa /usr/lib/xorg/modules/extensions/libdri.so > /dev/null
;;
upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/Ubuntu/dists/intrepid/xorg-driver-fglrx.preinst b/Ubuntu/dists/intrepid/xorg-driver-fglrx.preinst
index e61cca4..9428e91 100644
--- a/Ubuntu/dists/intrepid/xorg-driver-fglrx.preinst
+++ b/Ubuntu/dists/intrepid/xorg-driver-fglrx.preinst
@@ -59,14 +59,15 @@ fix_diversions()
case "$1" in
install|upgrade)
- # remove old fglrx diversions
+ ### remove old fglrx diversions ###
fix_diversions
- # make new diversions
- if [ ! -d /usr/lib/fglrx ]; then
+ ### make new diversions ###
+ if [ ! -d /usr/lib/fglrx ]; then ###
mkdir -p /usr/lib/fglrx
fi
dpkg-divert --add --rename --package $PKGNAME --divert /usr/lib/fglrx/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null
+ dpkg-divert --add --rename --package $PKGNAME --divert /usr/lib/fglrx/libdri.so.xlibmesa /usr/lib/xorg/modules/extensions/libdri.so > /dev/null
if [ -n "$HAS_LIB32" ]; then
if [ ! -d /usr/lib32/fglrx ];
Copyright © 2010 by Phoronix Media