GNOME Shell

Merge lp://staging/~azzar1/gnome-shell/fix-1768786 into lp://staging/~ubuntu-desktop/gnome-shell/ubuntu

  1. fix-1768786
  2. Merge into ubuntu
Proposed by Andrea Azzarone
Status: Approved
Approved by: Sebastien Bacher
Approved revision: 150
Proposed branch: lp://staging/~azzar1/gnome-shell/fix-1768786
Merge into: lp://staging/~ubuntu-desktop/gnome-shell/ubuntu
Diff against target: 61 lines (+31/-4)
2 files modified
debian/changelog (+9/-0)
debian/patches/ubuntu_lock_on_suspend.patch (+22/-4)
To merge this branch: bzr merge lp://staging/~azzar1/gnome-shell/fix-1768786
Reviewer Review Type Date Requested Status
Daniel van Vugt (community) Needs Information
Sebastien Bacher Approve
Marco Trevisan (Treviño) Approve
Review via email: mp+345203@code.staging.launchpad.net

Commit message

* debian/patches/ubuntu_lock_on_suspend.patch:
    - Inhibit suspend until the screen is locked also in the case where
      automatic screen lock is disabled and screen lock on suspend is
      enabled (LP: #1768786)

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

LGTM

review: Approve
Reply
Revision history for this message
Andrea Azzarone (azzar1) wrote :

I just updated the commit message replacing "and" with "or".

Reply
lp://staging/~azzar1/gnome-shell/fix-1768786 updated
150. By Andrea Azzarone

* debian/patches/ubuntu_lock_on_suspend.patch:
    - Inhibit suspend until the screen is locked also in the case where
      automatic screen lock is disabled and screen lock on suspend is
      enabled (LP: #1768786)

Revision history for this message
Andrea Azzarone (azzar1) wrote :

@seb128 commit message (and Changelog) updated!

Reply
Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks, now I understand the description :) (&the code change also makes sense)

review: Approve
Reply
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

It's been suggested this is really bug 1532508. Too late to deduplicate and change the commit message?

review: Needs Information
Reply
Revision history for this message
Andrea Azzarone (azzar1) wrote :

I disagree. bug 1532508 used to refer to the generic problem (affecting upstream Gnome Shell too). bug 1768786 refers to a specific case due to a broken distro patch.

Reply

Unmerged revisions

150. By Andrea Azzarone

* debian/patches/ubuntu_lock_on_suspend.patch:
    - Inhibit suspend until the screen is locked also in the case where
      automatic screen lock is disabled and screen lock on suspend is
      enabled (LP: #1768786)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches