lp:~ubuntu-branches/ubuntu/oneiric/gnome-keyring/oneiric-201109181907

Branch merges

Propose for merging

No branches dependent on this one.

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

Ubuntu branches: Pending requested 2011-09-18

Diff: 9744 lines (+9693/-0) (has conflicts)

9 files modified

.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-0)
.pc/.version (+1/-0)
.pc/04_nodisplay_autostart.patch/daemon/gnome-keyring-gpg.desktop.in.in (+13/-0)
.pc/04_nodisplay_autostart.patch/daemon/gnome-keyring-pkcs11.desktop.in.in (+13/-0)
.pc/04_nodisplay_autostart.patch/daemon/gnome-keyring-secrets.desktop.in.in (+13/-0)
.pc/04_nodisplay_autostart.patch/daemon/gnome-keyring-ssh.desktop.in.in (+13/-0)
.pc/99_ltmain_as-needed.patch/ltmain.sh (+9636/-0)
.pc/applied-patches (+2/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

133. By Martin Pitt on 2011-09-18

releasing version 3.1.92-0ubuntu1

132. By Martin Pitt on 2011-09-18

apply patches

131. By Martin Pitt on 2011-09-18

* Drop 05_correct_gpg_agent_error_code.patch, upstream now.
* 99_ltmain_as-needed.patch: Refresh.

130. By Martin Pitt on 2011-09-18

Drop 01_git_fix_build.patch, upstream now.

129. By Martin Pitt on 2011-09-18

debian/control.in: Bump libp11-kit-dev build dependency to >= 0.6
according to configure.ac.

128. By Martin Pitt on 2011-09-18

new upstream release 3.1.92

127. By Martin Pitt on 2011-09-18

unapply patches

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