[Merge] lp:~mitya57/ubuntu/utopic/gnome-keyring/3.12.2 into lp:ubuntu/gnome-keyring

[Dmitry Shachnev]

Dmitry Shachnev has proposed merging lp:~mitya57/ubuntu/utopic/gnome-keyring/3.12.2 into lp:ubuntu/gnome-keyring.

Requested reviews:
  Ubuntu branches (ubuntu-branches)

For more details, see:
https://code.launchpad.net/~mitya57/ubuntu/utopic/gnome-keyring/3.12.2/+merge/221489

  * Merge with Debian unreleased Svn, remaining changes:
    - 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/patches/04_nodisplay_autostart.patch:
      + Clean up Startup Applications dialog by hiding default apps.
    - debian/control, debian/*.install, debian/rules:
      + Install files into multiarch locations.
      + Mark packages Multi-Arch: foreign.
      + Split pkcs11 into its own binary (libp11-kit-gnome-keyring).
    - debian/gnome-keyring.preinst:
      + Drop, replace with debian/gnome-keyring.maintscript.
    - debian/gnome-keyring.conf, debian/gnome-keyring.install:
      + Add upstart conf file.
    - debian/rules:
      + Temporary disable running tests during build.
  * Dropped debian/patches/bgz_exit_on_bus_close.patch, a better fix
    was applied upstream.

Built packages available in ppa:mitya57/gnome-test.
-- 
The attached diff has been truncated due to its size.
https://code.launchpad.net/~mitya57/ubuntu/utopic/gnome-keyring/3.12.2/+merge/221489
Your team Ubuntu branches is requested to review the proposed merge of lp:~mitya57/ubuntu/utopic/gnome-keyring/3.12.2 into lp:ubuntu/gnome-keyring.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 524288 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20140530/a098d041/attachment-0001.diff>