r45473 - in /desktop/unstable/gnome-keyring/debian: changelog gnome-keyring.maintscript rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Fri Jul  3 19:23:22 2015
New Revision: 45473

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45473
Log:
Fix the removal of /etc/xdg/autostart/gnome-keyring-gpg.desktop. This file
is installed even when compiled with --disable-gpg-agent, so remove it
manually.

Modified:
    desktop/unstable/gnome-keyring/debian/changelog
    desktop/unstable/gnome-keyring/debian/gnome-keyring.maintscript
    desktop/unstable/gnome-keyring/debian/rules

Modified: desktop/unstable/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/changelog?rev=45473&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/changelog	[utf-8] Fri Jul  3 19:23:22 2015
@@ -1,3 +1,11 @@
+gnome-keyring (3.16.0-4) UNRELEASED; urgency=medium
+
+  * Fix the removal of /etc/xdg/autostart/gnome-keyring-gpg.desktop. This file
+    is installed even when compiled with --disable-gpg-agent, so remove it
+    manually.
+
+ -- Michael Biebl <biebl at debian.org>  Fri, 03 Jul 2015 17:05:24 +0200
+
 gnome-keyring (3.16.0-3) unstable; urgency=medium
 
   * Drop obsolete Breaks from pre-wheezy.

Modified: desktop/unstable/gnome-keyring/debian/gnome-keyring.maintscript
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/gnome-keyring.maintscript?rev=45473&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/gnome-keyring.maintscript	[utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/gnome-keyring.maintscript	[utf-8] Fri Jul  3 19:23:22 2015
@@ -1 +1 @@
-rm_conffile /etc/xdg/autostart/gnome-keyring-gpg.desktop 3.16.0-3~ gnome-keyring
+rm_conffile /etc/xdg/autostart/gnome-keyring-gpg.desktop 3.16.0-4~ gnome-keyring

Modified: desktop/unstable/gnome-keyring/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/rules?rev=45473&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/rules	[utf-8] Fri Jul  3 19:23:22 2015
@@ -21,4 +21,10 @@
 
 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