xorg: Changes to 'ubuntu'
debian/changelog | 9 ++--
debian/local/Failsafe/failsafeXinit | 72 ++++++++++++++++----------------
debian/local/Xsession.d/60x11-localhost | 4 -
debian/x11-common.postinst.in | 3 +
4 files changed, 45 insertions(+), 43 deletions(-)
New commits:
commit 9d2e31d72be2a74dfd831c9bd7b18ffc39ece216
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Wed Mar 18 01:41:17 2009 -0700
Rename Xsessions localhost file
diff --git a/debian/changelog b/debian/changelog
index 3a1e684..e5dc334 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,11 @@ xorg (1:7.4~5ubuntu16) UNRELEASED; urgency=low
[Bryce Harrington]
* 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/Xsession.d/60x11-common_localhost:
+ - Rename from 60x11-localhost for consistency (LP: #340807)
+ - Redirect stderr in an sh-safe fashion
+ * x11-common.postinst.in:
+ - Remove renamed 60x11-localhost
* local/dexconf, local/Failsafe/failsafeDexconf:
- Add hooks for Sun's virtualbox (LP: #319373)
* local/Failsafe/failsafeXinit:
@@ -17,7 +20,7 @@ xorg (1:7.4~5ubuntu16) UNRELEASED; urgency=low
* apport/source_xorg.py: Suppress warning about keyboard geometry on :0
(LP: #315777)
- -- Bryce Harrington <bryce@ubuntu.com> Tue, 17 Mar 2009 02:15:37 -0700
+ -- Bryce Harrington <bryce@ubuntu.com> Tue, 17 Mar 2009 21:25:57 -0700
xorg (1:7.4~5ubuntu15) jaunty; urgency=low
diff --git a/debian/local/Xsession.d/60x11-localhost b/debian/local/Xsession.d/60x11-localhost
deleted file mode 100644
index 3539ffd..0000000
--- a/debian/local/Xsession.d/60x11-localhost
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file is sourced by Xsession(5), not executed.
-
-[ -x /usr/bin/xhost ] && [ -x /usr/bin/id ] &&
- xhost +si:localuser:`id -un` > /dev/null 2>&1
diff --git a/debian/x11-common.postinst.in b/debian/x11-common.postinst.in
index 9760ecb..b3f8fd5 100644
--- a/debian/x11-common.postinst.in
+++ b/debian/x11-common.postinst.in
@@ -30,6 +30,9 @@ configure)
remove_conffile_commit "/etc/X11/Xsession.d/90xorg-common_ssh-agent"
remove_conffile_commit "/etc/X11/Xsession.d/99xorg-common_start"
fi
+ if dpkg --compare-versions "$2" lt-nl "1:7.4~5ubuntu16"; then
+ remove_conffile_commit "/etc/X11/Xsession.d/60x11-localhost"
+ fi
esac
# register this package as a (potential) handler of the X server wrapper
commit 58abb861087b21395ffdee70c837cdebd9bdeaee
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Wed Mar 18 01:39:52 2009 -0700
gettext output needs to be quoted.
diff --git a/debian/local/Failsafe/failsafeXinit b/debian/local/Failsafe/failsafeXinit
index 815c04c..b616039 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=$(gettext "Ubuntu Failsafe-X")
+app_title="$(gettext 'Ubuntu Failsafe-X')"
timestamp=$(date +%y%m%d%H%M%S)
display_main_menu() {
zenity --list \
--radiolist \
- --title $(gettext "$app_title") \
+ --title "$app_title" \
--width $app_width --height $app_height \
- --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") \
+ --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"" : "$(gettext "Reconfiguration") \
- --text $(gettext "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 $(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") \
+ --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"" : "$(gettext "Troubleshooting") \
- --text $(gettext "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 $(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") \
+ --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 $(gettext "A bug report has been written.\nYou can send it next time you log in.")
- else
- zenity --error --text $(gettext "Your bug could not be recorded successfully.\n")
- fi
+ zenity --info --text "$(gettext 'A bug report has been written.\nYou can send it next time you log in.')"
+ else
+ zenity --error --text "$(gettext 'Your bug could not be recorded successfully.\n')"
+ fi
else
- zenity --error --text $(gettext "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 ($gettext "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 $(gettext "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 $(gettext "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 $(gettext "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 $(gettext "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 $(gettext "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 $(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";)
+ 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 $(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.")
+ 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 $(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}"
+ 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 $(gettext "Stand by one minute while the display restarts...")
+ zenity --progress --pulsate --text "$(gettext 'Stand by one minute while the display restarts...')"
Reply to: