diff -u linux-restricted-modules-2.6.24-2.6.24.12/debian/rules linux-restricted-modules-2.6.24-2.6.24.12/debian/rules --- linux-restricted-modules-2.6.24-2.6.24.12/debian/rules +++ linux-restricted-modules-2.6.24-2.6.24.12/debian/rules @@ -992,7 +992,7 @@ install $$this_dir/usr/X11R6/lib/modules/libnvidia-wfb.so.$$this_ver \ $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib/xorg/modules/; \ ln -s libnvidia-wfb.so.$$this_ver \ - $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib/xorg/modules/libwfb.so;\ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib/xorg/modules/libnvidia-wfb.so.1;\ fi; \ install $$this_dir/usr/bin/tls_test \ $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib/nvidia; \ diff -u linux-restricted-modules-2.6.24-2.6.24.12/debian/changelog linux-restricted-modules-2.6.24-2.6.24.12/debian/changelog --- linux-restricted-modules-2.6.24-2.6.24.12/debian/changelog +++ linux-restricted-modules-2.6.24-2.6.24.12/debian/changelog @@ -1,3 +1,15 @@ +linux-restricted-modules-2.6.24 (2.6.24.12-17.36) hardy-proposed; urgency=low + + * nvidia: Do not divert libwfb.so, because if the xserver provides one + it should be used. Remove the diversion in postinst. This caused at + least problems with some websites making the xserver crash (LP: #212648), + and missing or falsely colored shadows with compiz. (LP: #186382) + * fglrx: Patch authatieventsd.sh to search for xauth files from + /var/run/xauth/. Otherwise the session would freeze on logout for KDM + users. Thanks Ilja Pavkovic! (LP: #118605) + + -- Timo Aaltonen Wed, 07 May 2008 11:27:35 +0300 + linux-restricted-modules-2.6.24 (2.6.24.12-17.35) hardy-proposed; urgency=low * Kernel ABI bump to 17. diff -u linux-restricted-modules-2.6.24-2.6.24.12/debian/nvidia-glx.preinst.in linux-restricted-modules-2.6.24-2.6.24.12/debian/nvidia-glx.preinst.in --- linux-restricted-modules-2.6.24-2.6.24.12/debian/nvidia-glx.preinst.in +++ linux-restricted-modules-2.6.24-2.6.24.12/debian/nvidia-glx.preinst.in @@ -115,7 +115,6 @@ dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libGLcore.so.xlibmesa /usr/lib/xorg/modules/libGLcore.so > /dev/null dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libglx.so.xserver-xorg-core /usr/lib/xorg/modules/extensions/libglx.so > /dev/null - dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libwfb.so.xserver-xorg-core /usr/lib/xorg/modules/libwfb.so > /dev/null ;; abort-upgrade) diff -u linux-restricted-modules-2.6.24-2.6.24.12/debian/nvidia-glx.postinst.in linux-restricted-modules-2.6.24-2.6.24.12/debian/nvidia-glx.postinst.in --- linux-restricted-modules-2.6.24-2.6.24.12/debian/nvidia-glx.postinst.in +++ linux-restricted-modules-2.6.24-2.6.24.12/debian/nvidia-glx.postinst.in @@ -8,6 +8,13 @@ > /lib/linux-restricted-modules/.nvidia_@@NV_ALT@@_installed fi +# remove bogus libwfb divert, since the xserver version should be used or +# problems arise. +if [ "$(dpkg-divert --list /usr/lib/xorg/modules/libwfb.so | awk '{ print $7 }')" = "nvidia-glx@@NV_LEGACY@@" ]; then + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libwfb.so.xserver-xorg-core /usr/lib/xorg/modules/libwfb.so > /dev/null +fi + + #DEBHELPER# ldconfig only in patch2: unchanged: --- linux-restricted-modules-2.6.24-2.6.24.12.orig/ati/patches/4-authatieventsd.patch +++ linux-restricted-modules-2.6.24-2.6.24.12/ati/patches/4-authatieventsd.patch @@ -0,0 +1,34 @@ +--- common/etc/ati/authatieventsd.sh.orig 2008-03-19 10:56:01.568196236 +0100 ++++ common/etc/ati/authatieventsd.sh 2008-03-19 11:04:31.272102426 +0100 +@@ -41,6 +41,16 @@ + return 0 + fi + ++ # Check for xauth ++ XAUTH_AUTH_MASK=/var/run/xauth/A$1* ++ XAUTH_AUTH_FILE=`ls -t $XAUTH_AUTH_MASK 2>/dev/null | head -n 1` # Choose the newest file ++ if [ -n "$XAUTH_AUTH_FILE" ]; then ++ SERVER_AUTH_FILE=$XAUTH_AUTH_FILE ++ DISP_SEARCH_STRING="#ffff#" ++ return 0 ++ fi ++ ++ + # Check gdm + + GDM_AUTH_FILE=/var/lib/gdm/$1.Xauth +@@ -54,12 +64,14 @@ + + for XPID in `pidof X`; do + TRIAL_XAUTH_FILE=`tr '\0' '\n' < /proc/$XPID/environ | grep -e "^XAUTHORITY=" | cut -d= -f2` ++ if [ -n "$TRIAL_XAUTH_FILE" ]; then + TRIAL_XAUTH_KEY=`xauth -f $TRIAL_XAUTH_FILE list | grep "unix$1"` + if [ -n "$TRIAL_XAUTH_KEY" ]; then + SERVER_AUTH_FILE=$TRIAL_XAUTH_FILE + DISP_SEARCH_STRING="unix$1" + return 0 + fi ++ fi + done + + # Couldn't find the key