diff -Nru gdm3-3.4.1/debian/changelog gdm3-3.4.1/debian/changelog --- gdm3-3.4.1/debian/changelog 2013-02-10 17:46:20.000000000 +0100 +++ gdm3-3.4.1/debian/changelog 2013-04-07 19:23:03.000000000 +0200 @@ -1,3 +1,22 @@ +gdm3 (3.4.1-7) UNRELEASED; urgency=low + + * debian/patches/40_add_start_dir.patch: + + Call gnome-session with --start /usr/share/gdm/greeter/autostart. + .desktop files in that directory will be autostarted (if the + condition to do so is true) in the gdm session. + * debian/control.in: + + Bump gnome-session-bin dependency to 3.4.2.1-4~ for the above + change. + * debian/orca-autostart.desktop, + debian/gdm3.install: + + Install a desktop file to autostart orca if the screen reader + is enabled in gsettings. + * debian/patches/45_show_a11y_menu.patch: + + Add an a11y menu in the panel to enable/disable orca. + * All of the above closes: #689559. + + -- Emilio Pozuelo Monfort Sun, 07 Apr 2013 19:13:39 +0200 + gdm3 (3.4.1-6) unstable; urgency=low * 24_move_failure_detection.patch: new patch. Detect when a display is diff -Nru gdm3-3.4.1/debian/control gdm3-3.4.1/debian/control --- gdm3-3.4.1/debian/control 2013-02-10 17:49:14.000000000 +0100 +++ gdm3-3.4.1/debian/control 2013-04-07 20:28:47.000000000 +0200 @@ -7,7 +7,7 @@ Section: gnome Priority: optional Maintainer: Debian GNOME Maintainers -Uploaders: Josselin Mouette , Michael Biebl +Uploaders: Emilio Pozuelo Monfort , Josselin Mouette , Michael Biebl Build-Depends: gnome-pkg-tools (>= 0.16.3), debhelper (>= 8.1.0), cdbs, @@ -60,7 +60,7 @@ adduser, libpam-modules (>= 0.72-1), libpam-runtime (>= 0.76-13.1), - gnome-session-bin (>= 3.2), + gnome-session-bin (>= 3.4.2.1-4~), gnome-settings-daemon (>= 3.2), metacity (>= 1:2.34.2), policykit-1-gnome, diff -Nru gdm3-3.4.1/debian/control.in gdm3-3.4.1/debian/control.in --- gdm3-3.4.1/debian/control.in 2012-07-31 22:59:59.000000000 +0200 +++ gdm3-3.4.1/debian/control.in 2013-04-07 19:23:03.000000000 +0200 @@ -55,7 +55,7 @@ adduser, libpam-modules (>= 0.72-1), libpam-runtime (>= 0.76-13.1), - gnome-session-bin (>= 3.2), + gnome-session-bin (>= 3.4.2.1-4~), gnome-settings-daemon (>= 3.2), metacity (>= 1:2.34.2), policykit-1-gnome, diff -Nru gdm3-3.4.1/debian/gdm3.install gdm3-3.4.1/debian/gdm3.install --- gdm3-3.4.1/debian/gdm3.install 2012-06-09 15:49:01.000000000 +0200 +++ gdm3-3.4.1/debian/gdm3.install 2013-04-07 19:23:03.000000000 +0200 @@ -2,3 +2,4 @@ debian/greeter.gsettings etc/gdm3 debian/default.desktop usr/share/gdm/BuiltInSessions debian/insserv.conf.d etc +debian/orca-autostart.desktop usr/share/gdm/greeter/autostart diff -Nru gdm3-3.4.1/debian/orca-autostart.desktop gdm3-3.4.1/debian/orca-autostart.desktop --- gdm3-3.4.1/debian/orca-autostart.desktop 1970-01-01 01:00:00.000000000 +0100 +++ gdm3-3.4.1/debian/orca-autostart.desktop 2013-04-07 19:23:03.000000000 +0200 @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Application +Name=Orca screen reader +Exec=orca --disable main-window,splash-window --enable speech,braille +NoDisplay=true +AutostartCondition=GSettings org.gnome.desktop.a11y.applications screen-reader-enabled +X-GNOME-AutoRestart=true diff -Nru gdm3-3.4.1/debian/patches/40_add_start_dir.patch gdm3-3.4.1/debian/patches/40_add_start_dir.patch --- gdm3-3.4.1/debian/patches/40_add_start_dir.patch 1970-01-01 01:00:00.000000000 +0100 +++ gdm3-3.4.1/debian/patches/40_add_start_dir.patch 2013-04-07 19:23:03.000000000 +0200 @@ -0,0 +1,11 @@ +--- a/daemon/gdm-greeter-session.c ++++ b/daemon/gdm-greeter-session.c +@@ -78,7 +78,7 @@ + GObject *object; + + object = g_object_new (GDM_TYPE_GREETER_SESSION, +- "command", BINDIR "/gnome-session -f --debug", ++ "command", BINDIR "/gnome-session -f --start " DATADIR "/gdm/greeter/autostart --debug", + "server-dbus-path", GDM_GREETER_SERVER_DBUS_PATH, + "server-dbus-interface", GDM_GREETER_SERVER_DBUS_INTERFACE, + "server-env-var-name", "GDM_GREETER_DBUS_ADDRESS", diff -Nru gdm3-3.4.1/debian/patches/45_show_a11y_menu.patch gdm3-3.4.1/debian/patches/45_show_a11y_menu.patch --- gdm3-3.4.1/debian/patches/45_show_a11y_menu.patch 1970-01-01 01:00:00.000000000 +0100 +++ gdm3-3.4.1/debian/patches/45_show_a11y_menu.patch 2013-04-07 19:23:03.000000000 +0200 @@ -0,0 +1,90 @@ +--- a/gui/simple-greeter/gdm-greeter-panel.c ++++ b/gui/simple-greeter/gdm-greeter-panel.c +@@ -61,8 +61,10 @@ + #define GPM_DBUS_INTERFACE "org.gnome.SettingsDaemon.Power" + + #define LOGIN_SCREEN_SCHEMA "org.gnome.login-screen" ++#define A11Y_APPS_SCHEMA "org.gnome.desktop.a11y.applications" + + #define KEY_DISABLE_RESTART_BUTTONS "disable-restart-buttons" ++#define KEY_SCREEN_READER_ENABLED "screen-reader-enabled" + + #define KEY_NOTIFICATION_AREA_PADDING "/apps/notification_area_applet/prefs/padding" + +@@ -79,6 +81,7 @@ + GtkWidget *hostname_label; + GtkWidget *clock; + GtkWidget *status_menubar; ++ GtkWidget *a11y_menu; + GtkWidget *shutdown_menu; + + GdmTimer *animation_timer; +@@ -869,6 +872,59 @@ + } + + static void ++toggle_screen_reader (GtkCheckMenuItem *checkmenuitem, ++ gpointer user_data) ++{ ++ GSettings *settings; ++ gboolean enabled; ++ ++ settings = g_settings_new (A11Y_APPS_SCHEMA); ++ ++ enabled = g_settings_get_boolean (settings, KEY_SCREEN_READER_ENABLED); ++ ++ g_settings_set_boolean (settings, KEY_SCREEN_READER_ENABLED, !enabled); ++} ++ ++static void ++add_a11y_menu (GdmGreeterPanel *panel) ++{ ++ GtkWidget *item; ++ GtkWidget *menu_item; ++ GtkWidget *box; ++ GtkWidget *image; ++ GIcon *gicon; ++ GSettings *settings; ++ gboolean enabled; ++ ++ item = gtk_menu_item_new (); ++ override_style (item); ++ box = gtk_hbox_new (FALSE, 0); ++ gtk_container_add (GTK_CONTAINER (item), box); ++ gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->status_menubar), item); ++ image = gtk_image_new (); ++ override_style (image); ++ ++ gicon = g_themed_icon_new ("preferences-desktop-accessibility-symbolic"); ++ gtk_image_set_from_gicon (GTK_IMAGE (image), gicon, GTK_ICON_SIZE_MENU); ++ g_object_unref (gicon); ++ ++ gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 0); ++ ++ panel->priv->a11y_menu = gtk_menu_new (); ++ gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), panel->priv->a11y_menu); ++ ++ settings = g_settings_new (A11Y_APPS_SCHEMA); ++ enabled = g_settings_get_boolean (settings, KEY_SCREEN_READER_ENABLED); ++ ++ menu_item = gtk_check_menu_item_new_with_label (_("Screen Reader")); ++ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), enabled); ++ g_signal_connect (G_OBJECT (menu_item), "toggled", G_CALLBACK (toggle_screen_reader), NULL); ++ gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->a11y_menu), menu_item); ++ ++ gtk_widget_show_all (item); ++} ++ ++static void + add_shutdown_menu (GdmGreeterPanel *panel) + { + GtkWidget *item; +@@ -1019,6 +1075,8 @@ + gtk_widget_show (panel->priv->status_menubar); + gtk_box_pack_end (GTK_BOX (panel->priv->right_hbox), GTK_WIDGET (panel->priv->status_menubar), FALSE, FALSE, 0); + ++ add_a11y_menu (panel); ++ + if (!panel->priv->display_is_local || get_show_restart_buttons (panel)) { + add_shutdown_menu (panel); + } diff -Nru gdm3-3.4.1/debian/patches/series gdm3-3.4.1/debian/patches/series --- gdm3-3.4.1/debian/patches/series 2013-02-10 17:24:49.000000000 +0100 +++ gdm3-3.4.1/debian/patches/series 2013-04-07 19:23:03.000000000 +0200 @@ -19,6 +19,8 @@ 30_dbus_prctl_death.patch 31_worker_session_gone.patch 32_ignore_greeter_crash.patch +40_add_start_dir.patch +45_show_a11y_menu.patch 90_config_comments.patch 91_shell_version_control.patch 92_gsettings_path.patch