Merge lp:~ari-tczew/gnome-keyring/ubuntu into lp:~ubuntu-desktop/gnome-keyring/ubuntu

[Artur Rona]

[Robert Ancell (robert-ancell)]

Looks good, thanks Artur!

review: Approve

=== modified file 'debian/README.Debian'
--- debian/README.Debian	2011-06-30 15:32:46 +0000
+++ debian/README.Debian	2015-07-06 21:34:43 +0000
@@ -18,7 +18,7 @@
 for a password for the "Default" keyring.
 
 If you change your authentication password (using passwd or 
-gnome-about-me for example), the password for the login keyrign should 
+gnome-about-me for example), the password for the login keyring should 
 be updated automatically.
 
  SSH and GPG agents

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-08 14:08:45 +0000
+++ debian/changelog	2015-07-06 21:34:43 +0000
@@ -1,4 +1,42 @@
-gnome-keyring (3.15.92-0ubuntu1) vivid; urgency=medium
+gnome-keyring (3.16.0-2ubuntu1) wily; urgency=low
+
+  * Merge from Debian unstable.  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/control, debian/rules, debian/*.install:
+      + MultiArch support. (Closes: #686843)
+    - debian/control, debian/*.install:
+      + Install pkcs11 in its own binary. (Closes: #783961)
+    - debian/patches/04_nodisplay_autostart.patch:
+      + Clean up Startup Applications dialog by hiding default apps.
+    - debian/patches/bgz_exit_on_bus_close.patch:
+      + Exit on D-Bus disconnection.
+  * debian/control:
+    - Drop duplicated Build-Depends on dh-autoreconf.
+
+ -- Artur Rona <[e-mail]>  Mon, 06 Jul 2015 22:57:02 +0200
+
+gnome-keyring (3.16.0-2) unstable; urgency=medium
+
+  * Upload to unstable.
+
+ -- Dmitry Shachnev <[e-mail]>  Mon, 04 May 2015 21:56:18 +0300
+
+gnome-keyring (3.16.0-1) experimental; urgency=medium
+
+  * 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.
+
+ -- Dmitry Shachnev <[e-mail]>  Fri, 17 Apr 2015 14:43:05 +0300
+
+gnome-keyring (3.16.0-0ubuntu1) vivid; urgency=medium
 
   * New upstream release
    - includes fix to "Can't log out from Plasma session with SDDM" LP: #1407152

=== modified file 'debian/control'
--- debian/control	2015-03-05 17:56:31 +0000
+++ debian/control	2015-07-06 21:34:43 +0000
@@ -7,10 +7,9 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Josselin Mouette <[e-mail]>
-Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Emilio Pozuelo Monfort <[e-mail]>
+Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Dmitry Shachnev <[e-mail]>, Emilio Pozuelo Monfort <[e-mail]>
 Build-Depends: debhelper (>= 9),
                cdbs,
-               dh-autoreconf,
                ca-certificates,
                dh-autoreconf,
                docbook-xml,
@@ -29,7 +28,7 @@
                libtasn1-6-dev,
                libtasn1-bin,
                libglib2.0-doc
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Vcs-Browser: https://code.launchpad.net/~ubuntu-desktop/gnome-keyring/ubuntu
 Vcs-Bzr: lp:~ubuntu-desktop/gnome-keyring/ubuntu
 Homepage: https://wiki.gnome.org/GnomeKeyring

=== modified file 'debian/control.in'
--- debian/control.in	2015-03-05 17:56:31 +0000
+++ debian/control.in	2015-07-06 21:34:43 +0000
@@ -6,7 +6,6 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 9),
                cdbs,
-               dh-autoreconf,
                ca-certificates,
                dh-autoreconf,
                docbook-xml,
@@ -25,7 +24,7 @@
                libtasn1-6-dev,
                libtasn1-bin,
                libglib2.0-doc
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Vcs-Browser: https://code.launchpad.net/~ubuntu-desktop/gnome-keyring/ubuntu
 Vcs-Bzr: lp:~ubuntu-desktop/gnome-keyring/ubuntu
 Homepage: https://wiki.gnome.org/GnomeKeyring

=== modified file 'debian/gnome-keyring.install'
--- debian/gnome-keyring.install	2015-03-05 17:55:40 +0000
+++ debian/gnome-keyring.install	2015-07-06 21:34:43 +0000
@@ -3,6 +3,8 @@
 usr/share/dbus-1/services
 usr/share/glib-2.0/schemas
 usr/share/GConf/gsettings
+usr/share/man/man1/gnome-keyring.1
+usr/share/man/man1/gnome-keyring-daemon.1
 usr/lib/gnome-keyring/devel/*.so
 etc/xdg/autostart
 debian/gnome-keyring*.conf usr/share/upstart/sessions/

=== added file 'debian/gnome-keyring.links'
--- debian/gnome-keyring.links	1970-01-01 00:00:00 +0000
+++ debian/gnome-keyring.links	2015-07-06 21:34:43 +0000
@@ -0,0 +1,1 @@
+usr/share/man/man1/gnome-keyring.1 usr/share/man/man1/gnome-keyring-3.1

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-04-08 14:08:45 +0000
+++ debian/patches/series	2015-07-06 21:34:43 +0000
@@ -1,4 +1,3 @@
 03_kfreebsd.patch
 04_nodisplay_autostart.patch
-
 bgz_exit_on_bus_close.patch