diff -Nru /tmp/cNac2C98cy/xresprobe-0.4.24ubuntu6/debian/changelog /tmp/lc2paVGus5/xresprobe-0.4.24ubuntu7/debian/changelog --- /tmp/cNac2C98cy/xresprobe-0.4.24ubuntu6/debian/changelog 2007-10-10 08:26:19.000000000 -0700 +++ /tmp/lc2paVGus5/xresprobe-0.4.24ubuntu7/debian/changelog 2007-10-15 00:18:54.000000000 -0700 @@ -1,3 +1,11 @@ +xresprobe (0.4.24ubuntu7) gutsy; urgency=low + + * Expanding the previous xprobe.sh fix, to prevent calling + xprobe.sh for -intel even if the ddcprobe failed. + (Re-closes LP: #127008) + + -- Bryce Harrington Mon, 15 Oct 2007 00:18:33 -0700 + xresprobe (0.4.24ubuntu6) gutsy; urgency=low [Tormod Volden] diff -Nru /tmp/cNac2C98cy/xresprobe-0.4.24ubuntu6/xresprobe /tmp/lc2paVGus5/xresprobe-0.4.24ubuntu7/xresprobe --- /tmp/cNac2C98cy/xresprobe-0.4.24ubuntu6/xresprobe 2007-09-27 14:37:25.000000000 -0700 +++ /tmp/lc2paVGus5/xresprobe-0.4.24ubuntu7/xresprobe 2007-10-15 00:18:19.000000000 -0700 @@ -141,7 +141,7 @@ if [ "$(uname -m)" = "ppc" ] || [ "$(uname -m)" = "ppc64" ] || [ "x$DRIVER" = "xintel" ]; then doddc fi - if [ -z "$RES" ]; then + if [ -z "$RES" ] && [ ! $"x$DRIVER" = "xintel" ]; then doprobe fi DISPTYPE="lcd/lvds"