r20156 - in /desktop/unstable/gnome-keyring/debian: changelog gnome-keyring.install gnome-keyring.postinst

[joss at users.alioth.debian.org]

Author: joss
Date: Fri May 29 09:05:08 2009
New Revision: 20156

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20156
Log:
* Install the autostart file in /usr/share/gnome, not /etc/xdg.
* Remove the old file in the postinst.

Added:
    desktop/unstable/gnome-keyring/debian/gnome-keyring.postinst
Modified:
    desktop/unstable/gnome-keyring/debian/changelog
    desktop/unstable/gnome-keyring/debian/gnome-keyring.install

Modified: desktop/unstable/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/changelog?rev=20156&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/changelog (original)
+++ desktop/unstable/gnome-keyring/debian/changelog Fri May 29 09:05:08 2009
@@ -1,3 +1,10 @@
+gnome-keyring (2.26.1-2) UNRELEASED; urgency=low
+
+  * Install the autostart file in /usr/share/gnome, not /etc/xdg.
+  * Remove the old file in the postinst.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 29 May 2009 11:04:37 +0200
+
 gnome-keyring (2.26.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/unstable/gnome-keyring/debian/gnome-keyring.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/gnome-keyring.install?rev=20156&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/gnome-keyring.install (original)
+++ desktop/unstable/gnome-keyring/debian/gnome-keyring.install Fri May 29 09:05:08 2009
@@ -6,4 +6,4 @@
 debian/tmp/usr/lib/gnome-keyring/*.so
 debian/tmp/usr/lib/gnome-keyring/devel/*.so
 debian/tmp/usr/lib/gnome-keyring/standalone/*.so
-debian/tmp/etc/xdg/autostart
+debian/tmp/etc/xdg/autostart /usr/share/gnome

Added: desktop/unstable/gnome-keyring/debian/gnome-keyring.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/gnome-keyring.postinst?rev=20156&op=file
==============================================================================
--- desktop/unstable/gnome-keyring/debian/gnome-keyring.postinst (added)
+++ desktop/unstable/gnome-keyring/debian/gnome-keyring.postinst Fri May 29 09:05:08 2009
@@ -1,0 +1,11 @@
+#! /bin/sh
+set -e
+
+case "$1" in
+install|upgrade)
+    if dpkg --compare-versions "$2" le "2.26.1-1"; then
+        rm -f /etc/xdg/autostart/gnome-keyring-daemon.desktop
+    fi
+esac
+
+#DEBHELPER#