Created by Jackson Doak and last modified
Get this branch:
bzr branch lp:~noskcaj/gnome-keyring/merge
Only Jackson Doak can upload to this branch. If you are Jackson Doak please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Jackson Doak
GNOME Keyring

Recent revisions

100. By Jackson Doak

fix typo

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

98. By Jackson Doak

* Merge from debian, remaining changes:
  - Provide upstart user session jobs.
  - Add Vcs-Bzr for Ubuntu
  - Add 04_nodisplay_autostart.patch to clean up the startup icons dialogue
  * debian/gnome-keyring.ubiquity, debian/rules:
    - Apply capabilities at the end of the ubiquity process to make sure new
      installs have gnome-keyring-daemon with cap_ipc_lock+ep.
  * debian/control, debian/*.install, debian/rules:
    - change for multiarch support, install pkcs11 in its own binary
* Drop obsolete Breaks from pre-wheezy.
* Disable gpg agent as it is incomplete and incompatible with many uses of
  GnuPG 2.x. (Closes: #760102).
* Depend on pinentry-gnome3 instead to provide the system modal dialogs.
  (Closes: #787786)
* Remove obsolete /etc/xdg/autostart/gnome-keyring-gpg.desktop on upgrades.
* Upload to unstable.
* New upstream release.
  - Contains lots of memory leaks fixes.
  - Fixes issues with logout from Plasma session.
* Fix a typo in README.debian (closes: #755367).
* Update Homepage field.
* Install manpages, now that is possible again.
* Bump Standards-Version to 3.9.6, no changes needed.

97. By Jonathan Riddell

* New upstream release
 - includes fix to "Can't log out from Plasma session with SDDM" LP: #1407152

96. By Iain Lane

releasing package gnome-keyring version 3.15.90-0ubuntu1

95. By Iain Lane

Revert d177a8b5353f3156ab504f39c20753d6786e5e4d. This commit causes
unlocked keys to be locked again, due to incorrect refcounting elsewhere.
See bgo #744280.

94. By Iain Lane

Merge new upstream

93. By Iain Lane

Add Vcs-Bzr for Ubuntu

92. By Iain Lane

releasing package gnome-keyring version 3.14.0-1ubuntu2

91. By Iain Lane

releasing version 3.8.2-0ubuntu3

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.