diff -Nru gnome-keyring-3.18.3/debian/changelog gnome-keyring-3.18.3/debian/changelog --- gnome-keyring-3.18.3/debian/changelog 2015-10-28 21:50:44.000000000 +0000 +++ gnome-keyring-3.18.3/debian/changelog 2015-11-01 12:35:53.000000000 +0000 @@ -1,3 +1,104 @@ +gnome-keyring (3.18.3-0ubuntu2) xenial; urgency=medium + + * Merge with Debian unstable, remaining changes: + - debian/control, debian/*.install, debian/rules: + + Change for multiarch support, install pkcs11 in its own binary. + - debian/gnome-keyring.conf, debian/gnome-keyring-ssh.conf: + + Provide upstart user session jobs. + - debian/patches/04_nodisplay_autostart.patch: + + Mark autostart files as NoDisplay=true. + - 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.in: + + Add Vcs-Bzr for Ubuntu. + + -- Dmitry Shachnev Sun, 01 Nov 2015 15:30:16 +0300 + +gnome-keyring (3.18.3-1) UNRELEASED; urgency=medium + + * New upstream bugfix release. + * Drop handle_aliases.patch, applied upstream. + + -- Dmitry Shachnev Sat, 31 Oct 2015 14:56:26 +0300 + +gnome-keyring (3.18.2-1) unstable; urgency=medium + + * New upstream bugfix release. + * Drop fix_object_path_regression.patch, applied upstream. + * Fix unlocking keyrings by aliases (handle_aliases.patch, closes: #802480). + + -- Dmitry Shachnev Thu, 22 Oct 2015 11:05:41 +0300 + +gnome-keyring (3.18.1-1) unstable; urgency=medium + + * New upstream release. + - Now the problems with forking should be really fixed (closes: + #800617, the third attempt). + * Drop fix_tests_for_new_glib.patch, applied upstream. + * Drop init_secret_service.patch, applied upstream. + * Drop fork_before_using_dbus.patch, the issue has been fixed properly. + * Backport two post-release upstream commits to properly unexport + secret prompt objects (fix_object_path_regression.patch; closes: + #800660). + + -- Dmitry Shachnev Sun, 18 Oct 2015 17:30:21 +0300 + +gnome-keyring (3.18.0-4) unstable; urgency=medium + + * Update fork_before_using_dbus.patch to make sure it does not break the + testsuite (should fix the build failure). + + -- Dmitry Shachnev Mon, 12 Oct 2015 22:29:57 +0300 + +gnome-keyring (3.18.0-3) unstable; urgency=medium + + [ Michael Biebl ] + * Use https:// for Vcs-Browser. + + [ Dmitry Shachnev ] + * Add another proposed upstream patch from Cosimo Cecchi to make + sure fork is done before attempting to use D-Bus connections + (fork_before_using_dbus.patch; closes: #800617). + + -- Dmitry Shachnev Mon, 12 Oct 2015 13:45:21 +0300 + +gnome-keyring (3.18.0-2) unstable; urgency=medium + + * Add proposed upstream patch from Jan Alexander Steffens to fix + the D-Bus service activation race (hopefully closes: #800617). + + -- Dmitry Shachnev Wed, 07 Oct 2015 18:38:06 +0300 + +gnome-keyring (3.18.0-1) unstable; urgency=medium + + * New upstream release. + * Drop fix_test_import_segfault.patch, applied upstream. + * Set $HOME to debian/testhome when running the tests. + * Make tests pass with GLib ≥ 2.45.7 (fix_tests_for_new_glib.patch). + * Upload to unstable. + + -- Dmitry Shachnev Wed, 30 Sep 2015 15:05:54 +0300 + +gnome-keyring (3.17.91-2) experimental; urgency=medium + + * Replace Xvfb with dbus-run-session, it much better fits our needs. + * Fix segmentation fault in test-import (fix_test_import_segfault.patch). + + -- Dmitry Shachnev Sun, 06 Sep 2015 12:30:14 +0300 + +gnome-keyring (3.17.91-1) experimental; urgency=medium + + * New upstream beta release. + * Drop libdbus-1-dev build-dependency, no longer needed. + * Drop --disable-gpg-agent option, GPG agent has been dropped upstream. + * Also drop code to remove gnome-keyring-gpg.desktop. + * Remove outdated information from README.Debian. + * Run tests in Xvfb to make them really run (and not hang because of + missing D-Bus). Still ignore the result because two tests fail. + + -- Dmitry Shachnev Sat, 05 Sep 2015 10:29:00 +0300 + gnome-keyring (3.18.3-0ubuntu1) xenial; urgency=medium * New upstream release diff -Nru gnome-keyring-3.18.3/debian/control gnome-keyring-3.18.3/debian/control --- gnome-keyring-3.18.3/debian/control 2015-10-28 21:50:45.000000000 +0000 +++ gnome-keyring-3.18.3/debian/control 2015-11-01 12:38:31.000000000 +0000 @@ -7,10 +7,11 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Josselin Mouette -Uploaders: Debian GNOME Maintainers , Dmitry Shachnev , Michael Biebl +Uploaders: Debian GNOME Maintainers , Dmitry Shachnev Build-Depends: debhelper (>= 9), cdbs, ca-certificates, + dbus, dh-autoreconf, docbook-xml, gnome-pkg-tools (>= 0.10), diff -Nru gnome-keyring-3.18.3/debian/control.in gnome-keyring-3.18.3/debian/control.in --- gnome-keyring-3.18.3/debian/control.in 2015-10-28 21:50:44.000000000 +0000 +++ gnome-keyring-3.18.3/debian/control.in 2015-11-01 12:25:43.000000000 +0000 @@ -7,6 +7,7 @@ Build-Depends: debhelper (>= 9), cdbs, ca-certificates, + dbus, dh-autoreconf, docbook-xml, gnome-pkg-tools (>= 0.10), diff -Nru gnome-keyring-3.18.3/debian/README.Debian gnome-keyring-3.18.3/debian/README.Debian --- gnome-keyring-3.18.3/debian/README.Debian 2015-10-28 21:50:44.000000000 +0000 +++ gnome-keyring-3.18.3/debian/README.Debian 2015-11-01 12:24:25.000000000 +0000 @@ -18,17 +18,12 @@ 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 keyring should -be updated automatically. +gnome-control-center for example), the password for the login keyring +should be updated automatically. - SSH and GPG agents - ------------------ -The GNOME keyring includes the functionality of the SSH and GPG agents, -and it can break some setups, especially if ssh-agent and/or gpg-agent -is started by hand. - -You can disable a specific component by removing the gnome-keyring-gpg -and gnome-keyring-ssh elements from the startup applications. The -interface depends on your session manager; for GNOME you can use -gnome-session-properties. You can also simply edit -/etc/xdg/autostart/gnome-keyring-*.desktop. + SSH agent + --------- +The GNOME keyring includes the functionality of the SSH agent, and it +can break some setups, especially if ssh-agent is started by hand. +You can disable it by removing the gnome-keyring-ssh element from the +startup applications. diff -Nru gnome-keyring-3.18.3/debian/rules gnome-keyring-3.18.3/debian/rules --- gnome-keyring-3.18.3/debian/rules 2015-10-28 21:50:44.000000000 +0000 +++ gnome-keyring-3.18.3/debian/rules 2015-11-01 12:24:13.000000000 +0000 @@ -10,9 +10,15 @@ export DEB_LDFLAGS_MAINT_APPEND := -Wl,-O1 -Wl,-z,defs -Wl,--as-needed include /usr/share/dpkg/buildflags.mk -ifeq (,$(filter $(DEB_BUILD_ARCH),kfreebsd-i386 kfreebsd-amd64)) -DEB_MAKE_CHECK_TARGET := -k check || true -endif +TESTHOMEDIR = $(CURDIR)/debian/testhome + +debian/stamp-makefile-check: + mkdir -p $(TESTHOMEDIR) + -HOME=$(TESTHOMEDIR) dbus-run-session -- $(MAKE) check -j1 + touch $@ + +clean:: + rm -rf $(TESTHOMEDIR) DEB_CONFIGURE_EXTRA_FLAGS += --with-pam-dir=/lib/$(DEB_HOST_MULTIARCH)/security \ --enable-gtk-doc \ @@ -20,12 +26,6 @@ DEB_DH_MAKESHLIBS_ARGS_gnome-keyring := --no-act -# The gpg autostart file is installed unconditionally, even when compiled with -# --disable-gpg-agent. So remove the file manually. This has been fixed -# upstream and can be dropped again with 3.18. -binary-install/gnome-keyring:: - rm -f debian/$(cdbs_curpkg)/etc/xdg/autostart/gnome-keyring-gpg.desktop - common-binary-post-install-arch:: list-missing install/gnome-keyring::