diff -Nru gnome-keyring-3.14.0/debian/changelog gnome-keyring-3.14.0/debian/changelog --- gnome-keyring-3.14.0/debian/changelog 2014-12-06 19:49:43.000000000 +0100 +++ gnome-keyring-3.14.0/debian/changelog 2014-12-26 19:42:08.000000000 +0100 @@ -1,3 +1,9 @@ +gnome-keyring (3.14.0-1ubuntu1+sero1) UNRELEASED; urgency=medium + + * Add missing "then" to upstart jobs (LP: #1400662). + + -- Sergey Romanov Fri, 26 Dec 2014 19:41:01 +0100 + gnome-keyring (3.14.0-1ubuntu1) vivid; urgency=medium * Merge from debian, remaining changes: diff -Nru gnome-keyring-3.14.0/debian/gnome-keyring-gpg.conf gnome-keyring-3.14.0/debian/gnome-keyring-gpg.conf --- gnome-keyring-3.14.0/debian/gnome-keyring-gpg.conf 2014-12-06 19:44:47.000000000 +0100 +++ gnome-keyring-3.14.0/debian/gnome-keyring-gpg.conf 2014-12-26 19:43:12.000000000 +0100 @@ -7,6 +7,7 @@ script [ -z "$GPG_AGENT_INFO" ] || { stop; exit 0; } if grep -q X-GNOME-Autostart-enabled=false ~/.config/autostart/gnome-keyring-gpg.desktop /etc/xdg/autostart/gnome-keyring-gpg.desktop + then stop; exit 0; fi eval "$(gnome-keyring-daemon --start --components gpg)" >/dev/null diff -Nru gnome-keyring-3.14.0/debian/gnome-keyring-ssh.conf gnome-keyring-3.14.0/debian/gnome-keyring-ssh.conf --- gnome-keyring-3.14.0/debian/gnome-keyring-ssh.conf 2014-12-06 19:44:47.000000000 +0100 +++ gnome-keyring-3.14.0/debian/gnome-keyring-ssh.conf 2014-12-26 19:43:12.000000000 +0100 @@ -7,6 +7,7 @@ script [ -z "$SSH_AUTH_SOCK" ] || { stop; exit 0; } if grep -q X-GNOME-Autostart-enabled=false ~/.config/autostart/gnome-keyring-ssh.desktop /etc/xdg/autostart/gnome-keyring-ssh.desktop + then stop; exit 0; fi eval "$(gnome-keyring-daemon --start --components ssh)" >/dev/null