xorg: Changes to 'ubuntu'

[Bryce Harrington <bryce-guest@alioth.debian.org>]

 debian/changelog                    |    8 ++++++++
 debian/local/Failsafe/failsafeXinit |    6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 3986b09ea46ba5c2f02f734172d578a6cfa57128
Author: Bryce Harrington <bryce@bryceharrington.org>
Date:   Tue Mar 24 13:41:29 2009 -0700

    Fix up edit_config() to handle error conditions better

diff --git a/debian/changelog b/debian/changelog
index 29a9685..b8abf20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.4~5ubuntu17) UNRELEASED; urgency=low
+
+  * local/Failsafe/failsafeXinit:
+    - Fix typo in xorg.conf filename
+    - Handle ESC key hits in zenity to not create a 0-length xorg.conf
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Tue, 24 Mar 2009 13:40:19 -0700
+
 xorg (1:7.4~5ubuntu16) jaunty; urgency=low
 
   [Tormod Volden]
diff --git a/debian/local/Failsafe/failsafeXinit b/debian/local/Failsafe/failsafeXinit
index b616039..73a6651 100755
--- a/debian/local/Failsafe/failsafeXinit
+++ b/debian/local/Failsafe/failsafeXinit
@@ -101,7 +101,7 @@ display_filebug_menu() {
 backup_xorg_conf() {
     # TODO: backup xorg.conf more elegantly...
     xorg_conf_backup="/etc/X11/xorg.conf-backup-${timestamp}"
-    cp /etc/X11/xorg_conf ${xorg_conf_backup}
+    cp /etc/X11/xorg.conf ${xorg_conf_backup}
     if [ ! $? ]; then
         return zenity --question --text "$(gettext 'Your config could not be backed up.\nDo you want to continue anyway?\n')"
     fi
@@ -147,8 +147,8 @@ edit_config() {
     backup_xorg_conf || return 1
 
     xorg_conf_tmp=$(mktmp "/tmp/xorg.conf.XXXXXXXX")
-    cp /etc/X11/xorg_conf ${xorg_conf_tmp}
-    zenity --text-info --editable --filename=${xorg_conf_tmp} --width=640 --height=480 > "/etc/X11/xorg.conf"
+    cp /etc/X11/xorg.conf ${xorg_conf_tmp}
+    zenity --text-info --editable --filename=/etc/X11/xorg.conf --width=640 --height=480 > "${xorg_conf_tmp}" && mv "${xorg_conf_tmp}" /etc/X11/xorg.conf
 }
 
 save_config_logs() {