debian/0000775000000000000000000000000012321253154007166 5ustar debian/compat0000664000000000000000000000000212321253154010364 0ustar 8 debian/gnome-screensaver.docs0000664000000000000000000000010712321253154013461 0ustar debian/gnome-screensaver/usr/share/doc/gnome-screensaver-*/spec/*.html debian/patches/0000775000000000000000000000000012321253154010615 5ustar debian/patches/17_remove_top_panel.patch0000664000000000000000000000450312321253154015505 0ustar Description: Don't create the top panel. Author: Marc Deslauriers Forwarded: no, Ubuntu-specific Index: gnome-screensaver-3.6.1/src/gs-window-x11.c =================================================================== --- gnome-screensaver-3.6.1.orig/src/gs-window-x11.c 2014-01-07 18:33:03.680132713 +0100 +++ gnome-screensaver-3.6.1/src/gs-window-x11.c 2014-01-07 18:39:24.492120025 +0100 @@ -367,7 +367,8 @@ monitor = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (widget)); primary_monitor = gdk_screen_get_primary_monitor (screen); - gtk_widget_set_visible (window->priv->panel, monitor == primary_monitor); + if (window->priv->panel) + gtk_widget_set_visible (window->priv->panel, monitor == primary_monitor); } static void @@ -2327,11 +2328,20 @@ gtk_widget_show (window->priv->vbox); gtk_container_add (GTK_CONTAINER (window), window->priv->vbox); - window->priv->panel = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); - gtk_widget_show (window->priv->panel); - gtk_box_pack_start (GTK_BOX (window->priv->vbox), window->priv->panel, FALSE, FALSE, 0); - create_panel (window); - + /* Only display top bar if we're not running under Unity */ + if (!g_getenv ("XDG_CURRENT_DESKTOP") || + strcmp (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") != 0) { + window->priv->panel = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); + gtk_widget_show (window->priv->panel); + gtk_box_pack_start (GTK_BOX (window->priv->vbox), window->priv->panel, FALSE, FALSE, 0); + create_panel (window); + } else { + window->priv->clock = gtk_label_new (NULL); + gtk_box_pack_start (GTK_BOX (window->priv->vbox), window->priv->clock, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (window->priv->clock), 1.0, 0.5); + gtk_misc_set_padding (GTK_MISC (window->priv->clock), 10, 0); + gtk_widget_show(window->priv->clock); + } window->priv->drawing_area = gtk_drawing_area_new (); gtk_widget_show (window->priv->drawing_area); gtk_widget_set_app_paintable (window->priv->drawing_area, TRUE); debian/patches/16_dont_crash_in_kvm.patch0000664000000000000000000000405512321253154015637 0ustar Description: Don't crash when the XF86VM extension doesn't allow the gamma to be set On some systems where the XF86VM extension is present, the gamma value can be read successfully with XF86VidModeGetGamma but attempting to change the gamma value with XF86VidModeSetGamma will result in a BadValue error (eg, on KVM). Trap this error and abort the fade rather than crashing. Bug-Ubuntu: https://launchpad.net/bugs/581864 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=618932 Forwarded: https://bugzilla.gnome.org/attachment.cgi?id=161276 Author: Chris Coulson Index: gnome-screensaver/src/gs-fade.c =================================================================== --- gnome-screensaver.orig/src/gs-fade.c 2012-03-07 15:11:48.829845953 +0100 +++ gnome-screensaver/src/gs-fade.c 2012-03-07 15:11:49.621845955 +0100 @@ -208,7 +208,13 @@ g2.blue = XF86_MIN_GAMMA; } + gdk_error_trap_push (); status = XF86VidModeSetGamma (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), screen, &g2); + gdk_flush (); + if (gdk_error_trap_pop ()) { + gs_debug ("Failed to set gamma. Bailing out and aborting fade"); + return FALSE; + } } else { # ifdef HAVE_XF86VMODE_GAMMA_RAMP @@ -225,7 +231,13 @@ b[i] = gamma_info->b[i] * ratio; } + gdk_error_trap_push (); status = XF86VidModeSetGammaRamp (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), screen, gamma_info->size, r, g, b); + gdk_flush (); + if (gdk_error_trap_pop ()) { + gs_debug ("Failed to set gamma. Bailing out and aborting fade"); + return FALSE; + } g_free (r); g_free (g); @@ -236,8 +248,6 @@ # endif /* !HAVE_XF86VMODE_GAMMA_RAMP */ } - gdk_flush (); - return status; } debian/patches/move-not-nuke.patch0000664000000000000000000000244512321253154014347 0ustar Description: When unlocking, if we can't get the grab, try to set focus on the desired window & try again. Author: Ray Strode Bug-Upstream: https://bugzilla.redhat.com/show_bug.cgi?id=905935 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-screensaver/+bug/1175717 Index: b/src/gs-grab-x11.c =================================================================== --- a/src/gs-grab-x11.c +++ b/src/gs-grab-x11.c @@ -377,7 +377,7 @@ } static void -gs_grab_nuke_focus (void) +gs_grab_move_focus (GdkWindow *window) { Window focus = 0; int rev = 0; @@ -388,7 +388,7 @@ XGetInputFocus (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &focus, &rev); - XSetInputFocus (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), None, RevertToNone, CurrentTime); + XSetInputFocus (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), GDK_WINDOW_XID (window), RevertToNone, CurrentTime); gdk_error_trap_pop_ignored (); } @@ -469,7 +469,7 @@ if (kstatus != GDK_GRAB_SUCCESS) { if (!focus_fuckus) { focus_fuckus = TRUE; - gs_grab_nuke_focus (); + gs_grab_move_focus (window); goto AGAIN; } } debian/patches/00git_logind_check.patch0000664000000000000000000000347312321253154015261 0ustar From fd353244020cf53ce58f4abf69a5ec7893ca1fd1 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 21 Mar 2013 10:24:20 +0000 Subject: Check for logind, not for systemd It is possible to build systemd without logind, in which case /sys/fs/cgroup/systemd would still exist. Check for /run/systemd/seats instead, as recommended by systemd upstream. For details, see: Drop the now unnecessary linking against libsystemd-daemon. https://bugzilla.gnome.org/show_bug.cgi?id=696264 --- diff --git a/configure.ac b/configure.ac index 0e8f339..3451989 100644 --- a/configure.ac +++ b/configure.ac @@ -601,7 +601,7 @@ AC_ARG_WITH(systemd, [with_systemd=$withval], [with_systemd=auto]) PKG_CHECK_MODULES(SYSTEMD, - [libsystemd-login libsystemd-daemon], + [libsystemd-login], [have_systemd=yes], [have_systemd=no]) if test "x$with_systemd" = "xauto" ; then diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c index 28774a0..7f718fa 100644 --- a/src/gs-listener-dbus.c +++ b/src/gs-listener-dbus.c @@ -25,6 +25,7 @@ #include #include #include +#include #include @@ -33,7 +34,6 @@ #include #ifdef WITH_SYSTEMD -#include #include #endif @@ -1478,7 +1478,8 @@ gs_listener_init (GSListener *listener) listener->priv = GS_LISTENER_GET_PRIVATE (listener); #ifdef WITH_SYSTEMD - listener->priv->have_systemd = sd_booted () > 0; + /* check if logind is running */ + listener->priv->have_systemd = (access("/run/systemd/seats/", F_OK) >= 0); #endif gs_listener_dbus_init (listener); -- cgit v0.9.1 debian/patches/11_autostart_delay.patch0000664000000000000000000000216112321253154015343 0ustar Index: gnome-screensaver-3.5.5/src/gnome-screensaver.desktop.in =================================================================== --- gnome-screensaver-3.5.5.orig/src/gnome-screensaver.desktop.in 2012-08-06 18:48:48.000000000 +0200 +++ gnome-screensaver-3.5.5/src/gnome-screensaver.desktop.in 2012-08-07 09:07:24.035630983 +0200 @@ -7,6 +7,7 @@ OnlyShowIn=GNOME; AutostartCondition=GNOME3 if-session gnome-fallback NoDisplay=true +X-GNOME-Autostart-Delay=20 X-GNOME-Autostart-Phase=Application X-GNOME-Autostart-Notify=true X-GNOME-Bugzilla-Bugzilla=GNOME Index: gnome-screensaver-3.5.5/src/gnome-screensaver.desktop.in.in =================================================================== --- gnome-screensaver-3.5.5.orig/src/gnome-screensaver.desktop.in.in 2012-07-21 21:40:14.000000000 +0200 +++ gnome-screensaver-3.5.5/src/gnome-screensaver.desktop.in.in 2012-08-07 09:07:24.035630983 +0200 @@ -7,6 +7,7 @@ OnlyShowIn=GNOME; AutostartCondition=GNOME3 if-session gnome-fallback NoDisplay=true +X-GNOME-Autostart-Delay=20 X-GNOME-Autostart-Phase=Application X-GNOME-Autostart-Notify=true X-GNOME-Bugzilla-Bugzilla=GNOME debian/patches/28_blocking_return.patch0000664000000000000000000000174712321253154015347 0ustar # Description: Correctly reply so the client doesn't block waiting # Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=686400 # Ubuntu: https://bugs.launchpad.net/gnome-screensaver/+bug/1067515 diff -Nur gnome-screensaver-3.6.0/src/gs-listener-dbus.c gnome-screensaver-3.6.0.new/src/gs-listener-dbus.c --- gnome-screensaver-3.6.0/src/gs-listener-dbus.c 2012-10-18 16:05:54.393188619 +0200 +++ gnome-screensaver-3.6.0.new/src/gs-listener-dbus.c 2012-10-18 16:05:52.729188556 +0200 @@ -726,7 +726,7 @@ } if (dbus_message_is_method_call (message, GS_SERVICE, "SimulateUserActivity")) { g_signal_emit (listener, signals [SIMULATE_USER_ACTIVITY], 0); - return DBUS_HANDLER_RESULT_HANDLED; + return send_success_reply (connection, message); } if (dbus_message_is_method_call (message, "org.freedesktop.DBus.Introspectable", "Introspect")) { return do_introspect (connection, message, local_interface); debian/patches/18_unity_dialog_layout.patch0000664000000000000000000001561112321253154016236 0ustar Description: add username to lock dialog and adjust fonts and spacing when used with Unity Author: Marc Deslauriers Forwarded: no, Ubuntu-specific Index: gnome-screensaver-3.4.2/src/gs-lock-plug.c =================================================================== --- gnome-screensaver-3.4.2.orig/src/gs-lock-plug.c 2012-04-15 07:29:00.000000000 +1200 +++ gnome-screensaver-3.4.2/src/gs-lock-plug.c 2012-06-28 10:50:53.955326278 +1200 @@ -71,6 +71,7 @@ GtkWidget *notebook; GtkWidget *auth_face_image; + GtkWidget *auth_realname_label; GtkWidget *auth_prompt_label; GtkWidget *auth_prompt_entry; GtkWidget *auth_prompt_box; @@ -1241,9 +1242,18 @@ gtk_widget_set_sensitive (plug->priv->auth_unlock_button, TRUE); gtk_widget_show (plug->priv->auth_unlock_button); gtk_widget_grab_default (plug->priv->auth_unlock_button); - markup = g_strdup_printf ("%s", message); + + /* Change appearance if we're running under Unity */ + if (g_getenv ("XDG_CURRENT_DESKTOP") && + strcmp (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0) { + markup = g_strdup_printf ("%s", message); + } else { + markup = g_strdup_printf ("%s", message); + } + gtk_label_set_markup (GTK_LABEL (plug->priv->auth_prompt_label), markup); g_free (markup); + gtk_widget_show (plug->priv->auth_prompt_label); gtk_entry_set_visibility (GTK_ENTRY (plug->priv->auth_prompt_entry), visible); gtk_widget_set_sensitive (plug->priv->auth_prompt_entry, TRUE); @@ -1374,6 +1384,39 @@ gs_profile_end ("page one buttons"); } +static char * +get_user_display_name (void) +{ + const char *name; + char *utf8_name; + + name = g_get_real_name (); + + if (name == NULL || strcmp (name, "Unknown") == 0) { + name = g_get_user_name (); + } + + utf8_name = NULL; + + if (name != NULL) { + utf8_name = g_locale_to_utf8 (name, -1, NULL, NULL, NULL); + } + + return utf8_name; +} + +static void +update_realname_label (GSLockPlug *plug) +{ + char *name; + char *markup; + name = get_user_display_name (); + markup = g_strdup_printf ("%s", name); + gtk_label_set_markup (GTK_LABEL (plug->priv->auth_realname_label), markup); + g_free (markup); + g_free (name); +} + static void create_page_one (GSLockPlug *plug) { @@ -1405,25 +1448,59 @@ gtk_box_pack_start (GTK_BOX (hbox), plug->priv->auth_prompt_kbd_layout_indicator, FALSE, FALSE, 0); #endif - plug->priv->auth_prompt_label = gtk_label_new_with_mnemonic (_("_Password:")); - gtk_misc_set_alignment (GTK_MISC (plug->priv->auth_prompt_label), 0, 0.5); - gtk_box_pack_start (GTK_BOX (vbox2), plug->priv->auth_prompt_label, FALSE, FALSE, 0); + /* Change appearance if we're running under Unity */ + if (g_getenv ("XDG_CURRENT_DESKTOP") && + strcmp (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0) { + gtk_box_set_spacing (vbox2, 0); + gtk_misc_set_alignment (GTK_MISC (plug->priv->auth_face_image), 0, 0.5); + plug->priv->auth_realname_label = gtk_label_new (NULL); + update_realname_label (plug); + gtk_misc_set_alignment (GTK_MISC (plug->priv->auth_realname_label), 0, 1); + gtk_box_pack_start (GTK_BOX (vbox2), plug->priv->auth_realname_label, FALSE, FALSE, 0); + + plug->priv->auth_prompt_label = gtk_label_new_with_mnemonic (_("_Password:")); + gtk_misc_set_alignment (GTK_MISC (plug->priv->auth_prompt_label), 0, 0); + gtk_box_pack_start (GTK_BOX (vbox2), plug->priv->auth_prompt_label, FALSE, FALSE, 0); + + plug->priv->auth_prompt_entry = gtk_entry_new (); + gtk_box_pack_start (GTK_BOX (vbox2), plug->priv->auth_prompt_entry, TRUE, TRUE, 6); + + gtk_label_set_mnemonic_widget (GTK_LABEL (plug->priv->auth_prompt_label), + plug->priv->auth_prompt_entry); + + plug->priv->auth_capslock_label = gtk_label_new (""); + gtk_misc_set_alignment (GTK_MISC (plug->priv->auth_capslock_label), 0, 0.5); + gtk_box_pack_start (GTK_BOX (vbox2), plug->priv->auth_capslock_label, FALSE, FALSE, 0); + + /* Status text */ + + plug->priv->auth_message_label = gtk_label_new (NULL); + gtk_misc_set_alignment (GTK_MISC (plug->priv->auth_message_label), 0, 0.5); + gtk_box_pack_start (GTK_BOX (vbox2), plug->priv->auth_message_label, + FALSE, FALSE, 0); + + } else { + + plug->priv->auth_prompt_label = gtk_label_new_with_mnemonic (_("_Password:")); + gtk_misc_set_alignment (GTK_MISC (plug->priv->auth_prompt_label), 0, 0.5); + gtk_box_pack_start (GTK_BOX (vbox2), plug->priv->auth_prompt_label, FALSE, FALSE, 0); - plug->priv->auth_prompt_entry = gtk_entry_new (); - gtk_box_pack_start (GTK_BOX (vbox2), plug->priv->auth_prompt_entry, TRUE, TRUE, 0); + plug->priv->auth_prompt_entry = gtk_entry_new (); + gtk_box_pack_start (GTK_BOX (vbox2), plug->priv->auth_prompt_entry, TRUE, TRUE, 0); - gtk_label_set_mnemonic_widget (GTK_LABEL (plug->priv->auth_prompt_label), - plug->priv->auth_prompt_entry); + gtk_label_set_mnemonic_widget (GTK_LABEL (plug->priv->auth_prompt_label), + plug->priv->auth_prompt_entry); - plug->priv->auth_capslock_label = gtk_label_new (""); - gtk_misc_set_alignment (GTK_MISC (plug->priv->auth_capslock_label), 0.5, 0.5); - gtk_box_pack_start (GTK_BOX (vbox2), plug->priv->auth_capslock_label, FALSE, FALSE, 0); + plug->priv->auth_capslock_label = gtk_label_new (""); + gtk_misc_set_alignment (GTK_MISC (plug->priv->auth_capslock_label), 0.5, 0.5); + gtk_box_pack_start (GTK_BOX (vbox2), plug->priv->auth_capslock_label, FALSE, FALSE, 0); - /* Status text */ + /* Status text */ - plug->priv->auth_message_label = gtk_label_new (NULL); - gtk_box_pack_start (GTK_BOX (vbox), plug->priv->auth_message_label, - FALSE, FALSE, 0); + plug->priv->auth_message_label = gtk_label_new (NULL); + gtk_box_pack_start (GTK_BOX (vbox), plug->priv->auth_message_label, + FALSE, FALSE, 0); + } /* Buttons */ plug->priv->auth_action_area = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); debian/patches/25_fix_lock_command.patch0000664000000000000000000000233712321253154015445 0ustar Description: make --lock expect a reply so the screen gets properly locked when gnome-screensaver needs to be respawned by dbus. This was preventing ctrl-alt-l from locking the screen on the first attempt when the gnome-screensaver process was dead. Author: Marc Deslauriers Forwarded: no, upstream doesn't configure gnome-screensaver as a dbus service Index: gnome-screensaver-3.2.0/src/gnome-screensaver-command.c =================================================================== --- gnome-screensaver-3.2.0.orig/src/gnome-screensaver-command.c 2012-02-09 21:27:09.936449525 -0500 +++ gnome-screensaver-3.2.0/src/gnome-screensaver-command.c 2012-02-09 21:32:41.140458005 -0500 @@ -260,8 +260,12 @@ } if (do_lock) { - reply = screensaver_send_message_void (connection, "Lock", FALSE); - g_assert (reply == NULL); + reply = screensaver_send_message_void (connection, "Lock", TRUE); + if (reply == NULL) { + g_message ("Did not receive a reply from the screensaver."); + goto done; + } + g_object_unref (reply); } if (do_activate) { debian/patches/04_force_blank_only_on_ltsp.patch0000664000000000000000000000125312321253154017206 0ustar Description: Disable graphics intensive modes for LTSP Bug: https://bugs.edge.launchpad.net/ubuntu/+source/ltsp/+bug/18595 Author: Oliver Grawert Index: gnome-screensaver-2.91.0/src/gs-manager.c =================================================================== --- gnome-screensaver-2.91.0.orig/src/gs-manager.c 2010-12-08 15:18:39.577450001 +1100 +++ gnome-screensaver-2.91.0/src/gs-manager.c 2010-12-08 15:18:41.981450001 +1100 @@ -143,6 +143,11 @@ return NULL; } + if (g_getenv("LTSP_CLIENT")) { + gs_debug ("On LTSP Client, forcing blank only mode"); + return NULL; + } + if (manager->priv->themes) { int number = 0; debian/patches/series0000664000000000000000000000126212321253154012033 0ustar 00git_logind_check.patch 03_fix_ltsp-fading.patch #04_force_blank_only_on_ltsp.patch 05_dbus_service.patch 10_legacy_scrsvr_inhibit.patch 11_autostart_delay.patch 13_nvidia_gamma_fade_fallback.patch 14_no_fade_on_user_switch.patch 15_dont_crash_on_no_fade.patch 16_dont_crash_in_kvm.patch 17_remove_top_panel.patch 18_unity_dialog_layout.patch 19_not_autostart_in_unity.patch 24_use_user_settings.patch 25_fix_lock_command.patch #26_lightdm_greeter_on_lock.patch 27_lightdm_switch_user.patch 28_blocking_return.patch 29_handle_expired_creds.patch 30_ubuntu-lock-on-suspend_gsetting.patch 31_lock_screen_on_suspend.patch 32_input_sources_switcher.patch move-not-nuke.patch allow-replacement debian/patches/03_fix_ltsp-fading.patch0000664000000000000000000000156312321253154015223 0ustar Description: gss apparently crashes on fade actions on LDM_DIRECTX exported displays. Since fading is a bad idea anyway on LTSP clients it's disabled completely now if LTSP_CLIENT is set. Author: Oliver Grawert Index: gnome-screensaver-3.4.2/src/gs-fade.c =================================================================== --- gnome-screensaver-3.4.2.orig/src/gs-fade.c 2012-03-31 11:06:20.000000000 +1300 +++ gnome-screensaver-3.4.2/src/gs-fade.c 2012-06-28 10:49:32.055329115 +1200 @@ -409,6 +409,10 @@ screen_priv = &fade->priv->screen_priv[screen_idx]; #ifdef HAVE_XF86VMODE_GAMMA + if (g_getenv("LTSP_CLIENT")) { + return FADE_TYPE_NONE; /* We're on an LTSP Client, bad idea to fade at all */ + } + res = XF86VidModeQueryExtension (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &event, &error); if (! res) goto fade_none; debian/patches/10_legacy_scrsvr_inhibit.patch0000664000000000000000000000200412321253154016506 0ustar Description: Reintroduce legacy API for inhibiting the screensaver Author: Chris Coulson Bug-Ubuntu: https://bugs.launchpad.net/bugs/428884 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=579430 Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=579430 Index: gnome-screensaver-3.4.2/src/gs-monitor.c =================================================================== --- gnome-screensaver-3.4.2.orig/src/gs-monitor.c 2012-02-10 20:11:45.000000000 +1300 +++ gnome-screensaver-3.4.2/src/gs-monitor.c 2012-06-28 10:49:40.239328832 +1200 @@ -28,6 +28,8 @@ #include #include +#include +#include #include "gnome-screensaver.h" @@ -190,7 +192,7 @@ static void gs_monitor_simulate_user_activity (GSMonitor *monitor) { - /* FIXME: reset the xsync timer? */ + XResetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())); /* request that the manager unlock - will pop up a dialog if necessary */ debian/patches/05_dbus_service.patch0000664000000000000000000000401412321253154014616 0ustar ## Description: add some description ## Origin/Author: add some origin or author ## Bug: bug URL Index: gnome-screensaver-3.4.2/configure.ac =================================================================== --- gnome-screensaver-3.4.2.orig/configure.ac 2012-04-15 07:55:32.000000000 +1200 +++ gnome-screensaver-3.4.2/configure.ac 2012-06-28 10:49:34.611329025 +1200 @@ -134,6 +134,11 @@ AC_SUBST(DBUS_CFLAGS) fi +# Find out where the session service file goes +# The sad sed hack is recomended by section 27.10 of the automake manual. +DBUS_SESSION_SERVICE_DIR=`pkg-config --variable session_bus_services_dir dbus-1 | sed -e 's,/usr/share,${datarootdir},g'` +AC_SUBST(DBUS_SESSION_SERVICE_DIR) + dnl --------------------------------------------------------------------------- dnl - Where should we put documentation ? dnl --------------------------------------------------------------------------- @@ -762,6 +767,7 @@ src/Makefile src/gnome-screensaver.desktop.in data/Makefile +data/org.gnome.ScreenSaver.service doc/Makefile doc/gnome-screensaver.xml ]) Index: gnome-screensaver-3.4.2/data/org.gnome.ScreenSaver.service.in =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ gnome-screensaver-3.4.2/data/org.gnome.ScreenSaver.service.in 2012-06-28 10:49:34.611329025 +1200 @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.gnome.ScreenSaver +Exec=@EXPANDED_BINDIR@/gnome-screensaver --no-daemon Index: gnome-screensaver-3.4.2/data/Makefile.am =================================================================== --- gnome-screensaver-3.4.2.orig/data/Makefile.am 2011-08-27 14:11:48.000000000 +1200 +++ gnome-screensaver-3.4.2/data/Makefile.am 2012-06-28 10:49:34.611329025 +1200 @@ -7,9 +7,13 @@ @INTLTOOL_XML_NOMERGE_RULE@ +dbussessionservicedir = $(DBUS_SESSION_SERVICE_DIR) +dbussessionservice_DATA = org.gnome.ScreenSaver.service + EXTRA_DIST = \ $(man_MANS) \ gnome-screensaver \ + org.gnome.ScreenSaver.service.in\ $(NULL) DISTCLEANFILES = \ debian/patches/27_lightdm_switch_user.patch0000664000000000000000000001051012321253154016212 0ustar Description: Under lightdm, use dbus to switch to greeter instead of calling gdmflexiserver Author: Marc Deslauriers Forwarded: No, upstream uses GDM Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-screensaver/+bug/950583 Index: gnome-screensaver-3.4.2/src/gs-lock-plug.c =================================================================== --- gnome-screensaver-3.4.2.orig/src/gs-lock-plug.c 2012-06-28 10:50:53.955326278 +1200 +++ gnome-screensaver-3.4.2/src/gs-lock-plug.c 2012-06-28 10:50:58.055326137 +1200 @@ -148,28 +148,60 @@ static void do_user_switch (GSLockPlug *plug) { - GAppInfo *app; - GAppLaunchContext *context; - GError *error; - char *command; - - command = g_strdup_printf ("%s %s", - GDM_FLEXISERVER_COMMAND, - GDM_FLEXISERVER_ARGS); + GError *error = NULL; - error = NULL; - context = (GAppLaunchContext*)gdk_app_launch_context_new (); - app = g_app_info_create_from_commandline (command, "gdmflexiserver", 0, &error); - if (app) - g_app_info_launch (app, NULL, context, &error); - - g_free (command); - g_object_unref (context); - g_object_unref (app); + /* If running under LightDM switch to the greeter using dbus */ + if (g_getenv("XDG_SEAT_PATH")) { + GDBusConnection *bus; + GVariant *result = NULL; + + bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error); + if (error) + g_warning ("Failed to get system bus: %s", error->message); + g_clear_error (&error); + + if (bus) + result = g_dbus_connection_call_sync (bus, + "org.freedesktop.DisplayManager", + g_getenv ("XDG_SEAT_PATH"), + "org.freedesktop.DisplayManager.Seat", + "SwitchToGreeter", + g_variant_new ("()"), + G_VARIANT_TYPE ("()"), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, + &error); + if (error) + g_warning ("Failed to switch to greeter: %s", error->message); + g_clear_error (&error); - if (error != NULL) { - gs_debug ("Unable to start GDM greeter: %s", error->message); - g_error_free (error); + if (result) + g_variant_unref (result); + } else { + + GAppInfo *app; + GAppLaunchContext *context; + char *command; + + command = g_strdup_printf ("%s %s", + GDM_FLEXISERVER_COMMAND, + GDM_FLEXISERVER_ARGS); + + error = NULL; + context = (GAppLaunchContext*)gdk_app_launch_context_new (); + app = g_app_info_create_from_commandline (command, "gdmflexiserver", 0, &error); + if (app) + g_app_info_launch (app, NULL, context, &error); + + g_free (command); + g_object_unref (context); + g_object_unref (app); + + if (error != NULL) { + gs_debug ("Unable to start GDM greeter: %s", error->message); + g_error_free (error); + } } } @@ -1026,7 +1058,7 @@ if (switch_enabled) { gboolean found; found = is_program_in_path (GDM_FLEXISERVER_COMMAND); - if (found) { + if (found || g_getenv("XDG_SEAT_PATH")) { gtk_widget_show (plug->priv->auth_switch_button); } else { gs_debug ("Waring: GDM flexiserver command not found: %s", GDM_FLEXISERVER_COMMAND); debian/patches/15_dont_crash_on_no_fade.patch0000664000000000000000000000253512321253154016443 0ustar Description: Don't crash on systems that don't support XF86VM or XRANDR gamma fade Test if fade is supported on each screen before calling the fade_setup virtual function. Bug-Ubuntu: https://launchpad.net/bugs/558721 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=618925 Forwarded: https://bugzilla.gnome.org/attachment.cgi?id=161269 Author: Chris Coulson Index: gnome-screensaver-3.4.2/src/gs-fade.c =================================================================== --- gnome-screensaver-3.4.2.orig/src/gs-fade.c 2012-06-28 10:49:42.915328739 +1200 +++ gnome-screensaver-3.4.2/src/gs-fade.c 2012-06-28 10:49:45.587328645 +1200 @@ -844,6 +844,8 @@ gs_fade_reset (GSFade *fade) { int i; + struct GSFadeScreenPrivate *screen_priv; + g_return_if_fail (GS_IS_FADE (fade)); gs_debug ("Resetting fade"); @@ -856,8 +858,12 @@ gs_fade_set_alpha (fade, fade->priv->current_alpha); - for (i = 0; i < fade->priv->num_screens; i++) - fade->priv->screen_priv[i].fade_finish (fade, i); + for (i = 0; i < fade->priv->num_screens; i++) { + screen_priv = &fade->priv->screen_priv[i]; + if (screen_priv->fade_type != FADE_TYPE_NONE) { + screen_priv->fade_finish (fade, i); + } + } } static void debian/patches/31_lock_screen_on_suspend.patch0000664000000000000000000001412112321253154016664 0ustar From f8f9beb6a3bf81240d36bfec43e5db9b102ea91e Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 1 May 2013 10:55:49 -0700 Subject: [PATCH] Lock screen on suspend Listen for logind's PrepareForSleep signal, and lock the screen (if configured to do so). This mirrors what gnome-shell's screensaver does. --- src/gs-listener-dbus.c | 28 ++++++++++++++++++++++++++++ src/gs-listener-dbus.h | 1 + src/gs-monitor.c | 20 ++++++++++++++++++++ 3 files changed, 49 insertions(+) diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c index 7f718fa..49586fd 100644 --- a/src/gs-listener-dbus.c +++ b/src/gs-listener-dbus.c @@ -82,6 +82,7 @@ struct GSListenerPrivate enum { LOCK, + CONFIG_LOCK, QUIT, SIMULATE_USER_ACTIVITY, ACTIVE_CHANGED, @@ -871,6 +872,17 @@ listener_dbus_handle_system_message (DBusConnection *connection, } return DBUS_HANDLER_RESULT_HANDLED; + } else if (dbus_message_is_signal (message, SYSTEMD_LOGIND_INTERFACE, "PrepareForSleep")) { + gboolean active; + if (dbus_message_get_args (message, NULL, + DBUS_TYPE_BOOLEAN, &active, + DBUS_TYPE_INVALID) && active) { + gs_debug ("systemd notified that system is about to sleep"); + g_signal_emit (listener, signals [CONFIG_LOCK], 0); + } else { + gs_debug ("cannot parse PrepareForSleep"); + } + return DBUS_HANDLER_RESULT_HANDLED; } else if (dbus_message_is_signal (message, DBUS_INTERFACE_PROPERTIES, "PropertiesChanged")) { if (_listener_message_path_is_our_session (listener, message)) { @@ -1185,6 +1197,16 @@ gs_listener_class_init (GSListenerClass *klass) g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + signals [CONFIG_LOCK] = + g_signal_new ("config-lock", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GSListenerClass, config_lock), + NULL, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); signals [QUIT] = g_signal_new ("quit", G_TYPE_FROM_CLASS (object_class), @@ -1370,6 +1392,12 @@ gs_listener_acquire (GSListener *listener, ",interface='"DBUS_INTERFACE_PROPERTIES"'" ",member='PropertiesChanged'", NULL); + dbus_bus_add_match (listener->priv->system_connection, + "type='signal'" + ",sender='"SYSTEMD_LOGIND_SERVICE"'" + ",interface='"SYSTEMD_LOGIND_INTERFACE"'" + ",member='PrepareForSleep'", + NULL); return (res != -1); } diff --git a/src/gs-listener-dbus.h b/src/gs-listener-dbus.h index 1cb92bc..57ae928 100644 --- a/src/gs-listener-dbus.h +++ b/src/gs-listener-dbus.h @@ -45,6 +45,7 @@ typedef struct GObjectClass parent_class; void (* lock) (GSListener *listener); + void (* config_lock) (GSListener *listener); void (* quit) (GSListener *listener); void (* simulate_user_activity) (GSListener *listener); gboolean (* active_changed) (GSListener *listener, diff --git a/src/gs-monitor.c b/src/gs-monitor.c index f038bab..8749ffa 100644 --- a/src/gs-monitor.c +++ b/src/gs-monitor.c @@ -210,6 +210,23 @@ listener_lock_cb (GSListener *listener, } static void +listener_config_lock_cb (GSListener *listener, + GSMonitor *monitor) +{ + if (! monitor->priv->prefs->lock_disabled) { + if (monitor->priv->prefs->ubuntu_lock_on_suspend) { + gs_debug ("Locking the screen suspend"); + gs_monitor_lock_screen (monitor); + } else { + gs_debug ("Locking the screen on suspend disabled by the administrator"); + } + } else { + gs_debug ("Locking disabled by the administrator"); + } + +} + +static void listener_quit_cb (GSListener *listener, GSMonitor *monitor) { @@ -328,6 +345,7 @@ static void disconnect_listener_signals (GSMonitor *monitor) { g_signal_handlers_disconnect_by_func (monitor->priv->listener, listener_lock_cb, monitor); + g_signal_handlers_disconnect_by_func (monitor->priv->listener, listener_config_lock_cb, monitor); g_signal_handlers_disconnect_by_func (monitor->priv->listener, listener_quit_cb, monitor); g_signal_handlers_disconnect_by_func (monitor->priv->listener, listener_active_changed_cb, monitor); g_signal_handlers_disconnect_by_func (monitor->priv->listener, listener_simulate_user_activity_cb, monitor); @@ -339,6 +357,8 @@ connect_listener_signals (GSMonitor *monitor) { g_signal_connect (monitor->priv->listener, "lock", G_CALLBACK (listener_lock_cb), monitor); + g_signal_connect (monitor->priv->listener, "config-lock", + G_CALLBACK (listener_config_lock_cb), monitor); g_signal_connect (monitor->priv->listener, "quit", G_CALLBACK (listener_quit_cb), monitor); g_signal_connect (monitor->priv->listener, "active-changed", -- 1.8.1.2 debian/patches/29_handle_expired_creds.patch0000664000000000000000000000163312321253154016306 0ustar Description: Gnome Screensaver should handle expired password tokens Author: Brian C. Huffman Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=648875 Ubuntu: https://bugs.launchpad.net/bugs/952771 --- a/src/gs-auth-pam.c 2010-09-28 12:46:07.000000000 -0400 +++ b/src/gs-auth-pam.c 2011-04-28 10:18:31.986171767 -0400 @@ -533,6 +533,14 @@ gs_auth_thread_func (int auth_operation_ case PAM_SUCCESS: break; case PAM_NEW_AUTHTOK_REQD: + status2 = pam_chauthtok (pam_handle, PAM_CHANGE_EXPIRED_AUTHTOK); + + if (status2 != PAM_SUCCESS) { + g_message ("pam_acct_mgmt (...) ==> %d (%s)\n", + status2, + PAM_STRERROR (pam_handle, status2)); + status = status2; + } break; case PAM_AUTHINFO_UNAVAIL: break; debian/patches/32_input_sources_switcher.patch0000664000000000000000000003365412321253154016767 0ustar --- a/src/gs-lock-plug.c +++ b/src/gs-lock-plug.c @@ -36,14 +36,17 @@ #include #include -#ifdef WITH_KBD_LAYOUT_INDICATOR -#include -#endif +#define GNOME_DESKTOP_USE_UNSTABLE_API +#include #include "gs-lock-plug.h" #include "gs-debug.h" +#define INPUT_SOURCES_SCHEMA "org.gnome.desktop.input-sources" +#define SOURCES_KEY "sources" +#define CURRENT_KEY "current" + #define GDM_FLEXISERVER_COMMAND "gdmflexiserver" #define GDM_FLEXISERVER_ARGS "--startnew Standard" @@ -83,7 +86,10 @@ GtkWidget *auth_switch_button; GtkWidget *auth_logout_button; - GtkWidget *auth_prompt_kbd_layout_indicator; + GSettings *input_sources_settings; + GtkWidget *input_sources_label; + GPtrArray *input_sources; + guint input_source; int kbd_lock_mode; gboolean switch_enabled; @@ -1446,6 +1452,135 @@ g_free (name); } +struct InputSource +{ + gchar *name; + gboolean unique; + guint subscript; + guint index; +}; + +typedef struct InputSource InputSource; + +static void +input_source_free (gpointer data) +{ + InputSource *input_source = data; + g_free (input_source->name); + g_free (data); +} + +static void +input_sources_current_changed_cb (GSettings *settings, + gchar *key, + gpointer user_data) +{ + GSLockPlug *plug = GS_LOCK_PLUG (user_data); + guint current = g_settings_get_uint (settings, CURRENT_KEY); + guint i; + + for (i = 0; i < plug->priv->input_sources->len; i++) { + InputSource *input_source = g_ptr_array_index (plug->priv->input_sources, i); + + if (input_source->index == current) { + if (!input_source->unique) { + gchar *markup = g_markup_printf_escaped ("%s%u", input_source->name, input_source->subscript); + gtk_label_set_markup (GTK_LABEL (plug->priv->input_sources_label), markup); + g_free (markup); + } else { + gtk_label_set_text (GTK_LABEL (plug->priv->input_sources_label), input_source->name); + } + + break; + } + } +} + +static void +gs_lock_plug_init_input_sources (GSLockPlug *plug) +{ + GnomeXkbInfo *xkb_info; + GVariant *sources; + GVariantIter iter; + const gchar *type; + const gchar *name; + guint current; + guint i; + + if (plug->priv->input_sources != NULL) + return; + + plug->priv->input_sources_settings = g_settings_new (INPUT_SOURCES_SCHEMA); + sources = g_settings_get_value (plug->priv->input_sources_settings, SOURCES_KEY); + current = g_settings_get_uint (plug->priv->input_sources_settings, CURRENT_KEY); + + plug->priv->input_sources = g_ptr_array_new_full (g_variant_n_children (sources), input_source_free); + plug->priv->input_source = 0; + + xkb_info = gnome_xkb_info_new (); + + g_variant_iter_init (&iter, sources); + for (i = 0; g_variant_iter_next (&iter, "(&s&s)", &type, &name); i++) { + if (g_strcmp0 (type, "xkb") == 0) { + InputSource *input_source; + const gchar *short_name; + gint j; + + gnome_xkb_info_get_layout_info (xkb_info, name, NULL, &short_name, NULL, NULL); + + input_source = g_new0 (InputSource, 1); + input_source->name = g_strdup (short_name); + input_source->unique = TRUE; + input_source->subscript = 1; + input_source->index = i; + + if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0) + input_source->name[0] = g_ascii_toupper (input_source->name[0]); + + for (j = plug->priv->input_sources->len - 1; j >= 0; j--) { + InputSource *input_source_j = g_ptr_array_index (plug->priv->input_sources, j); + + if (g_strcmp0 (input_source_j->name, input_source->name) == 0) { + input_source_j->unique = FALSE; + input_source->unique = FALSE; + input_source->subscript = input_source_j->subscript + 1; + break; + } + } + + if (input_source->index == current) + plug->priv->input_source = plug->priv->input_sources->len; + + g_ptr_array_add (plug->priv->input_sources, input_source); + } + } + + g_object_unref (xkb_info); + g_variant_unref (sources); + + g_signal_connect (plug->priv->input_sources_settings, + "changed::" CURRENT_KEY, + G_CALLBACK (input_sources_current_changed_cb), + plug); +} + +static gboolean +layout_indicator_clicked_cb (GtkWidget *widget, + GdkEvent *event, + gpointer user_data) +{ + GSLockPlug *plug; + InputSource *input_source; + + plug = GS_LOCK_PLUG (user_data); + plug->priv->input_source++; + plug->priv->input_source %= plug->priv->input_sources->len; + input_source = g_ptr_array_index (plug->priv->input_sources, plug->priv->input_source); + g_settings_set_uint (plug->priv->input_sources_settings, CURRENT_KEY, input_source->index); + + return TRUE; +} + static void create_page_one (GSLockPlug *plug) { @@ -1453,6 +1588,7 @@ GtkWidget *vbox; GtkWidget *vbox2; GtkWidget *hbox; + GtkWidget *hbox2; gs_profile_start ("page one"); @@ -1473,10 +1609,6 @@ gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0); gtk_container_set_border_width (GTK_CONTAINER (vbox2), 10); -#ifdef WITH_KBD_LAYOUT_INDICATOR - gtk_box_pack_start (GTK_BOX (hbox), plug->priv->auth_prompt_kbd_layout_indicator, FALSE, FALSE, 0); -#endif - /* Change appearance if we're running under Unity */ if (g_getenv ("XDG_CURRENT_DESKTOP") && strcmp (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0) { @@ -1491,11 +1623,38 @@ gtk_misc_set_alignment (GTK_MISC (plug->priv->auth_prompt_label), 0, 0); gtk_box_pack_start (GTK_BOX (vbox2), plug->priv->auth_prompt_label, FALSE, FALSE, 0); + hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); plug->priv->auth_prompt_entry = gtk_entry_new (); - gtk_box_pack_start (GTK_BOX (vbox2), plug->priv->auth_prompt_entry, TRUE, TRUE, 6); gtk_label_set_mnemonic_widget (GTK_LABEL (plug->priv->auth_prompt_label), plug->priv->auth_prompt_entry); + gtk_box_pack_start (GTK_BOX (hbox2), plug->priv->auth_prompt_entry, TRUE, TRUE, 6); + + /* Layout indicator */ +#ifdef WITH_KBD_LAYOUT_INDICATOR + gs_lock_plug_init_input_sources (plug); + + if (plug->priv->input_sources->len > 1) { + GtkWidget *layout_indicator; + + layout_indicator = gtk_event_box_new (); + plug->priv->input_sources_label = gtk_label_new (NULL); + input_sources_current_changed_cb (plug->priv->input_sources_settings, CURRENT_KEY, plug); + g_signal_connect (layout_indicator, "button-release-event", G_CALLBACK (layout_indicator_clicked_cb), plug); + gtk_widget_set_size_request (layout_indicator, 50, 40); + + gtk_container_add (GTK_CONTAINER (layout_indicator), plug->priv->input_sources_label); + gtk_box_pack_start (GTK_BOX (hbox2), + layout_indicator, + FALSE, + FALSE, + 6); + + gtk_widget_show_all (hbox2); + } +#endif + + gtk_box_pack_start (GTK_BOX (vbox2), hbox2, TRUE, TRUE, 6); plug->priv->auth_capslock_label = gtk_label_new (""); gtk_misc_set_alignment (GTK_MISC (plug->priv->auth_capslock_label), 0, 0.5); @@ -1514,11 +1673,38 @@ gtk_misc_set_alignment (GTK_MISC (plug->priv->auth_prompt_label), 0, 0.5); gtk_box_pack_start (GTK_BOX (vbox2), plug->priv->auth_prompt_label, FALSE, FALSE, 0); + hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); plug->priv->auth_prompt_entry = gtk_entry_new (); - gtk_box_pack_start (GTK_BOX (vbox2), plug->priv->auth_prompt_entry, TRUE, TRUE, 0); gtk_label_set_mnemonic_widget (GTK_LABEL (plug->priv->auth_prompt_label), plug->priv->auth_prompt_entry); + gtk_box_pack_start (GTK_BOX (hbox2), plug->priv->auth_prompt_entry, TRUE, TRUE, 6); + + /* Layout indicator */ +#ifdef WITH_KBD_LAYOUT_INDICATOR + gs_lock_plug_init_input_sources (plug); + + if (plug->priv->input_sources->len > 1) { + GtkWidget *layout_indicator; + + layout_indicator = gtk_event_box_new (); + plug->priv->input_sources_label = gtk_label_new (NULL); + input_sources_current_changed_cb (plug->priv->input_sources_settings, CURRENT_KEY, plug); + g_signal_connect (layout_indicator, "button-release-event", G_CALLBACK (layout_indicator_clicked_cb), plug); + gtk_widget_set_size_request (layout_indicator, 50, 40); + + gtk_container_add (GTK_CONTAINER (layout_indicator), plug->priv->input_sources_label); + gtk_box_pack_start (GTK_BOX (hbox2), + layout_indicator, + FALSE, + FALSE, + 6); + + gtk_widget_show_all (hbox2); + } +#endif + + gtk_box_pack_start (GTK_BOX (vbox2), hbox2, TRUE, TRUE, 0); plug->priv->auth_capslock_label = gtk_label_new (""); gtk_misc_set_alignment (GTK_MISC (plug->priv->auth_capslock_label), 0.5, 0.5); @@ -1595,8 +1781,6 @@ plug->priv->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (plug->priv->frame), plug->priv->vbox); - plug->priv->auth_prompt_kbd_layout_indicator = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - /* Notebook */ plug->priv->notebook = gtk_notebook_new (); gtk_notebook_set_show_tabs (GTK_NOTEBOOK (plug->priv->notebook), FALSE); @@ -1609,33 +1793,6 @@ gtk_widget_show_all (plug->priv->frame); - /* Layout indicator */ -#ifdef WITH_KBD_LAYOUT_INDICATOR - if (plug->priv->auth_prompt_kbd_layout_indicator != NULL) { - XklEngine *engine; - - engine = xkl_engine_get_instance (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())); - if (xkl_engine_get_num_groups (engine) > 1) { - GtkWidget *layout_indicator; - - layout_indicator = gkbd_indicator_new (); - gkbd_indicator_set_parent_tooltips (GKBD_INDICATOR (layout_indicator), TRUE); - gtk_box_pack_start (GTK_BOX (plug->priv->auth_prompt_kbd_layout_indicator), - layout_indicator, - FALSE, - FALSE, - 6); - - gtk_widget_show_all (layout_indicator); - gtk_widget_show (plug->priv->auth_prompt_kbd_layout_indicator); - } else { - gtk_widget_hide (plug->priv->auth_prompt_kbd_layout_indicator); - } - - g_object_unref (engine); - } -#endif - if (plug->priv->auth_switch_button != NULL) { if (plug->priv->switch_enabled) { gtk_widget_show_all (plug->priv->auth_switch_button); @@ -1705,6 +1862,19 @@ g_return_if_fail (plug->priv != NULL); + if (plug->priv->input_sources != NULL) + g_ptr_array_unref (plug->priv->input_sources); + + if (plug->priv->input_sources_label != NULL) { + g_signal_handlers_disconnect_by_data (plug->priv->input_sources_label, plug); + g_object_unref (plug->priv->input_sources_label); + } + + if (plug->priv->input_sources_settings != NULL) { + g_signal_handlers_disconnect_by_data (plug->priv->input_sources_settings, plug); + g_object_unref (plug->priv->input_sources_settings); + } + g_free (plug->priv->logout_command); remove_response_idle (plug); --- a/configure.ac +++ b/configure.ac @@ -66,7 +66,8 @@ PKG_CHECK_MODULES(GNOME_SCREENSAVER_DIALOG, gthread-2.0 - gtk+-3.0 >= $GTK_REQUIRED_VERSION) + gtk+-3.0 >= $GTK_REQUIRED_VERSION + gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) AC_SUBST(GNOME_SCREENSAVER_DIALOG_CFLAGS) AC_SUBST(GNOME_SCREENSAVER_DIALOG_LIBS) debian/patches/30_ubuntu-lock-on-suspend_gsetting.patch0000664000000000000000000000460512321253154020412 0ustar From f1d92c7881650a2cbd2a6eff651d5b1659ee755b Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 1 May 2013 10:53:17 -0700 Subject: [PATCH] Handle ubuntu-lock-on-suspend gsettings key This is introduced in Ubuntu's gsettings-desktop-schemas package. --- src/gs-prefs.c | 11 +++++++++++ src/gs-prefs.h | 1 + 2 files changed, 12 insertions(+) diff --git a/src/gs-prefs.c b/src/gs-prefs.c index 699874f..a98acb2 100644 --- a/src/gs-prefs.c +++ b/src/gs-prefs.c @@ -51,6 +51,7 @@ static void gs_prefs_finalize (GObject *object); #define KEY_KEYBOARD_ENABLED "embedded-keyboard-enabled" #define KEY_KEYBOARD_COMMAND "embedded-keyboard-command" #define KEY_STATUS_MESSAGE_ENABLED "status-message-enabled" +#define KEY_UBUNTU_LOCK_ON_SUSPEND "ubuntu-lock-on-suspend" #define GS_PREFS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_PREFS, GSPrefsPrivate)) @@ -258,6 +259,9 @@ gs_prefs_load_from_settings (GSPrefs *prefs) uvalue = _gs_settings_get_uint (prefs->priv->settings, KEY_LOCK_DELAY); _gs_prefs_set_lock_timeout (prefs, uvalue); + bvalue = g_settings_get_boolean (prefs->priv->settings, KEY_UBUNTU_LOCK_ON_SUSPEND); + prefs->ubuntu_lock_on_suspend = bvalue; + /* Embedded keyboard options */ bvalue = g_settings_get_boolean (prefs->priv->settings, KEY_KEYBOARD_ENABLED); @@ -330,6 +334,13 @@ key_changed_cb (GSettings *settings, disabled = g_settings_get_boolean (settings, key); _gs_prefs_set_lock_disabled (prefs, disabled); + } else if (strcmp (key, KEY_UBUNTU_LOCK_ON_SUSPEND) == 0) { + + gboolean enabled; + + enabled = g_settings_get_boolean (settings, key); + prefs->ubuntu_lock_on_suspend = enabled; + gs_debug ("ubuntu-lock-on-suspend=%d",enabled); } else if (strcmp (key, KEY_USER_SWITCH_DISABLE) == 0) { gboolean disabled; diff --git a/src/gs-prefs.h b/src/gs-prefs.h index ee722ac..7ca51c0 100644 --- a/src/gs-prefs.h +++ b/src/gs-prefs.h @@ -54,6 +54,7 @@ typedef struct char *logout_command; /* command to use to logout */ char *keyboard_command; /* command to use to embed a keyboard */ + guint ubuntu_lock_on_suspend : 1; /* whether to lock on suspend */ } GSPrefs; typedef struct -- 1.8.1.2 debian/patches/24_use_user_settings.patch0000664000000000000000000000326512321253154015723 0ustar Description: use the user settings, and not the default system ones, so we get the user's background when the screen is locked. Author: Marc Deslauriers Forwarded: no, is a Ubuntu-specific preference Index: gnome-screensaver-3.2.0/src/gs-manager.c =================================================================== --- gnome-screensaver-3.2.0.orig/src/gs-manager.c 2012-02-09 21:23:41.000000000 -0500 +++ gnome-screensaver-3.2.0/src/gs-manager.c 2012-02-09 21:25:51.884447527 -0500 @@ -555,13 +555,8 @@ gint n_keys, GSManager *manager) { -#if 0 - /* FIXME: since we bind user settings instead of system ones, - * watching for changes is no longer valid. - */ gnome_bg_load_from_preferences (manager->priv->bg, manager->priv->settings); -#endif return FALSE; } @@ -570,24 +565,9 @@ get_system_settings (void) { GSettings *settings; - gchar **keys; - gchar **k; - /* FIXME: we need to bind system settings instead of user but - * that's currently impossible, not implemented yet. - * Hence, reset to system default values. - */ - /* TODO: Ideally we would like to bind some other key, screensaver-specific. */ settings = g_settings_new ("org.gnome.desktop.background"); - g_settings_delay (settings); - - keys = g_settings_list_keys (settings); - for (k = keys; *k; k++) { - g_settings_reset (settings, *k); - } - g_strfreev (keys); - return settings; } debian/patches/19_not_autostart_in_unity.patch0000664000000000000000000000256212321253154017000 0ustar Description: Do not run the autostart file in Unity Author: Marco Trevisan Forwarded: No, Unity/Ubuntu specific Last-Update: 2014-04-08 Index: gnome-screensaver/src/gnome-screensaver.desktop.in =================================================================== --- gnome-screensaver.orig/src/gnome-screensaver.desktop.in 2014-04-08 03:08:23.615979682 +0200 +++ gnome-screensaver/src/gnome-screensaver.desktop.in 2014-04-08 03:11:23.478152698 +0200 @@ -5,7 +5,8 @@ Icon=preferences-desktop-screensaver Exec=gnome-screensaver OnlyShowIn=GNOME; -AutostartCondition=GNOME3 if-session gnome-fallback +NotShowIn=Unity; +AutostartCondition=GNOME3 unless-session gnome NoDisplay=true X-GNOME-Autostart-Delay=20 X-GNOME-Autostart-Phase=Application Index: gnome-screensaver/src/gnome-screensaver.desktop.in.in =================================================================== --- gnome-screensaver.orig/src/gnome-screensaver.desktop.in.in 2014-04-08 03:08:23.615979682 +0200 +++ gnome-screensaver/src/gnome-screensaver.desktop.in.in 2014-04-08 03:09:03.555573988 +0200 @@ -5,7 +5,8 @@ Icon=preferences-desktop-screensaver Exec=gnome-screensaver OnlyShowIn=GNOME; -AutostartCondition=GNOME3 if-session gnome-fallback +NotShowIn=Unity; +AutostartCondition=GNOME3 unless-session gnome NoDisplay=true X-GNOME-Autostart-Delay=20 X-GNOME-Autostart-Phase=Application debian/patches/14_no_fade_on_user_switch.patch0000664000000000000000000000137112321253154016652 0ustar Description: Work around LP: #546578 by disabling the fade effect on screen locking Bug-Ubuntu: https://launchpad.net/bugs/546578 Forwarded: not-needed Author: Chris Coulson Index: gnome-screensaver-3.4.2/src/gs-manager.c =================================================================== --- gnome-screensaver-3.4.2.orig/src/gs-manager.c 2012-02-10 20:11:45.000000000 +1300 +++ gnome-screensaver-3.4.2/src/gs-manager.c 2012-06-28 10:49:44.203328694 +1200 @@ -1268,7 +1268,7 @@ manager->priv->active = TRUE; /* fade to black and show windows */ - do_fade = TRUE; + do_fade = FALSE; if (do_fade) { manager->priv->fading = TRUE; gs_debug ("fading out"); debian/patches/allow-replacement0000664000000000000000000000573612321253154014166 0ustar Description: Allow the dbus service to be replaced, so that other implementations of the interface (e.g. Unity) can take the service over. We quit if someone else claims the name, as D-Bus activation will restart us if that owner then goes away. Author: Iain Lane Forwared: not-needed Index: b/src/gs-listener-dbus.c =================================================================== --- a/src/gs-listener-dbus.c +++ b/src/gs-listener-dbus.c @@ -28,6 +28,7 @@ #include #include +#include #include #include @@ -1092,7 +1093,24 @@ g_timeout_add (10000, (GSourceFunc)reinit_dbus, listener); } else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, - "NameOwnerChanged")) { + "NameLost")) { + const char *name; + DBusError error; + dbus_error_init (&error); + + if (!dbus_message_get_args (message, &error, + DBUS_TYPE_STRING, &name, + DBUS_TYPE_INVALID)) { + g_warning("Got NameLost, but couldn't read name"); + dbus_error_free (&error); + } else { + if (strcmp (name, GS_INTERFACE) == 0) { // We've been replaced + g_message ("Lost the name, shutting down."); + dbus_connection_unref (connection); + listener->priv->connection = NULL; + gtk_main_quit (); + } + } } else { return listener_dbus_handle_session_message (connection, message, user_data, FALSE); } @@ -1317,7 +1335,6 @@ _("not connected to the message bus")); return FALSE; } - if (screensaver_is_running (listener->priv->connection)) { g_set_error (error, GS_LISTENER_ERROR, @@ -1339,7 +1356,7 @@ res = dbus_bus_request_name (listener->priv->connection, GS_SERVICE, - DBUS_NAME_FLAG_DO_NOT_QUEUE, + DBUS_NAME_FLAG_DO_NOT_QUEUE | DBUS_NAME_FLAG_ALLOW_REPLACEMENT, &buserror); if (dbus_error_is_set (&buserror)) { g_set_error (error, @@ -1365,7 +1382,7 @@ "type='signal'" ",interface='"DBUS_INTERFACE_DBUS"'" ",sender='"DBUS_SERVICE_DBUS"'" - ",member='NameOwnerChanged'", + ",member='NameLost'", NULL); if (listener->priv->system_connection != NULL) { debian/patches/13_nvidia_gamma_fade_fallback.patch0000664000000000000000000000317512321253154017361 0ustar Description: Fall back to XF86VM gamma fade if XRANDR gamma fade is not supported Author: Chris Coulson Bug-Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/gnome-screensaver/+bug/522806 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=610294 Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=610294 Index: gnome-screensaver-3.4.2/src/gs-fade.c =================================================================== --- gnome-screensaver-3.4.2.orig/src/gs-fade.c 2012-06-28 10:49:32.055329115 +1200 +++ gnome-screensaver-3.4.2/src/gs-fade.c 2012-06-28 10:49:42.915328739 +1200 @@ -571,6 +571,10 @@ GdkDisplay *display = gdk_display_get_default (); GdkScreen *screen = gdk_display_get_screen (display, screen_idx); struct GSFadeScreenPrivate *screen_priv; + GnomeRRCrtc **crtcs; + GnomeRRCrtc *crtc; + gboolean res; + int gamma_size; screen_priv = &fade->priv->screen_priv[screen_idx]; @@ -581,6 +585,19 @@ return; } + crtcs = gnome_rr_screen_list_crtcs (screen_priv->rrscreen); + + while (*crtcs) + { + crtc = *crtcs; + res = gnome_rr_crtc_get_gamma (crtc, &gamma_size, NULL, NULL, NULL); + if (res == FALSE || gamma_size == 0) { + screen_priv->fade_type = FADE_TYPE_NONE; + return; + } + crtcs++; + } + screen_priv->fade_type = FADE_TYPE_XRANDR; screen_priv->fade_setup = xrandr_fade_setup; screen_priv->fade_finish = screen_fade_finish; debian/patches/26_lightdm_greeter_on_lock.patch0000664000000000000000000000437512321253154017027 0ustar From fe931bed8649dc57274c81b3d7f424e4352afdce Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Fri, 10 Feb 2012 16:05:59 +1100 Subject: [PATCH] Switch to greeter when locking screen --- src/gs-manager.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/src/gs-manager.c b/src/gs-manager.c index d42bd27..e6cae77 100644 --- a/src/gs-manager.c +++ b/src/gs-manager.c @@ -136,6 +136,37 @@ gs_manager_set_lock_active (GSManager *manager, gs_window_set_lock_enabled (l->data, lock_active); } } + + /* If running under LightDM switch to the greeter and use that as the screenlock */ + if (lock_active && g_getenv("XDG_SEAT_PATH")) { + GDBusConnection *bus; + GVariant *result = NULL; + GError *error = NULL; + + bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error); + if (error) + g_warning ("Failed to get system bus: %s", error->message); + g_clear_error (&error); + + if (bus) + result = g_dbus_connection_call_sync (bus, + "org.freedesktop.DisplayManager", + g_getenv ("XDG_SEAT_PATH"), + "org.freedesktop.DisplayManager.Seat", + "SwitchToGreeter", + g_variant_new ("()"), + G_VARIANT_TYPE ("()"), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, + &error); + if (error) + g_warning ("Failed to switch to greeter: %s", error->message); + g_clear_error (&error); + + if (result) + g_variant_unref (result); + } } void -- 1.7.9 debian/rules0000775000000000000000000000110212321253154010240 0ustar #!/usr/bin/make -f include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/utils.mk include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk DEB_CONFIGURE_EXTRA_FLAGS += \ --enable-locking \ --enable-docbook-docs \ --with-systemd LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed binary-post-install/gnome-screensaver:: rm -rf debian/gnome-screensaver/usr/share/doc/gnome-screensaver-* dh_apport debian/source/0000775000000000000000000000000012321253154010466 5ustar debian/source/format0000664000000000000000000000001412321253154011674 0ustar 3.0 (quilt) debian/source.apport0000664000000000000000000000520312321253154011715 0ustar #!/usr/bin/python '''Apport package hook for gnome-screensaver (c) 2010 Canonical Ltd. Contributors: Marc Deslauriers Chris Coulson This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. See http://www.gnu.org/copyleft/gpl.html for the full text of the license. ''' from apport.hookutils import * import dbus def add_info(report): attach_file_if_exists(report, '/etc/X11/xorg.conf', 'XorgConf') attach_file_if_exists(report, '/var/log/Xorg.0.log', 'XorgLog') attach_file_if_exists(report, '/var/log/Xorg.0.log.old', 'XorgLogOld') # We want the whole thing, not just the changes report['GsettingsGnomeScreensaver'] = command_output(['gsettings', 'list-recursively', 'org.gnome.desktop.screensaver']) report['GsettingsGnomePowerManager'] = command_output(['gsettings', 'list-recursively', 'org.gnome.settings-daemon.plugins.power']) report['GsettingsGnomeSession'] = command_output(['gsettings', 'list-recursively', 'org.gnome.desktop.session']) report['GsettingsGnomeLockdown'] = command_output(['gsettings', 'list-recursively', 'org.gnome.desktop.lockdown']) try: bus = dbus.SessionBus() session_manager = bus.get_object('org.gnome.SessionManager', '/org/gnome/SessionManager') session_manager_iface = dbus.Interface(session_manager, dbus_interface='org.gnome.SessionManager') inhibitors = session_manager_iface.GetInhibitors() inhibitors_str = '' master_flag = 0 j = 1 for i in inhibitors: obj = bus.get_object('org.gnome.SessionManager', i) iface = dbus.Interface(obj, dbus_interface='org.gnome.SessionManager.Inhibitor') app_id = iface.GetAppId() flags = iface.GetFlags() reason = iface.GetReason() if j > 1: inhibitors_str += '\n' inhibitors_str += str(j) + ': AppId = ' + app_id + ', Flags = ' + str(flags) + ', Reason = ' + reason j = j + 1 master_flag |= flags report['GnomeSessionInhibitors'] = 'None' if inhibitors_str == '' else inhibitors_str report['GnomeSessionIdleInhibited'] = 'Yes' if master_flag & 8 else 'No' except: report['GnomeSessionInhibitors'] = 'Failed to acquire' report['GnomeSessionIdleInhibited'] = 'Unknown' if __name__ == '__main__': report = {} add_info(report) for key in report: print('[%s]\n%s' % (key, report[key])) debian/watch0000664000000000000000000000016512321253154010221 0ustar version=3 http://ftp.gnome.org/pub/GNOME/sources/gnome-screensaver/([\d\.]+[02468])/ gnome-screensaver-(.*)\.tar\.xz debian/control0000664000000000000000000000432612321253156010600 0ustar # This file is autogenerated. DO NOT EDIT! # # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. Source: gnome-screensaver Section: gnome Priority: optional Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Guilherme de S. Pastore Uploaders: Debian GNOME Maintainers , Jeremy Bicha Build-Depends: cdbs, debhelper (>= 8.1.0~), dh-apport, dh-autoreconf, gnome-common, gnome-pkg-tools (>= 0.10), libdbus-glib-1-dev (>= 0.30), libglib2.0-dev (>= 2.15.0), libgtk-3-dev (>= 3.0.0), libgnome-desktop-3-dev (>= 3.1.91), libgnomekbd-dev (>= 2.91.91), libsystemd-login-dev, libsystemd-daemon-dev, libx11-dev, libxt-dev, libxext-dev, libx11-dev, libpam0g-dev, xmlto, x11proto-xext-dev, x11proto-scrnsaver-dev, libxss-dev, x11proto-xf86vidmode-dev, libxxf86vm-dev, libgl1-mesa-dev | libgl1-mesa-swx11-dev, gsettings-desktop-schemas-dev (>= 2.91.91) Standards-Version: 3.9.3 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-screensaver/ubuntu Homepage: http://live.gnome.org/GnomeScreensaver Package: gnome-screensaver Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, dbus-x11, gnome-icon-theme (>= 2.15.90), gsettings-desktop-schemas (>= 2.91.92) Recommends: gnome-power-manager | xfce4-power-manager, libpam-gnome-keyring Description: GNOME screen saver and locker gnome-screensaver is a screen saver and locker that aims to have simple, sane and secure defaults, and be well integrated with the GNOME desktop. . It is designed to support, among other things: . * the ability to lock down configuration settings * translation into other languages * user switching debian/gnome-screensaver.dirs0000664000000000000000000000002112321253154013465 0ustar /usr/share/gnome debian/copyright0000664000000000000000000001102612321253154011121 0ustar This package was debianized by Guilherme de S. Pastore on Sat, 9 Jul 2005 18:16:18 -0300. It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/gnome-screensaver Upstream Author: William Jon McCann xscreensaver Copyright (C) 1991-2004 Jamie Zawinski Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation. No representations are made about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. GNOME Screensaver Copyright (C) 2004-2008 William Jon McCann This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. Floater saver Copyright (C) 2005 Ray Strode , Copyright (C) 2005 Matthias Clasen , Copyright (C) 2005 Søren Sandmann This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. GNOME Screensaver Theme Window Copyright (C) 2005 Ray Strode This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. The translations into Dutch, Finnish, French, Japanese, Lithuanian, Brazilian Portuguese, Slovak, Swedish, Thai, Ukrainian and traditional Chinese are copyrighted by the Free Software Foundation, Inc. The Vietnamese translation is copyrighted by the GNOME i18n Project for Vietnamese. The Hungarian translation is copyrighted by Canonical Ltd. and Rosetta Contributors 2005. They are all licensed under the GNU General Public License as published by the Free Software Foundation, either version 2 or any later version. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA On Debian Systems, the full text of the license can be found on /usr/share/common-licenses/GPL-2 Some files are licensed under the following terms: This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. On Debian Systems, the full text of the license can be found on /usr/share/common-licenses/LGPL-2 savers/xdg-user-dir-lookup.[ch] are licensed under the following terms: Copyright (c) 2007 Red Hat, inc Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. debian/gnome-screensaver.pam0000664000000000000000000000007012321253154013305 0ustar @include common-auth auth optional pam_gnome_keyring.so debian/changelog0000664000000000000000000007713312321253154011053 0ustar gnome-screensaver (3.6.1-0ubuntu13) trusty; urgency=medium * debian/patches/allow-replacement: Make the D-Bus interface able to be replaced, so that Unity (or others in future) can take it over if they want to provide their own screensaver implementations. No need to listen to NameOwnerChanged, only NameLost — so we don't have to wake gnome-screensaver up every time this signal goes across the bus. -- Iain Lane Wed, 09 Apr 2014 15:17:04 +0100 gnome-screensaver (3.6.1-0ubuntu12) trusty; urgency=medium * debian/patches/33_unity_lockscreen_on_lock.patch: - disable this patch as unity doesn't need it anymore * debian/patches/19_not_autostart_in_unity.patch: - do not autostart GS in unity session -- Robert Bruce Park Tue, 08 Apr 2014 10:47:18 -0700 gnome-screensaver (3.6.1-0ubuntu11) trusty; urgency=medium * debian/patches/33_unity_lockscreen_on_lock.patch: - Use the original GNOME lock screen if the screen reader is enabled and running. The unity lock screen is not accessible to screen reader users. -- Luke Yelavich Thu, 13 Mar 2014 16:57:43 +1100 gnome-screensaver (3.6.1-0ubuntu10) trusty; urgency=medium * debian/patches/33_unity_lockscreen_on_lock.patch: - use unity lockscreen to lock when available (LP: #878836) -- Marco Trevisan (Treviño) Mon, 10 Mar 2014 18:40:49 +0100 gnome-screensaver (3.6.1-0ubuntu9) trusty; urgency=low * debian/patches/17_remove_top_panel.patch: - display time in lock screen (LP: #1265610) -- Michael Vogt Tue, 07 Jan 2014 19:21:20 +0100 gnome-screensaver (3.6.1-0ubuntu8) trusty; urgency=medium * debian/patches/move_not_nuke.patch: When trying to acquire a contentious keyboard grab, don't nuke input focus, but instead move it to new grab window before taking grab (LP: #1175717) -- Iain Lane Tue, 07 Jan 2014 16:31:45 +0000 gnome-screensaver (3.6.1-0ubuntu7) saucy; urgency=low * debian/patches/32_input_sources_switcher.patch: - Use input sources instead of XKB layouts. (lp: #1225514) -- William Hua Tue, 29 Oct 2013 11:21:38 -0700 gnome-screensaver (3.6.1-0ubuntu6) saucy; urgency=low * No-change rebuild against latest gnome-desktop3 -- Jeremy Bicha Tue, 28 May 2013 08:33:08 -0400 gnome-screensaver (3.6.1-0ubuntu5) saucy; urgency=low * Add 30_ubuntu-lock-on-suspend_gsetting.patch: Handle ubuntu-lock-on-suspend gsettings key. This is introduced in Ubuntu's gsettings-desktop-schemas package. * Add 31_lock_screen_on_suspend.patch: Lock screen on suspend. Listen for logind's PrepareForSleep signal, and lock the screen (if configured to do so). This mirrors what gnome-shell's screensaver does, obsoleting our Ubuntu specific patch in g-s-d. -- Martin Pitt Wed, 01 May 2013 11:08:03 -0700 gnome-screensaver (3.6.1-0ubuntu4) saucy; urgency=low * Switch to logind for session tracking. * Add 00git_logind_check.patch: Check for logind, not for systemd. -- Martin Pitt Sun, 28 Apr 2013 21:50:11 -0700 gnome-screensaver (3.6.1-0ubuntu3) raring; urgency=low * SECURITY UPDATE: broken screen locking with Unity desktop (LP: #1120126) - debian/patches/19_autostart_in_unity.patch: change AutostartCondition so gnome-screensaver gets started properly in the Unity session also. - CVE-2013-1050 -- Marc Deslauriers Sat, 09 Feb 2013 09:37:59 -0500 gnome-screensaver (3.6.1-0ubuntu2) raring; urgency=low * debian/patches/28_handle_expired_creds.patch: - Allow handling of expired credentials. Thanks Brian C. Huffman for patch. (LP: #952771) -- Sergey Urushkin Thu, 29 Nov 2012 13:19:54 +0400 gnome-screensaver (3.6.1-0ubuntu1) raring; urgency=low * New upstream release -- Robert Ancell Tue, 13 Nov 2012 10:06:06 +1300 gnome-screensaver (3.6.0-0ubuntu2) quantal-proposed; urgency=low * debian/patches/28_blocking_return.patch: - Correctly reply so the client doesn't block waiting (lp: #1067515) -- Sebastien Bacher Thu, 18 Oct 2012 19:35:19 +0200 gnome-screensaver (3.6.0-0ubuntu1) quantal; urgency=low * New upstream stable release [ Jeremy Bicha ] * debian/source.apport: - Drop final gconf check, the current desktop session is already being reported -- Robert Ancell Wed, 26 Sep 2012 09:59:35 +1200 gnome-screensaver (3.5.5-0ubuntu1) quantal; urgency=low * New upstream release * debian/patches/19_autostart_in_unity.patch: - still start on unity session -- Didier Roche Tue, 07 Aug 2012 09:16:20 +0200 gnome-screensaver (3.5.4-0ubuntu1) quantal; urgency=low * New upstream release (LP: #1018710) -- Robert Ancell Sat, 28 Jul 2012 19:29:45 +0200 gnome-screensaver (3.4.1-0ubuntu4) quantal; urgency=low * debian/source.apport: Fix compatibility with Python 3. Thanks Edward Donovan! (LP: #1013171) -- Martin Pitt Mon, 18 Jun 2012 15:14:56 +0200 gnome-screensaver (3.4.1-0ubuntu3) quantal; urgency=low * No-change rebuild for libgnomekbd8. -- Mathieu Trudel-Lapierre Mon, 11 Jun 2012 16:01:35 -0400 gnome-screensaver (3.4.1-0ubuntu2) quantal; urgency=low * Rebuild for the libgnome-desktop SOVER bump. -- Adam Conrad Thu, 07 Jun 2012 15:58:55 -0600 gnome-screensaver (3.4.1-0ubuntu1) precise; urgency=low * New upstream bug fix release: - Drop num lock warning - Translation updates. * Drop 22_dont_show_numlock_warning.patch, applied upstream. -- Martin Pitt Mon, 16 Apr 2012 09:02:26 +0200 gnome-screensaver (3.4.0-0ubuntu1) precise-proposed; urgency=low * New upstream release: - Fix fade when explicitly locking screen - Updated translations -- Didier Roche Tue, 27 Mar 2012 10:57:33 +0200 gnome-screensaver (3.2.2-0ubuntu2) precise; urgency=low * debian/patches/27_lightdm_switch_user.patch: When used under lightdm, use dbus to switch to greeter instead of calling gdmflexiserver. (LP: #950583) -- Marc Deslauriers Mon, 12 Mar 2012 14:38:07 -0400 gnome-screensaver (3.2.2-0ubuntu1) precise; urgency=low * New upstream bug fix release. * Drop 23_fix_capslock_warning.patch, applied upstream. * Update other patches for new upstream release. -- Martin Pitt Wed, 07 Mar 2012 15:29:28 +0100 gnome-screensaver (3.2.1-0ubuntu1) precise; urgency=low * New upstream release * debian/patches/01_git_background_scaling.patch: * debian/patches/20_remove_wrong_timeout.patch: remove old upper timeout * debian/patches/21_properly_lock_when_activated.patch: - Applied upstream * debian/rules: - Compile with --without-systemd -- Robert Ancell Thu, 16 Feb 2012 12:17:35 +1100 gnome-screensaver (3.2.0-1ubuntu12) precise; urgency=low * Disable 26_lightdm_greeter_on_lock.patch for now. VT switches/multiple heads are FUBAR on NVidia, and as long as the new greeter X.org reconfigures XRandR this introduces lots of flickering and long delays. See #878836 comment 12 ff. -- Martin Pitt Wed, 15 Feb 2012 11:02:02 +0100 gnome-screensaver (3.2.0-1ubuntu11) precise; urgency=low [ Robert Ancell ] * debian/patches/26_lightdm_greeter_on_lock.patch: - Switch to the LightDM greeter when locking the screen (LP: #878836) [ Colin Watson ] * debian/control.in: - Add Pre-Depends: ${misc:Pre-Depends} for dpkg-maintscript-helper. -- Sebastien Bacher Tue, 14 Feb 2012 18:52:50 +0100 gnome-screensaver (3.2.0-1ubuntu10) precise; urgency=low * debian/patches/24_use_user_settings.patch: use the user settings, and not the default system ones, so we get the user's background when the screen is locked. * debian/patches/25_fix_lock_command.patch: make --lock expect a reply so the screen gets properly locked when gnome-screensaver needs to be respawned by dbus. This was preventing ctrl-alt-l from locking the screen on the first attempt when the gnome-screensaver process was dead. -- Marc Deslauriers Thu, 09 Feb 2012 21:27:15 -0500 gnome-screensaver (3.2.0-1ubuntu9) precise; urgency=low * debian/patches/23_fix_capslock_warning.patch: capslock turns off when the key is released, so updating the message on key press events doesn't work properly. Instead, use a proper handler. (LP: #929518) -- Marc Deslauriers Thu, 09 Feb 2012 14:00:43 -0500 gnome-screensaver (3.2.0-1ubuntu8) precise; urgency=low * debian/patches/22_dont_show_numlock_warning.patch: Don't show a warning for the numlock key, as some hardware tracks numlock status differently. (LP: #841541, LP: #877456, LP: #835649) * debian/patches/21_properly_lock_when_activated.patch: Updated with final upstream commit. -- Marc Deslauriers Sun, 05 Feb 2012 17:15:02 -0500 gnome-screensaver (3.2.0-1ubuntu7) precise; urgency=low * Slightly improve appearance of lock screen until it goes away or gets a proper makeover: - debian/patches/18_revert_dialog_layout.patch: removed. - debian/patches/18_unity_dialog_layout.patch: add username to lock dialog and adjust fonts and spacing when used with Unity. -- Marc Deslauriers Sat, 04 Feb 2012 01:49:52 -0500 gnome-screensaver (3.2.0-1ubuntu6) precise; urgency=low * debian/patches/21_properly_lock_when_activated.patch: If the screensaver is already active without a lock, and it got a request to lock, it would bail out without switching to a locked state. (LP: #869765) -- Marc Deslauriers Sun, 29 Jan 2012 13:20:33 -0500 gnome-screensaver (3.2.0-1ubuntu5) precise; urgency=low * debian/patches/20_remove_wrong_timeout.patch: remove old upper timeout limit that was incorrectly calculating minutes instead of seconds. This was causing the screen blanking to come up after 8 minutes, even if the preference was set to longer. (LP: #859396) -- Marc Deslauriers Sat, 28 Jan 2012 19:04:29 -0500 gnome-screensaver (3.2.0-1ubuntu4) precise; urgency=low * Uncomment "no_fade_on_user_switch" from the serie, the bug on user switching seems to still be happening without it (lp: #546578) -- Sebastien Bacher Thu, 12 Jan 2012 17:11:28 +0100 gnome-screensaver (3.2.0-1ubuntu3) precise; urgency=low * 11_autostart_delay.patch: Bump to 20 seconds to take it out of the critical path. g-s has a D-BUS service file, so if settings-daemon or others want to talk to it early, it'll get spawned automatically. * Add 19_autostart_in_unity.patch: Run the autostart file for Unity, too. -- Martin Pitt Thu, 05 Jan 2012 12:48:37 +0100 gnome-screensaver (3.2.0-1ubuntu2) precise; urgency=low * debian/patches/01_git_background_scaling.patch: git backport, should fix background scaling issues on multimonitor configs (lp: #854800) -- Sebastien Bacher Tue, 06 Dec 2011 15:21:09 +0100 gnome-screensaver (3.2.0-1ubuntu1) precise; urgency=low * debian/gnome-screensaver.postinst: - dropped, the migration version was before lucid * debian/control.in, debian/rules: - use dh_apport to install the apport hook * debian/gnome-screensaver.maintscript: - drop old pre lucid transition, update version for the new conffile one * debian/source_gnome-screensaver.apport: - updated to get gsettings keys rather than gconf ones * Resync on Debian, remaining difference: * debian/control: - Build-depends on gnome-common, dh-autoreconf - Don't build-depend on intltool - Don't depend on gnome-session-bin; it doesn't appear to actually be required, xubuntu is doing fine without it - Let xfce4-power-manager be an alternative to gnome-power-manager * debian/patches/03_fix_ltsp-fading.patch: don't fade on LTSP * debian/patches/04_force_blank_only_on_ltsp.patch: - Commented, the code patched got dropped or rewritten? * debian/patches/05_dbus_service.patch: - restore the dbus service that upstream dropped * debian/patches/10_legacy_scrsvr_inhibit.patch: - Re-write to not use XTest to simulate fake key-presses in order to reset the IDLETIME counter, as this appears to be problematic. Use XResetScreenSaver() to do this instead. * debian/patches/11_autostart_delay.patch: - Delay autostarting the screensaver for 5 seconds after the session start * debian/patches/13_nvidia_gamma_fade_fallback.patch: - Fall back to XF86VM gamma fade if XRANDR gamma fade is not supported * debian/patches/14_no_fade_on_user_switch.patch: - Disable fade on locking to work around #546578 and prevent the screen remaining blank after user switching. * debian/patches/15_dont_crash_on_no_fade.patch: - Don't crash on systems that don't support XF86VM or XRANDR gamma fade, by testing if fade is supported on a particular screen before calling the fade_setup and fade_finish virtual functions * debian/patches/16_dont_crash_in_kvm.patch: - Don't crash when the XF86VM extension doesn't allow the gamma to be set * Remove gnome-shell type panel (LP: #800585) - debian/patches/17_remove_top_panel.patch: Don't create the top panel. - debian/patches/18_revert_dialog_layout.patch: Revert lock dialog to previous appearance to get username back. * debian/rules: - drop debian specific autostart desktop location - use dh-autoreconf there * debian/source_gnome-screensaver.py: - ubuntu apport hook -- Sebastien Bacher Tue, 22 Nov 2011 16:19:45 +0100 gnome-screensaver (3.2.0-1) experimental; urgency=low * New upstream release * debian/control.in: Bump libgnome-desktop-3-dev b-d -- Sjoerd Simons Sun, 06 Nov 2011 15:06:45 +0000 gnome-screensaver (3.0.1-3) unstable; urgency=low * Bump dependency on gnome-session-bin to (>= 3.0) to avoid partial upgrades which can result in having the screen no longer locked on lid-close. Closes: #645427 -- Michael Biebl Thu, 27 Oct 2011 15:34:04 +0200 gnome-screensaver (3.0.1-2) unstable; urgency=low * Remove obsolete gnome-screensavers.menu conffile on upgrades. Closes: #645448 -- Michael Biebl Wed, 19 Oct 2011 10:52:38 +0200 gnome-screensaver (3.0.1-1) unstable; urgency=low * Upload to unstable. * New upstream release. * debian/watch: - Switch to .xz tarballs. * debian/control: - Remove Build-Depends on libgnome-menu-dev. - Set pkg-gnome-maintainers@lists.alioth.debian.org as Maintainer. - Bump Standards-Version to 3.9.2. No further changes. * Bump debhelper compatibility level to 8. -- Michael Biebl Fri, 14 Oct 2011 12:52:40 +0200 gnome-screensaver (3.0.0-2) experimental; urgency=low * Team upload. * Bump build-dep on libgnomekbd-dev to ensure we have a version linked with libgtk3-0. -- Raphaël Hertzog Sun, 10 Apr 2011 19:00:51 +0000 gnome-screensaver (3.0.0-1) experimental; urgency=low * Team upload. * New upstream release. -- Raphaël Hertzog Sun, 10 Apr 2011 18:30:09 +0000 gnome-screensaver (2.91.92-1) experimental; urgency=low * New upstream release. * debian/control.in: bump libgnome-desktop and gsettings-desktop-schemas dependencies, as the gsettings key for background picture has been changed. -- Frederic Peters Tue, 22 Mar 2011 14:38:48 +0100 gnome-screensaver (2.91.91-1) experimental; urgency=low * New upstream release. * debian/debian-floaters.desktop.in, debian/debian-swirl-logo.svg, debian/gnome-screensaver.install, debian/rules, debian/po-up: remove Floating Debian Swirl screensaver, there is no theme support anymore. * debian/rules: remove xscreensaver hacks configure flag, ditto. * debian/control.in: do not suggest xscreensaver-data or rss-glx, ditto. -- Frederic Peters Tue, 08 Mar 2011 18:04:52 +0100 gnome-screensaver (2.91.90-1) experimental; urgency=low * New upstream release. * debian/control.in, debian/patches/: - Schema has been moved to gsettings-desktop-schemas, remove patch. -- Frederic Peters Tue, 22 Feb 2011 21:16:48 +0100 gnome-screensaver (2.91.4-1) experimental; urgency=low * New upstream release. + debian/control.in: - Updated build dependencies. + debian/patches/0001-remove-cancel-button-and-set-a-minimum-width.patch, debian/patches/0002-add-a-gnome-3-style-panel-with-a-clock.patch: - Removed, included upstream. * debian/control.in: - Update for the new gtk+ package names. -- Emilio Pozuelo Monfort Sat, 19 Feb 2011 14:34:10 +0000 gnome-screensaver (2.91.3-1) experimental; urgency=low * New upstream release. + debian/control.in: - Update build dependencies. + debian/rules: - Remove obsolete configure flag. + debian/gconf-defaults, debian/patches/01_debian_screensaver.patch: - GConf is gone. Patch the gsettings schema to have the Debian screensaver by default. * debian/control.in, debian/rules, debian/source/format: + Switch to source format 3.0 (quilt). * debian/patches/0001-remove-cancel-button-and-set-a-minimum-width.patch, debian/patches/0002-add-a-gnome-3-style-panel-with-a-clock.patch: + Taken from upstream git, make the screensaver more GNOME 3. -- Emilio Pozuelo Monfort Wed, 19 Jan 2011 22:16:20 +0000 gnome-screensaver (2.30.0-3) unstable; urgency=low * Disable libnotify support, the function simply doesn’t work at all. Closes: #606830. -- Josselin Mouette Mon, 24 Jan 2011 17:46:22 +0100 gnome-screensaver (2.30.0-2) unstable; urgency=low * Depend on gnome-session-bin instead of gnome-session. Closes: #552436. * Only suggest rss-glx. Closes: #599634. -- Josselin Mouette Sat, 06 Nov 2010 13:43:45 +0100 gnome-screensaver (2.30.0-1) unstable; urgency=low * New upstream stable release: + debian/control.in: - Update build dependencies. -- Sebastian Dröge Tue, 04 May 2010 10:01:30 +0200 gnome-screensaver (2.28.3-1) unstable; urgency=high * New upstream bugfix release. - CVE-2010-0422, handle monitor hotplugging more securely. - Urgency high for this and the previous security updates. -- Emilio Pozuelo Monfort Mon, 15 Feb 2010 19:13:51 +0100 gnome-screensaver (2.28.2-1) unstable; urgency=low * New upstream bugfix release. - CVE-2010-0414, handle monitor removal more securely. Closes: #569084. - debian/patches/01_session_inhibitors.patch: + Removed, fixed upstream. * Standards-Version is 3.8.4, no changes needed. -- Emilio Pozuelo Monfort Wed, 10 Feb 2010 09:59:34 +0100 gnome-screensaver (2.28.0-2) unstable; urgency=low * Move the autostart file to /usr/share/gnome/autostart. * Remove the old one in the postinst. * Removed libxxf86misc-dev build-dependency. This extension has been removed in Xorg 7.4. Closes: #559689. * Add quilt support. * 01_session_inhibitors.patch: stolen from upstream git. Fix a leak of session inhibitors. Closes: #560049. -- Josselin Mouette Mon, 04 Jan 2010 19:09:35 +0100 gnome-screensaver (2.28.0-1) unstable; urgency=low * New upstream release. - Remove libglade2-dev build dependency, no longer needed. * Standards-Version is 3.8.3, no changes needed. -- Emilio Pozuelo Monfort Thu, 24 Sep 2009 18:01:13 +0200 gnome-screensaver (2.26.1-2) unstable; urgency=low * Depend on gnome-session 2.26, it is useless without it. Closes: #536381. -- Josselin Mouette Sat, 11 Jul 2009 11:34:43 +0200 gnome-screensaver (2.26.1-1) unstable; urgency=low [ Emilio Pozuelo Monfort ] * New upstream release. * debian/watch: don't uupdate. * debian/copyright: updated. * debian/patches/01_manpages_whatis.patch: removed, fixed upstream. * debian/rules: remove simple-patchsys.mk * Use unstable for Vcs-* * Standards-Version is 3.8.2, no changes needed. * debian/rules: install gconf-defaults file with default priority. * debian/debian-floaters.desktop: - Remove deprecated Encoding key. - Add trailing semicolon to Categories. - Add full path to the Exec command, as floaters is not in PATH. - Add OnlyShowIn: GNOME. * Add magic to make debian-floaters.desktop translatable. Thanks Josselin Mouette for the explanations. - Spanish translation by Francisco Javier Cuadrado. - Swedish translation by Martin Bagge. - German translation by Helge Kreutzmann. Closes: #533646. - Portuguese translation by Américo Monteiro. [ Josselin Mouette ] * Add French translation for the desktop file. * Enable building of docbook documentation. * rules, gnome-screensaver.docs: install it in a non-Redhatish place. * A bit of cleanup in build-dependencies. -- Josselin Mouette Fri, 26 Jun 2009 21:46:05 +0200 gnome-screensaver (2.24.1-2) unstable; urgency=low * Upload to unstable. * Standards version is 3.8.1. -- Josselin Mouette Tue, 07 Apr 2009 11:28:17 +0200 gnome-screensaver (2.24.1-1) experimental; urgency=low [ Emilio Pozuelo Monfort ] * New upstream release. - Restores the X gamma value instead of resetting it if it had been modified. Closes: #496685. - Update build dependencies. - Standards-Version is 3.8.0, no changes needed. - Add Vcs-* fields. - Remove --with-gdm-config from DEB_CONFIGURE_EXTRA_FLAGS, it's been removed upstream. - patches/01_compiz_lock_bypass_CVE-2007-3920.patch: + Removed, it has been properly fixed in the X server. See http://bugzilla.gnome.org/show_bug.cgi?id=488264. - debian/gnome-screensaver.manpages, debian/gnome-screensaver*.1: - Removed, the manpages are now shipped and installed upstream. [ Josselin Mouette ] * Don’t run dh_gconf twice. * Require libgnomekbd-dev 2.24 because of the merge with libgnomekbdui and to ensure using libgnomekbd3. * Include simple-patchsys. * 01_manpages_whatis.patch: new patch; fixes bad whatis entries in the manual pages. -- Josselin Mouette Wed, 10 Dec 2008 12:44:24 +0100 gnome-screensaver (2.22.2-2) unstable; urgency=low * Suggest xscreensaver-data. Closes: #469211. * Depend on dbus-x11 instead of dbus. -- Josselin Mouette Thu, 18 Sep 2008 15:57:52 +0200 gnome-screensaver (2.22.2-1) unstable; urgency=high * New upstream bugfix release: + SECURITY: CVE-2008-1683 unlocks session if it fails to get user attributes via getpwnam() (Closes: #475154). -- Sebastian Dröge Wed, 16 Apr 2008 10:50:22 +0200 gnome-screensaver (2.22.1-1) unstable; urgency=low * New upstream bugfix release. * debian/control.in: + Move homepage to Homepage field. -- Sebastian Dröge Wed, 02 Apr 2008 18:54:19 +0200 gnome-screensaver (2.22.0-1) unstable; urgency=medium [ Josselin Mouette ] * 02_clear_clipboard.patch: clear the clipboard when locking the screen. Closes: #455484. [ Loic Minier ] * Add a README.Debian to document that one should disable the gnome-keyring PAM module if the recommended libpam-gnome-keyring isn't installed; closes: #457549. [ Sebastian Dröge ] * New upstream stable release: + Drop gnome-vfs build dependency and build depend on glib >= 2.15.0. + 02_clear_clipboard.patch: Dropped, merged upstream. -- Sebastian Dröge Fri, 14 Mar 2008 10:15:47 +0100 gnome-screensaver (2.20.0-2) unstable; urgency=low [ Loic Minier ] * Build-dep on libnotify-dev for "Leave Message" functionality to actually work; thanks Hristo Hristov; Launchpad #140866; closes: #443766. [ Sven Arvidsson ] * Add man pages (Closes: #438606) [ Josselin Mouette ] * 01_compiz_lock_bypass_CVE-2007-3920.patch: place fix of the security upload in a proper separate patch. * gnome-screensaver.pam: add support for pam_gnome_keyring. * Recommend libpam-gnome-keyring. [ Loic Minier ] * Drop duplicate --with-gdm-config flag; thanks Ted Gould and Ubuntu; closes: #453512. [ Sebastian Dröge ] * ACK NMU (Closes: #446906) and upload to unstable. * debian/control.in: + Update Standards-Version to 3.7.3 (no additional changes needed). -- Sebastian Dröge Mon, 10 Dec 2007 07:55:36 +0100 gnome-screensaver (2.20.0-1.1) unstable; urgency=high * Non-maintainer upload by the testing-security team * Prevent screen lock bypass via shortcuts when compiz is running (Closes: #446906) Fixes: CVE-2007-3920 -- Steffen Joeris Wed, 24 Oct 2007 13:08:36 +0000 gnome-screensaver (2.20.0-1) unstable; urgency=low [ Riccardo Setti ] * New upstream release * Adjusted Build-Deps [ Josselin Mouette ] * Remove xscreensaver-gl from Recommends as it doesn't ship any .desktop files. -- Josselin Mouette Sat, 22 Sep 2007 15:07:01 +0200 gnome-screensaver (2.18.2-1) unstable; urgency=low * New upstream stable release. * Wrap build-deps and deps. * Cleanups. * Bump up Debhelper compatibility level to 5. -- Loic Minier Tue, 29 May 2007 11:56:21 +0200 gnome-screensaver (2.18.1-1) unstable; urgency=low [ Riccardo Setti ] * New upstream release. [ Sebastian Dröge ] * Upload to unstable, drop check-dist include. -- Sebastian Dröge Tue, 1 May 2007 20:33:17 +0200 gnome-screensaver (2.18.0-1) experimental; urgency=low [ Riccardo Setti ] * New upstream release [ Loic Minier ] * Build-dep on libgnomekbdui-dev (>= 0.1) for kbd-layout-indicator. * Bump up libgtk2.0-dev build-dep to >= 2.10.0 to make the package autobuildable. -- Loic Minier Sun, 25 Mar 2007 19:30:28 +0200 gnome-screensaver (2.16.3-2) experimental; urgency=low * Merge 2.14.3-2 up-to 2.14.3-4; SVN r7317:8959. - Drop patch 00_dbus_0.90, obsolete. - Drop patch 01_norwegian_translation_fix, merged upstream. -- Loic Minier Sat, 17 Mar 2007 13:26:32 +0100 gnome-screensaver (2.16.3-1) experimental; urgency=low * Add a get-orig-source target to retrieve the upstream tarball. * Include the new check-dist Makefile to prevent accidental uploads to unstable; bump build-dep on gnome-pkg-tools to >= 0.10. * New upstream stable release; bug fixes and translations. -- Loic Minier Sat, 17 Mar 2007 11:43:49 +0100 gnome-screensaver (2.16.2-1) experimental; urgency=low * New upstream release. * Remove duplicate build-dependency on libpam0g-dev. -- Josselin Mouette Fri, 8 Dec 2006 23:13:56 +0100 gnome-screensaver (2.16.0-1) experimental; urgency=low * New upstream release. -- Loic Minier Sat, 30 Sep 2006 01:29:27 +0200 gnome-screensaver (2.15.6-1) experimental; urgency=low * New upstream development releases. - Target at experimental. - Build-depends on libgl1-mesa-dev, and libpam0g-dev - Install Debian files via debian/gnome-screensaver.install instead of debian/rules; install debian-floaters in /usr/share/applications/screensavers instead of /usr/share/gnome-screensaver/themes. - Recommend xscreensaver-gl and rss-glx for additional screensavers. - Depend on gnome-icon-theme >= 2.15.90, first version providing the "preferences-desktop-screensaver" icon instead of "screensaver". * Add CDBS' utils. -- Loic Minier Mon, 14 Aug 2006 00:20:19 +0200 gnome-screensaver (2.14.3-4) unstable; urgency=low [ Sven Arvidsson ] * Fix spelling mistake in norwegian translation. (Closes: #402586) [ Loic Minier ] * Add a get-orig-source target to retrieve the upstream tarball. -- Loic Minier Sat, 13 Jan 2007 23:30:43 +0100 gnome-screensaver (2.14.3-3) unstable; urgency=low * Add a gconf-defaults file. + Set the default screensaver to be Debian floaters. (Closes: #367682) + Enable user switch option. * debian/rules: Register it with priority 15 * debian/control: Build-depend on debhelper 5.0.13. -- Gustavo Franco Fri, 24 Nov 2006 16:58:03 -0200 gnome-screensaver (2.14.3-2) unstable; urgency=low * debian/patches/00_dbus_0.90.patch - Added. Use dbus_connection_close instead of dbus_connection_disconnect, fixes FTBS with libdbus-1 >= 0.90 (Closes: #387240) -- Sjoerd Simons Wed, 13 Sep 2006 10:38:38 +0200 gnome-screensaver (2.14.3-1) unstable; urgency=low [ Loic Minier ] * Add watch file. [ Josselin Mouette ] * Recommend gnome-power-manager. [ Loic Minier ] * New upstream release. -- Loic Minier Tue, 8 Aug 2006 11:28:31 +0200 gnome-screensaver (2.14.2-1) unstable; urgency=low * New upstream release. -- Loic Minier Thu, 1 Jun 2006 12:02:48 +0200 gnome-screensaver (2.14.1-1) unstable; urgency=medium * New upstream release. * debian/control.in: - updated my e-mail address. - bumped Standards-Version with no changes. - added dependency on dbus (Closes: #353517). - added build-dependency on libxxf86misc-dev (Closes: #357885). -- Guilherme de S. Pastore Sat, 13 May 2006 12:25:18 -0300 gnome-screensaver (2.14.0-1) unstable; urgency=low * New upstream release * Update description. -- Sjoerd Simons Fri, 17 Mar 2006 11:13:32 +0100 gnome-screensaver (2.13.92-1) experimental; urgency=low * New upstream release * debian/patches/02_multiscreen_lifelock.patch + Removed. Fixed upstream * debian/patches/01_dont_modify_bg.patch + Removed. Unsure if it actually fixed the bug or made the race condition harder to trigger. So temporarely remove it for testing purposes -- Sjoerd Simons Wed, 1 Mar 2006 14:00:18 +0100 gnome-screensaver (0.0.24-2) unstable; urgency=low * debian/patches/02_multiscreen_lifelock.patch + Added. Prevent gnome-screensaver lifelock when using multiple screen. -- Sjoerd Simons Fri, 17 Feb 2006 14:38:17 +0100 gnome-screensaver (0.0.24-1) unstable; urgency=low [ Guilherme de S. Pastore ] * New upstream release [ Sjoerd Simons ] * Upload to unstable * Add --with-gdm-config=/etc/gdm/gdm.conf to DEB_CONFIGURE_EXTRA_FLAGS * Add debian swirl floater screensaver. Thanks to Martin-Éric Racine (Closes: #348281) * Trim down the build-depends * Add libexif-dev to the build-depends. Enables the slideshow screensaver to rotate pictures when needed. * debian/patches/01_dont_modify_bg.patch + Added. Calling gtk_widget_modify_bg seems to trigger a segv, so don't call it. -- Sjoerd Simons Mon, 6 Feb 2006 21:39:42 +0100 gnome-screensaver (0.0.23-2) experimental; urgency=low * Completed copyright and licensing notes. Thanks to Marc 'HE' Brockschmidt . -- Guilherme de S. Pastore Mon, 26 Dec 2005 09:57:58 -0200 gnome-screensaver (0.0.23-1) experimental; urgency=low * New upstream release. -- Guilherme de S. Pastore Wed, 21 Dec 2005 21:02:45 -0200 gnome-screensaver (0.0.21-1) experimental; urgency=low * Initial release (Closes: #317448) -- Guilherme de S. Pastore Tue, 6 Dec 2005 20:30:00 -0200 debian/control.in0000664000000000000000000000371712321253154011206 0ustar Source: gnome-screensaver Section: gnome Priority: optional Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Guilherme de S. Pastore Uploaders: @GNOME_TEAM@ Build-Depends: cdbs, debhelper (>= 8.1.0~), dh-apport, dh-autoreconf, gnome-common, gnome-pkg-tools (>= 0.10), libdbus-glib-1-dev (>= 0.30), libglib2.0-dev (>= 2.15.0), libgtk-3-dev (>= 3.0.0), libgnome-desktop-3-dev (>= 3.1.91), libgnomekbd-dev (>= 2.91.91), libsystemd-login-dev, libsystemd-daemon-dev, libx11-dev, libxt-dev, libxext-dev, libx11-dev, libpam0g-dev, xmlto, x11proto-xext-dev, x11proto-scrnsaver-dev, libxss-dev, x11proto-xf86vidmode-dev, libxxf86vm-dev, libgl1-mesa-dev | libgl1-mesa-swx11-dev, gsettings-desktop-schemas-dev (>= 2.91.91) Standards-Version: 3.9.3 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-screensaver/ubuntu Homepage: http://live.gnome.org/GnomeScreensaver Package: gnome-screensaver Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, dbus-x11, gnome-icon-theme (>= 2.15.90), gsettings-desktop-schemas (>= 2.91.92) Recommends: gnome-power-manager | xfce4-power-manager, libpam-gnome-keyring Description: GNOME screen saver and locker gnome-screensaver is a screen saver and locker that aims to have simple, sane and secure defaults, and be well integrated with the GNOME desktop. . It is designed to support, among other things: . * the ability to lock down configuration settings * translation into other languages * user switching debian/gnome-screensaver.maintscript0000664000000000000000000000011512321253154015065 0ustar rm_conffile /etc/xdg/menus/gnome-screensavers.menu 3.2.0-1 gnome-screensaver debian/README.Debian0000664000000000000000000000110212321253154011221 0ustar gnome-keyring warnings ---------------------- If you didn't install the libpam-gnome-keyring dependency, you should probably comment the pam_gnome_keyring.so line in /etc/pam.d/gnome-screensaver or you might see warnings similar to: gnome-screensaver-dialog: PAM unable to dlopen(/lib/security/pam_gnome_keyring.so) gnome-screensaver-dialog: PAM [error: /lib/security/pam_gnome_keyring.so: cannot open shared object file: No such file or directory] gnome-screensaver-dialog: PAM adding faulty module: lib/security/pam_gnome_keyring.so These can also be ignored.