Last commit made on 2015-07-20
Get this branch:
git clone -b ubuntu/wily https://git.launchpad.net/ubuntu/+source/gnome-screensaver
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

a24492b... by Iain Lane on 2015-07-20

Import patches-unapplied version 3.6.1-7ubuntu1 to ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: c19fd74aded5baa453510fae55d7aff88e3cadc7

New changelog entries:
  * Merge with Debian unstable, remaining changes:
    - Don't build-depend on intltool
    - Install an apport hook
    - 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
    - Depend on adwaita-icon-theme instead of gnome-icon-theme
    - debian/gnome-screensaver.maintscript:
      + drop old pre lucid transition, update version for the new conffile one
    - debian/patches/03_fix_ltsp-fading.patch: don't fade on LTSP
    - debian/patches/05_dbus_service.patch: restore the dbus service that
      upstream dropped
    - 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
    - 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/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
    - debian/patches/27_lightdm_switch_user.patch: When used under lightdm,
      use dbus to switch to greeter instead of calling gdmflexiserver.
    - debian/patches/28_blocking_return.patch:
      + Correctly reply so the client doesn't block waiting
    - debian/patches/28_handle_expired_creds.patch:
      + Allow handling of expired credentials.
    - 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.
    - debian/patches/32_input_sources_switcher.patch:
      + Use input sources instead of XKB layouts.
    - 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
    - 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.

c19fd74... by Iain Lane on 2015-07-20

Import patches-unapplied version 3.6.1-7 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 25221eb0afa114fbc31f3635a2c253e5de9ce7ec

New changelog entries:
  * d/p/0001-gs-lock-plug-Disconnect-signal-handler-from-right-ob.patch:
    Cherry-pick patch from upstream to disconnect a signal from the right

25221eb... by Dmitry Shachnev on 2015-07-13

Import patches-unapplied version 3.6.1-6 to debian/sid

Imported using git-ubuntu import.

Changelog parent: c4ec1ad27aed03e32c336d47ae24023bb3f7c75c

New changelog entries:
  * debian/patches/01_no_autostart.patch: Only autostart in GNOME Flashback
    sessions (closes: #790632).

c4ec1ad... by Dmitry Shachnev on 2015-07-06

Import patches-unapplied version 3.6.1-5 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 7ed4cc95f9ac49d6e36fd71a224cb9f484497c59

New changelog entries:
  * Build against the new systemd library (closes: #779746).
  * Bump Standards-Version to 3.9.6, no changes needed.

7ed4cc9... by Dmitry Shachnev on 2014-12-15

Import patches-unapplied version 3.6.1-4 to debian/sid

Imported using git-ubuntu import.

Changelog parent: f5b59cbfa9499e0bddb2f3c59ca7f89320bc0ea9

New changelog entries:
  * Upload to unstable, not experimental. This fixes RC bug.

f5b59cb... by Dmitry Shachnev on 2014-12-15

Import patches-unapplied version 3.6.1-3 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: 66333af4d94ea6e0763673ce3748ee913221d11f

New changelog entries:
  * Team upload.
  [ Faidon Liambotis ]
  * Re-enable support for locking the screen on suspend (closes: #773026).
    - Build with systemd support by passing --with-systemd=auto to configure
      and build-depending on libsystemd-login-dev. Use "auto" and a
      [linux-any] dependency to keep compatibility with non-Linux systems.
    - 00git_logind_check.patch from Ubuntu/upstream, to make this dependent on
      just logind, not systemd-as-pid1, as recommended by systemd upstream &
      Debian systemd maintainers. Drops libsystemd-daemon-dev build-dep.
    - 31_lock_screen_on_suspend.patch from Ubuntu, to listen for logind's
      PrepareForSleep signal, similarly to gnome-shell's behavior.
    - 14_no_fade_on_user_switch.patch from Ubuntu, as to not fade on screen
      lock. Prevents leaking of the screen contents on resume from suspend.

66333af... by Simon McVittie on 2014-09-11

Import patches-unapplied version 3.6.1-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 0e20ede7f99ae50ad08c05f0288a21a1b87c64dd

New changelog entries:
  * Team upload
  * Add missing permissive license to debian/copyright (Closes: #749519)
  * Add a missing copyright holder while I'm there
  * Add patch from upstream to enable gnome-screensaver to be included
    in the autostart list for non-GNOME sessions, by requiring session files
    to include it in RequiredComponents if desired and removing its
    AutostartCondition (Closes: #733059)
    - depend on dh-autoreconf and gnome-common so we can autoreconfiscate
    - remove fallback -> flashback patch, no longer relevant
    - Breaks versions of gnome-session-flashback that do not explicitly pull
      it in

0e20ede... by Emilio Pozuelo Monfort <email address hidden> on 2013-10-13

Import patches-unapplied version 3.6.1-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 7299a28245deca2fa2cd9ef42e92c95b83b09177

New changelog entries:
  [ Jeremy Bicha ]
  * Update homepage
  [ Laurent Bigonville ]
  * New upstream release
  * debian/control.in:
    - Bump Standards-Version to 3.9.4 (no further changes)
    - Add autotools-dev to the build-dependencies, so config.{guess,sub} are
      being updated during build
  [ Emilio Pozuelo Monfort ]
  * debian/patches/01_fallback_session.patch:
    + Fix session detection so that gnome-screensaver starts, the session
      is now called gnome-flashback instead of gnome-fallback.
  * Upload to unstable.

7299a28... by Sjoerd Simons on 2012-10-15

Import patches-unapplied version 3.6.0-1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: dd65bc6e63bad1dc420014aab820fc4e30a60679

New changelog entries:
  * New upstream release

dd65bc6... by Michael Biebl on 2012-04-15

Import patches-unapplied version 3.4.1-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 92ebd1098c58a0f9fd218cc6559ff704c222648a

New changelog entries:
  * New upstream release.
  * Update Vcs-* URLs.
  * Bump Standards-Version to 3.9.3.
  * Update debian/copyright using the machine-readable copyright format 1.0.