lp:~ubuntu-branches/ubuntu/oneiric/gnome-keyring/oneiric-proposed-201112050718

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:ubuntu/oneiric-proposed/gnome-keyring

Ubuntu Development Team: Pending requested 2011-12-05

Diff: 738 lines (+493/-36) (has conflicts)

9 files modified

.pc/04_nodisplay_autostart.patch/daemon/gnome-keyring-gpg.desktop.in.in (+16/-0)
.pc/04_nodisplay_autostart.patch/daemon/gnome-keyring-pkcs11.desktop.in.in (+16/-0)
.pc/04_nodisplay_autostart.patch/daemon/gnome-keyring-secrets.desktop.in.in (+16/-0)
.pc/04_nodisplay_autostart.patch/daemon/gnome-keyring-ssh.desktop.in.in (+16/-0)
.pc/applied-patches (+5/-0)
debian/patches/05_revert_order_fix.patch (+304/-0)
pkcs11/rpc-layer/gkm-rpc-util.c (+2/-2)
pkcs11/secret-store/gkm-secret-search.c (+45/-34)
pkcs11/secret-store/tests/test-secret-search.c (+73/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

132. By Ken VanDine on 2011-11-28

releasing version 3.2.2-0ubuntu0.1

131. By Ken VanDine on 2011-11-15

releasing version 3.2.2-0ubuntu0.1

130. By Ken VanDine on 2011-11-14

releasing version 3.2.2-0ubuntu1.1

129. By Didier Roche-Tolomelli on 2011-10-18

* New upstream release: (LP: #877246)
  - Fix debugging output, and erroneous warnings
  - Updated translations

128. By Ken VanDine on 2011-09-26

* New upstream release
  - Don't install setuid when filesystem capabilities not avail.

127. By Martin Pitt on 2011-09-18

* New upstream release:
  - Add back the file format "documentation"
  - Make .desktop file match prompt process so icon and title are shown
  - Fix packaging issues installing the pkcs11 module
  - return correct error code in gpg-agent for unimplemented stuff
  - Fixes for parsing/viewing various (sometimes slightly invalid) PKCS#12 files
  - Allow daemon to access secrets of internal PKCS#11 modules, so that we can
    do things like hash NTLM and Kerberos secrets in the future.
  - Build and documentation fixes
  - Updated translations
* debian/control.in: Bump libp11-kit-dev build dependency to >= 0.6
  according to configure.ac.
* Drop 01_git_fix_build.patch, upstream now.
* Drop 05_correct_gpg_agent_error_code.patch, upstream now.
* 99_ltmain_as-needed.patch: Refresh.

126. By Michael Terry on 2011-09-14

* debian/patches/05_correct_gpg_agent_error_code.patch:
  - Return correct error code for unimplemented GETINFO requests to
    the agent (LP: #681002)

125. By Sebastien Bacher on 2011-09-06

* gnome-keyring.gsettings-override:
  - set the default keyserver to the ubuntu one (used to be in seahorse)

124. By Rodrigo Moya on 2011-09-06

[ Jeremy Bicha ]
* New upstream release.
  - Added gcr-viewer app
* debian/patches/05_revert_gcr_soname_bump.patch:
  - Dropped, applied usptream

[ Rodrigo Moya ]
* debian/patches/01_git_fix_build.patch:
  - Fix linking of gcr-viewer
* debian/libgcr-3-1.symbols:
* debian/libgck-1-0.symbols:
  - Added new symbols

123. By Chris Coulson on 2011-08-19

* libgck-1-dev should depend on libp11-kit-dev
  - update debian/control.in