xorg: Changes to 'ubuntu'
debian/apport/source_xorg.py | 2
debian/changelog | 9 ++-
debian/local/Failsafe/failsafeDexconf | 4 +
debian/local/Failsafe/failsafeXinit | 96 ++++++++++++++++------------------
debian/local/dexconf | 4 +
5 files changed, 64 insertions(+), 51 deletions(-)
New commits:
commit 74339bcc7e906a72314d12edf7d942752f677f10
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Tue Mar 17 02:16:21 2009 -0700
suppress warnings for xkbcomp
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 73e79ba..1322564 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -130,7 +130,7 @@ def add_info(report):
pass
try:
- script = subprocess.Popen(['xkbcomp', ':0', '-'], stdout=subprocess.PIPE)
+ script = subprocess.Popen(['xkbcomp', ':0', '-w0', '-'], stdout=subprocess.PIPE)
report['xkbcomp'] = script.communicate()[0]
except OSError:
pass
diff --git a/debian/changelog b/debian/changelog
index 778bd83..3a1e684 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,10 @@ xorg (1:7.4~5ubuntu16) UNRELEASED; urgency=low
* local/Failsafe/failsafeXinit:
- Use zenity for viewing logs, and vt2 for console login
- Make translatable (LP #335678)
+ * apport/source_xorg.py: Suppress warning about keyboard geometry on :0
+ (LP: #315777)
- -- Bryce Harrington <bryce@ubuntu.com> Tue, 17 Mar 2009 02:02:42 -0700
+ -- Bryce Harrington <bryce@ubuntu.com> Tue, 17 Mar 2009 02:15:37 -0700
xorg (1:7.4~5ubuntu15) jaunty; urgency=low
commit b8cadcdcfab1053032dbcfeb0c5c8e5dfbcd878f
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Tue Mar 17 02:03:05 2009 -0700
update changelog
diff --git a/debian/changelog b/debian/changelog
index e94dc33..778bd83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,10 +9,13 @@ xorg (1:7.4~5ubuntu16) UNRELEASED; urgency=low
* x11-common.links: Add apport support for a several more packages.
* local/Xsession.d/60x11-localhost: Also redirect stderr in an sh-safe
fashion
- * local/Failsafe/failsafeXinit: Use zenity for viewing logs, and vt2 for
- console login
+ * local/dexconf, local/Failsafe/failsafeDexconf:
+ - Add hooks for Sun's virtualbox (LP: #319373)
+ * local/Failsafe/failsafeXinit:
+ - Use zenity for viewing logs, and vt2 for console login
+ - Make translatable (LP #335678)
- -- Bryce Harrington <bryce@ubuntu.com> Tue, 17 Mar 2009 01:07:44 -0700
+ -- Bryce Harrington <bryce@ubuntu.com> Tue, 17 Mar 2009 02:02:42 -0700
xorg (1:7.4~5ubuntu15) jaunty; urgency=low
diff --git a/debian/local/Failsafe/failsafeXinit b/debian/local/Failsafe/failsafeXinit
index d6b715c..815c04c 100755
--- a/debian/local/Failsafe/failsafeXinit
+++ b/debian/local/Failsafe/failsafeXinit
@@ -33,21 +33,21 @@ apport_hook="/usr/share/apport/xserver_hook"
app_width=600
app_height=300
-app_title="Ubuntu Failsafe-X"
+app_title=$(gettext "Ubuntu Failsafe-X")
timestamp=$(date +%y%m%d%H%M%S)
display_main_menu() {
zenity --list \
--radiolist \
- --title "$app_title" \
+ --title $(gettext "$app_title") \
--width $app_width --height $app_height \
- --text "What would you like to do?" \
- --column "" --column "Choice" --column "" \
- TRUE LOW_RES_MODE "Run Ubuntu in low-graphics mode for just one session" \
- FALSE RECONFIGURE "Reconfigure graphics" \
- FALSE TROUBLESHOOT "Troubleshoot the error" \
- FALSE EXIT_TO_CONSOLE "Exit to console login" \
+ --text $(gettext "What would you like to do?") \
+ --column "" --column $(gettext "Choice") --column "" \
+ TRUE LOW_RES_MODE $(gettext "Run Ubuntu in low-graphics mode for just one session") \
+ FALSE RECONFIGURE $(gettext "Reconfigure graphics") \
+ FALSE TROUBLESHOOT $(gettext "Troubleshoot the error") \
+ FALSE EXIT_TO_CONSOLE $(gettext "Exit to console login") \
--hide-column 2
# TODO: 3 FILE_BUG "Report a bug about this failure" \
@@ -58,27 +58,27 @@ display_reconfigure_menu() {
zenity --list \
--radiolist \
- --title "$app_title : Reconfiguration" \
- --text "How would you like to reconfigure your display?" \
+ --title "$app_title"" : "$(gettext "Reconfiguration") \
+ --text $(gettext "How would you like to reconfigure your display?") \
--width $app_width --height $app_height \
- --column "" --column "Choice" --column "" \
- TRUE RUN_DEXCONF "Use default (generic) configuration" \
- FALSE RUN_XORGCONF "Create new configuration for this hardware" \
- FALSE SELECT_BACKUP "Use your backed-up configuration" \
+ --column "" --column $(gettext "Choice") --column "" \
+ TRUE RUN_DEXCONF $(gettext "Use default (generic) configuration") \
+ FALSE RUN_XORGCONF $(gettext "Create new configuration for this hardware") \
+ FALSE SELECT_BACKUP $(gettext "Use your backed-up configuration") \
--hide-column 2
}
display_troubleshooting_menu() {
zenity --list \
--radiolist \
- --title "$app_title : Troubleshooting" \
- --text "What information would you like to review?" \
+ --title "$app_title"" : "$(gettext "Troubleshooting") \
+ --text $(gettext "What information would you like to review?") \
--width $app_width --height $app_height \
- --column "" --column "Choice" --column "" \
- TRUE VIEW_XORG_LOG "Review the xserver log file" \
- FALSE VIEW_GDM_LOG "Review the startup errors" \
- FALSE EDIT_CONFIG "Edit configuration file" \
- FALSE SAVE_CONFIG_LOGS "Archive configuration and logs" \
+ --column "" --column $(gettext "Choice") --column "" \
+ TRUE VIEW_XORG_LOG $(gettext "Review the xserver log file") \
+ FALSE VIEW_GDM_LOG $(gettext "Review the startup errors") \
+ FALSE EDIT_CONFIG $(gettext "Edit configuration file") \
+ FALSE SAVE_CONFIG_LOGS $(gettext "Archive configuration and logs") \
--hide-column 2
# TODO: 5 VERIFY_XORGCONF "Check configuration file"
}
@@ -89,12 +89,12 @@ display_filebug_menu() {
if [ -e $apport_hook ]; then
$apport_hook
if [ $? == 0]; then
- zenity --info --text "A bug report has been written.\nYou can send it next time you log in."
+ zenity --info --text $(gettext "A bug report has been written.\nYou can send it next time you log in.")
else
- zenity --error --text "Your bug could not be recorded successfully.\n"
+ zenity --error --text $(gettext "Your bug could not be recorded successfully.\n")
fi
else
- zenity --error --text "Cannot file bug: $apport_hook is not present."
+ zenity --error --text $(gettext "Cannot file bug: $apport_hook is not present.")
fi
}
@@ -103,7 +103,7 @@ backup_xorg_conf() {
xorg_conf_backup="/etc/X11/xorg.conf-backup-${timestamp}"
cp /etc/X11/xorg_conf ${xorg_conf_backup}
if [ ! $? ]; then
- return zenity --question --text "Your config could not be backed up.\nDo you want to continue anyway?\n"
+ return zenity --question --text ($gettext "Your config could not be backed up.\nDo you want to continue anyway?\n")
fi
}
@@ -112,10 +112,10 @@ run_dexconf() {
dexconf
if [ $? == 0 ]; then
- zenity --info --text "Your configuration has been restored to default,\nand your old configuration backed up.\nPlease restart.\n"
+ zenity --info --text $(gettext "Your configuration has been restored to default,\nand your old configuration backed up.\nPlease restart.\n")
else
# TODO: Copy $xorg_conf_backup to $xorg_conf if it exists
- zenity --error --text "Failure restoring configuration to default.\nYour config has not been changed."
+ zenity --error --text $(gettext "Failure restoring configuration to default.\nYour config has not been changed.")
fi
}
@@ -124,9 +124,9 @@ run_xorgconf() {
Xorg :99 -configure
if [ $? == 0 ]; then
- zenity --info --text "A new configuration has been generated,\nand your old configuration backed up.\nPlease restart.\n"
+ zenity --info --text $(gettext "A new configuration has been generated,\nand your old configuration backed up.\nPlease restart.\n")
else
- zenity --error --text "Could not generate a new configuration"
+ zenity --error --text $(gettext "Could not generate a new configuration")
fi
}
@@ -140,7 +140,7 @@ view_gdm_log() {
verify_xorgconf() {
# Run Alberto's xorg.conf checker (once it's available in main)
- zenity --error --text "Sorry, this option is not implemented yet"
+ zenity --error --text $(gettext "Sorry, this option is not implemented yet")
}
edit_config() {
@@ -168,16 +168,16 @@ save_config_logs() {
tar -cf ${xorg_backup_file} ${xorg_backup_dir}
rm -rf ${xorg_backup_dir}
- zenity --info --text "Relevant configuration and log files have been saved to:\n$xorg_backup_file\nBug reports can be submitted at http://www.launchpad.net/ubuntu/.\n";
+ zenity --info --text $(gettext "Relevant configuration and log files have been saved to:\n")"$xorg_backup_file\n"$(gettext "Bug reports can be submitted at http://www.launchpad.net/ubuntu/.\n";)
}
# Scan Xorg.0.log for errors
LOG_ERRORS=$(grep -e "^(EE)" $xorg_log)
if [ -z "$LOG_ERRORS" ]; then
- zenity --warning --text "<big><b>Ubuntu is running in low-graphics mode</b></big>\n\nYour screen, graphics card, and input device settings\ncould not be detected correctly. You will need to configure these yourself."
+ zenity --warning --text $(gettext "<big><b>Ubuntu is running in low-graphics mode</b></big>\n\nYour screen, graphics card, and input device settings\ncould not be detected correctly. You will need to configure these yourself.")
else
- zenity --warning --text "<big><b>Ubuntu is running in low-graphics mode</b></big>\n\nThe following error was encountered. You may need\nto update your configuration to solve this.\n\n${LOG_ERRORS}"
+ zenity --warning --text $(gettext "<big><b>Ubuntu is running in low-graphics mode</b></big>\n\nThe following error was encountered. You may need\nto update your configuration to solve this.\n\n")"${LOG_ERRORS}"
fi
# TODO: Add --window-icon "$app_icon" to all zenity windows
@@ -218,5 +218,5 @@ else
fi
/etc/init.d/gdm restart | \
- zenity --progress --pulsate --text "Stand by one minute while the display restarts..."
+ zenity --progress --pulsate --text $(gettext "Stand by one minute while the display restarts...")
commit 9d43e3081312785ab614925c57f6261c09d3619e
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Tue Mar 17 02:02:27 2009 -0700
Also add virtualbox support to the main dexconf
diff --git a/debian/local/dexconf b/debian/local/dexconf
index 0c5bb37..5636deb 100755
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -192,6 +192,10 @@ QEMU_KVM=$(grep "QEMU Virtual CPU" /proc/cpuinfo || true)
if [ -n "$QEMU_KVM" ]; then
DEVICE_DRIVER="cirrus"
fi
+VBOX_VIDEO=$(grep -e "^vbox " /proc/modules || true)
+if [ -n "$VBOX_VIDEO" ]; then
+ DEVICE_DRIVER="vboxvideo"
+fi
exec 4>"$DEXCONFTMPDIR/Device"
cat >&4 <<SECTION
commit 2d4947083bf8b9470235afce5fda0138bdc56be8
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Tue Mar 17 01:59:58 2009 -0700
Add support for virtualbox in failsafeDexconf
diff --git a/debian/local/Failsafe/failsafeDexconf b/debian/local/Failsafe/failsafeDexconf
index ff51c5d..5ee395e 100755
--- a/debian/local/Failsafe/failsafeDexconf
+++ b/debian/local/Failsafe/failsafeDexconf
@@ -193,6 +193,10 @@ QEMU_KVM=$(grep "QEMU Virtual CPU" /proc/cpuinfo || true)
if [ -n "$QEMU_KVM" ]; then
DEVICE_DRIVER="cirrus"
fi
+VBOX_VIDEO=$(grep -e "^vbox " /proc/modules || true)
+if [ -n "$VBOX_VIDEO" ]; then
+ DEVICE_DRIVER="vboxvideo"
+fi
exec 4>"$DEXCONFTMPDIR/Device"
cat >&4 <<SECTION
commit a9adafaca93acc2a2e514d880dbf75a6a62f2a34
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Tue Mar 17 01:14:42 2009 -0700
commit msg
diff --git a/debian/changelog b/debian/changelog
index 0ef1c26..e94dc33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,10 @@ xorg (1:7.4~5ubuntu16) UNRELEASED; urgency=low
* x11-common.links: Add apport support for a several more packages.
* local/Xsession.d/60x11-localhost: Also redirect stderr in an sh-safe
fashion
+ * local/Failsafe/failsafeXinit: Use zenity for viewing logs, and vt2 for
+ console login
- -- Bryce Harrington <bryce@ubuntu.com> Thu, 12 Mar 2009 16:21:48 -0700
+ -- Bryce Harrington <bryce@ubuntu.com> Tue, 17 Mar 2009 01:07:44 -0700
xorg (1:7.4~5ubuntu15) jaunty; urgency=low
commit 76983fc38822121ed2878aef7575a6158a89c07a
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Tue Mar 17 01:14:19 2009 -0700
Clarify gdm log file handling
diff --git a/debian/local/Failsafe/failsafeXinit b/debian/local/Failsafe/failsafeXinit
index afcb3c4..d6b715c 100755
--- a/debian/local/Failsafe/failsafeXinit
+++ b/debian/local/Failsafe/failsafeXinit
@@ -26,7 +26,9 @@ with_gdm=$2
display=0
xorg_log="/var/log/Xorg.${display}.log"
-gdm_log="/var/log/gdm/:${display}.log.1"
+gdm_log="/var/log/gdm/:${display}.log"
+gdm_log_1="/var/log/gdm/:${display}.log.1"
+gdm_log_2="/var/log/gdm/:${display}.log.2"
apport_hook="/usr/share/apport/xserver_hook"
app_width=600
@@ -133,7 +135,7 @@ view_xorg_log() {
}
view_gdm_log() {
- zenity --text-info --filename=$gdm_log --width=640 --height=480
+ zenity --text-info --filename=${gdm_log_1} --width=640 --height=480
}
verify_xorgconf() {
@@ -159,12 +161,12 @@ save_config_logs() {
cp ${xorg_log} $xorg_backup_dir
cp ${xorg_log}.old $xorg_backup_dir
cp ${gdm_log} $xorg_backup_dir
- cp ${gdm_log}.1 $xorg_backup_dir
- cp ${gdm_log}.2 $xorg_backup_dir
+ cp ${gdm_log_1} $xorg_backup_dir
+ cp ${gdm_log_2} $xorg_backup_dir
lspci -vvnn > ${xorg_backup_dir}/lspci-vvnn.txt
xrandr --verbose > ${xorg_backup_dir}/xrandr-verbose.txt
- tar -cf $xorg_backup_file $xorg_backup_dir
- rm -rf $xorg_backup_dir
+ tar -cf ${xorg_backup_file} ${xorg_backup_dir}
+ rm -rf ${xorg_backup_dir}
zenity --info --text "Relevant configuration and log files have been saved to:\n$xorg_backup_file\nBug reports can be submitted at http://www.launchpad.net/ubuntu/.\n";
}
commit 029906ec2273c6ac34c90f5a74746d0bd2e0605b
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Tue Mar 17 01:06:36 2009 -0700
Fix up console login, just go to vt 2 instead of launching gnome-terminal
diff --git a/debian/local/Failsafe/failsafeXinit b/debian/local/Failsafe/failsafeXinit
index 66b22ee..afcb3c4 100755
--- a/debian/local/Failsafe/failsafeXinit
+++ b/debian/local/Failsafe/failsafeXinit
@@ -42,10 +42,10 @@ display_main_menu() {
--width $app_width --height $app_height \
--text "What would you like to do?" \
--column "" --column "Choice" --column "" \
- TRUE LOW_RES_MODE "Run Ubuntu in low-graphics mode for just this session" \
+ TRUE LOW_RES_MODE "Run Ubuntu in low-graphics mode for just one session" \
FALSE RECONFIGURE "Reconfigure graphics" \
FALSE TROUBLESHOOT "Troubleshoot the error" \
- FALSE TERMINAL "Open a terminal" \
+ FALSE EXIT_TO_CONSOLE "Exit to console login" \
--hide-column 2
# TODO: 3 FILE_BUG "Report a bug about this failure" \
@@ -79,7 +79,6 @@ display_troubleshooting_menu() {
FALSE SAVE_CONFIG_LOGS "Archive configuration and logs" \
--hide-column 2
# TODO: 5 VERIFY_XORGCONF "Check configuration file"
-# TODO: 6 EXIT_TO_CONSOLE "Exit to console" \
}
# TODO: Should we just go ahead and file a bug for them without presenting an option?
@@ -106,10 +105,6 @@ backup_xorg_conf() {
fi
}
-run_terminal() {
- gksudo gnome-terminal
-}
-
run_dexconf() {
backup_xorg_conf || return 1
@@ -192,7 +187,6 @@ while : ; do
RECONFIGURE ) choice=$(display_reconfigure_menu) ;;
TROUBLESHOOT ) choice=$(display_troubleshooting_menu) ;;
FILE_BUG ) choice=$(display_filebug_menu) ;;
- TERMINAL ) run_terminal ;;
## Reconfigure Menu ##
RUN_DEXCONF ) choice="RECONFIGURE"; run_dexconf ;;
@@ -217,6 +211,7 @@ if [ "x$with_gdm" = "xwith-gdm" ]; then
elif [ "x$with_gdm" = "xlow-res" ]; then
export XORGCONFIG=${xorg_conf}
else
+ chvt 2
exit
fi
commit 67fcd28db00bc6502d074fe627ce8786c8cd17c2
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Tue Mar 17 00:57:02 2009 -0700
Increase app_width for longer strings
diff --git a/debian/local/Failsafe/failsafeXinit b/debian/local/Failsafe/failsafeXinit
index e01835b..66b22ee 100755
--- a/debian/local/Failsafe/failsafeXinit
+++ b/debian/local/Failsafe/failsafeXinit
@@ -29,7 +29,7 @@ xorg_log="/var/log/Xorg.${display}.log"
gdm_log="/var/log/gdm/:${display}.log.1"
apport_hook="/usr/share/apport/xserver_hook"
-app_width=300
+app_width=600
app_height=300
app_title="Ubuntu Failsafe-X"
@@ -45,9 +45,9 @@ display_main_menu() {
TRUE LOW_RES_MODE "Run Ubuntu in low-graphics mode for just this session" \
FALSE RECONFIGURE "Reconfigure graphics" \
FALSE TROUBLESHOOT "Troubleshoot the error" \
+ FALSE TERMINAL "Open a terminal" \
--hide-column 2
-# FALSE TERMINAL "Open a terminal" \
# TODO: 3 FILE_BUG "Report a bug about this failure" \
}
@@ -106,10 +106,9 @@ backup_xorg_conf() {
fi
}
-#run_terminal() {
-# Causes bug #310126
-# gnome-terminal
-#}
+run_terminal() {
+ gksudo gnome-terminal
+}
run_dexconf() {
backup_xorg_conf || return 1
@@ -135,11 +134,11 @@ run_xorgconf() {
}
view_xorg_log() {
- gedit $xorg_log
+ zenity --text-info --filename=$xorg_log --width=640 --height=480
}
view_gdm_log() {
- gedit $gdm_log
+ zenity --text-info --filename=$gdm_log --width=640 --height=480
}
verify_xorgconf() {
@@ -150,7 +149,9 @@ verify_xorgconf() {
edit_config() {
backup_xorg_conf || return 1
- gksu gedit "/etc/X11/xorg.conf"
+ 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"
}
save_config_logs() {
commit 3771fb0f96da0ae95d1a5486e8a798326dbe0f66
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Mon Mar 16 19:32:40 2009 -0700
The gdm log is actually the *previous* one since the current one is the
log for the bulletproof-x session.
diff --git a/debian/local/Failsafe/failsafeXinit b/debian/local/Failsafe/failsafeXinit
index 2aa5731..e01835b 100755
--- a/debian/local/Failsafe/failsafeXinit
+++ b/debian/local/Failsafe/failsafeXinit
@@ -26,7 +26,7 @@ with_gdm=$2
display=0
xorg_log="/var/log/Xorg.${display}.log"
-gdm_log="/var/log/gdm/:${display}.log"
+gdm_log="/var/log/gdm/:${display}.log.1"
apport_hook="/usr/share/apport/xserver_hook"
app_width=300
Reply to: