diff -Nru xorg-7.5+1ubuntu6/debian/changelog xorg-7.5+1ubuntu7/debian/changelog --- xorg-7.5+1ubuntu6/debian/changelog 2010-02-19 06:03:07.000000000 +0000 +++ xorg-7.5+1ubuntu7/debian/changelog 2010-02-23 06:42:45.000000000 +0000 @@ -1,8 +1,22 @@ +xorg (1:7.5+1ubuntu7) lucid; urgency=low + + * debian/local/Failsafe/failsafeXServer: + + Actually produce xorg.conf.failsafe with the detected driver. + Important for failures while running in KMS mode. + (LP: #496773) + + Force overwrite of existing xorg.conf.failsafe. Since above + change produces different xorg.conf.failsafe's depending on + what driver was selected, we must force it to regen each time. + (LP: #480747) + + -- Bryce Harrington Mon, 22 Feb 2010 22:38:22 -0800 + xorg (1:7.5+1ubuntu6) lucid; urgency=low - * Fix $OPTIONFILE parsing to only match keywords on the beginning of lines. + * debian/scripts/*: Revert last change; we still need -nv for riva and a + few other oddball cases. - -- Martin Pitt Fri, 19 Feb 2010 07:02:48 +0100 + -- Bryce Harrington Thu, 18 Feb 2010 23:57:54 -0800 xorg (1:7.5+1ubuntu5) lucid; urgency=low diff -Nru xorg-7.5+1ubuntu6/debian/local/Failsafe/failsafeXServer xorg-7.5+1ubuntu7/debian/local/Failsafe/failsafeXServer --- xorg-7.5+1ubuntu6/debian/local/Failsafe/failsafeXServer 2010-02-19 00:02:02.000000000 +0000 +++ xorg-7.5+1ubuntu7/debian/local/Failsafe/failsafeXServer 2010-02-23 06:37:57.000000000 +0000 @@ -109,12 +109,11 @@ # If a matching entry is found, then use VGA 640x480/16 mode driver=$(get_driver) -# If no failsafe xorg.conf exists, generate a stock one -if [ ! -e $xorg_conf_failsafe ]; then - cat > $xorg_conf_failsafe < $xorg_conf_failsafe <> $failsafe_log @@ -135,8 +133,6 @@ warn "Cannot write to $failsafe_log" fi -# TODO: Start up the failsafe X session using their regular user account - if pidof /usr/sbin/gdm ; then clientargs="${clientargs} with-gdm" fi diff -Nru xorg-7.5+1ubuntu6/debian/local/Xsession.d/20x11-common_process-args xorg-7.5+1ubuntu7/debian/local/Xsession.d/20x11-common_process-args --- xorg-7.5+1ubuntu6/debian/local/Xsession.d/20x11-common_process-args 2010-02-19 06:02:45.000000000 +0000 +++ xorg-7.5+1ubuntu7/debian/local/Xsession.d/20x11-common_process-args 2010-02-19 03:27:09.000000000 +0000 @@ -5,14 +5,6 @@ # read OPTIONFILE OPTIONS=$(cat "$OPTIONFILE") || true -has_option() { - if [ "${OPTIONS#* -$1}" != "$OPTIONS" ]; then - return 0 - else - return 1 - fi -} # Determine how many arguments were provided. case $# in @@ -24,7 +16,7 @@ case "$1" in failsafe) # Failsafe session was requested. - if has_option allow-failsafe; then + if [ "${OPTIONS#*allow-failsafe}" != "$OPTIONS" ]; then if [ -e /usr/bin/x-terminal-emulator ]; then if [ -x /usr/bin/x-terminal-emulator ]; then exec x-terminal-emulator -geometry +1+1 diff -Nru xorg-7.5+1ubuntu6/debian/local/Xsession.d/30x11-common_xresources xorg-7.5+1ubuntu7/debian/local/Xsession.d/30x11-common_xresources --- xorg-7.5+1ubuntu6/debian/local/Xsession.d/30x11-common_xresources 2010-02-19 06:02:45.000000000 +0000 +++ xorg-7.5+1ubuntu7/debian/local/Xsession.d/30x11-common_xresources 2010-02-19 03:27:09.000000000 +0000 @@ -13,7 +13,7 @@ fi fi -if has_option allow-user-resources && [ -f "$USRRESOURCES" ]; then +if [ "${OPTIONS#*allow-user-resources}" != "$OPTIONS" ] && [ -f "$USRRESOURCES" ]; then if type xrdb >/dev/null 2>&1; then xrdb -merge $USRRESOURCES else diff -Nru xorg-7.5+1ubuntu6/debian/local/Xsession.d/50x11-common_determine-startup xorg-7.5+1ubuntu7/debian/local/Xsession.d/50x11-common_determine-startup --- xorg-7.5+1ubuntu6/debian/local/Xsession.d/50x11-common_determine-startup 2010-02-19 06:02:45.000000000 +0000 +++ xorg-7.5+1ubuntu7/debian/local/Xsession.d/50x11-common_determine-startup 2010-02-19 03:27:09.000000000 +0000 @@ -7,7 +7,7 @@ # executable, fall back to looking for a user's custom X session script, if # allowed by the options file. if [ -z "$STARTUP" ]; then - if has_option allow-user-session; then + if [ "${OPTIONS#*allow-user-session}" != "$OPTIONS" ]; then for STARTUPFILE in "$USERXSESSION" "$ALTUSERXSESSION"; do if [ -e "$STARTUPFILE" ]; then if [ -x "$STARTUPFILE" ]; then @@ -36,7 +36,7 @@ # If we still have not found a startup program, give up. if [ -z "$STARTUP" ]; then ERRMSG="unable to start X session ---" - if has_option allow-user-session; then + if [ "${OPTIONS#*allow-user-session}" != "$OPTIONS" ]; then ERRMSG="$ERRMSG no \"$USERXSESSION\" file, no \"$ALTUSERXSESSION\" file," fi errormsg "$ERRMSG no session managers, no window managers, and no terminal" \ diff -Nru xorg-7.5+1ubuntu6/debian/local/Xsession.d/90x11-common_ssh-agent xorg-7.5+1ubuntu7/debian/local/Xsession.d/90x11-common_ssh-agent --- xorg-7.5+1ubuntu6/debian/local/Xsession.d/90x11-common_ssh-agent 2010-02-19 06:02:45.000000000 +0000 +++ xorg-7.5+1ubuntu7/debian/local/Xsession.d/90x11-common_ssh-agent 2010-02-19 03:27:09.000000000 +0000 @@ -6,7 +6,7 @@ SSHAGENT=/usr/bin/ssh-agent SSHAGENTARGS= -if has_option use-ssh-agent; then +if [ "${OPTIONS#*use-ssh-agent}" != "$OPTIONS" ]; then if [ -x "$SSHAGENT" ] && [ -z "$SSH_AUTH_SOCK" ] \ && [ -z "$SSH2_AUTH_SOCK" ]; then STARTSSH=yes diff -Nru xorg-7.5+1ubuntu6/debian/scripts/vars.amd64 xorg-7.5+1ubuntu7/debian/scripts/vars.amd64 --- xorg-7.5+1ubuntu6/debian/scripts/vars.amd64 2010-02-19 03:54:58.000000000 +0000 +++ xorg-7.5+1ubuntu7/debian/scripts/vars.amd64 2010-02-19 07:56:50.000000000 +0000 @@ -14,6 +14,7 @@ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ xserver-xorg-video-nouveau, \ + xserver-xorg-video-nv, \ xserver-xorg-video-rendition, \ xserver-xorg-video-s3, \ xserver-xorg-video-s3virge, \ diff -Nru xorg-7.5+1ubuntu6/debian/scripts/vars.i386 xorg-7.5+1ubuntu7/debian/scripts/vars.i386 --- xorg-7.5+1ubuntu6/debian/scripts/vars.i386 2010-02-19 03:55:09.000000000 +0000 +++ xorg-7.5+1ubuntu7/debian/scripts/vars.i386 2010-02-19 07:57:15.000000000 +0000 @@ -16,6 +16,7 @@ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ xserver-xorg-video-nouveau, \ + xserver-xorg-video-nv, \ xserver-xorg-video-rendition, \ xserver-xorg-video-s3, \ xserver-xorg-video-s3virge, \ diff -Nru xorg-7.5+1ubuntu6/debian/scripts/vars.powerpc xorg-7.5+1ubuntu7/debian/scripts/vars.powerpc --- xorg-7.5+1ubuntu6/debian/scripts/vars.powerpc 2010-02-19 03:55:18.000000000 +0000 +++ xorg-7.5+1ubuntu7/debian/scripts/vars.powerpc 2010-02-19 07:57:38.000000000 +0000 @@ -8,6 +8,7 @@ xserver-xorg-video-fbdev, \ xserver-xorg-video-mga, \ xserver-xorg-video-nouveau, \ + xserver-xorg-video-nv, \ xserver-xorg-video-s3, \ xserver-xorg-video-s3virge, \ xserver-xorg-video-savage, \ diff -Nru xorg-7.5+1ubuntu6/debian/scripts/vars.ppc64 xorg-7.5+1ubuntu7/debian/scripts/vars.ppc64 --- xorg-7.5+1ubuntu6/debian/scripts/vars.ppc64 2010-02-19 03:55:30.000000000 +0000 +++ xorg-7.5+1ubuntu7/debian/scripts/vars.ppc64 2010-02-19 07:57:49.000000000 +0000 @@ -8,6 +8,7 @@ xserver-xorg-video-fbdev, \ xserver-xorg-video-mga, \ xserver-xorg-video-nouveau, \ + xserver-xorg-video-nv, \ xserver-xorg-video-s3, \ xserver-xorg-video-s3virge, \ xserver-xorg-video-savage, \