GNOME Keyring

Merge lp://qastaging/~noskcaj/gnome-keyring/merge into lp://qastaging/~ubuntu-desktop/gnome-keyring/ubuntu

  1. merge
  2. Merge into ubuntu
Proposed by Jackson Doak
Status: Merged
Merged at revision: 100
Proposed branch: lp://qastaging/~noskcaj/gnome-keyring/merge
Merge into: lp://qastaging/~ubuntu-desktop/gnome-keyring/ubuntu
Diff against target: 261 lines (+105/-36)
10 files modified
debian/README.Debian (+1/-1)
debian/changelog (+52/-1)
debian/control (+4/-6)
debian/control.in (+3/-5)
debian/gnome-keyring.install (+2/-0)
debian/gnome-keyring.maintscript (+1/-0)
debian/gnome-keyring.preinst (+34/-0)
debian/patches/bgz_exit_on_bus_close.patch (+0/-20)
debian/patches/series (+0/-2)
debian/rules (+8/-1)
To merge this branch: bzr merge lp://qastaging/~noskcaj/gnome-keyring/merge
Reviewer Review Type Date Requested Status
Ubuntu Desktop Pending
Review via email: mp+263619@code.qastaging.launchpad.net

Description of the change

Merge from debian. Please check that disabling gpg-agent is ok

To post a comment you must log in.
lp://qastaging/~noskcaj/gnome-keyring/merge updated
99. By Jackson Doak

Fix the removal of /etc/xdg/autostart/gnome-keyring-gpg.desktop. This file
is installed even when compiled with --disable-gpg-agent, so remove it
manually.

100. By Jackson Doak

fix typo

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

to all changes: