r26799 - in /desktop/experimental/gnome-keyring/debian: changelog control control.in gnome-keyring.install gnome-keyring.postinst
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Tue Mar 8 12:58:40 UTC 2011
Author: bigon
Date: Tue Mar 8 12:58:37 2011
New Revision: 26799
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26799
Log:
- Move back .desktop files to /etc/xdg/autostart to also startup
gnome-keyring-daemon for Lxde and Xfce
- Do not cleanup .desktop files from /etc/xdg/autostart as we are shipping
them again in that directory
Modified:
desktop/experimental/gnome-keyring/debian/changelog
desktop/experimental/gnome-keyring/debian/control
desktop/experimental/gnome-keyring/debian/control.in
desktop/experimental/gnome-keyring/debian/gnome-keyring.install
desktop/experimental/gnome-keyring/debian/gnome-keyring.postinst
Modified: desktop/experimental/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/changelog?rev=26799&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/changelog [utf-8] Tue Mar 8 12:58:37 2011
@@ -4,20 +4,25 @@
* debian/control.in:
- Add libcap-dev as build-dependency for linux-any
- Make gnome-keyring Depends against libcap2-bin for linux-any
- * debian/gnome-keyring.postinst: Set CAP_IPC_LOCK capability
- on gnome-keyring-daemon. This would permit gnome-keyring to overcome
- limits on locked memory and prevent private keys to be swapped out.
+ * debian/gnome-keyring.postinst:
+ - Set CAP_IPC_LOCK capability on gnome-keyring-daemon.
+ This would permit gnome-keyring to overcome limits on locked memory
+ and prevent private keys to be swapped out.
+ - Do not cleanup .desktop files from /etc/xdg/autostart as we are shipping
+ them again in that directory
* debian/libgcr-3-0.symbols, debian/libgck0.symbols: Adjusts symbols files
* debian/patches/04_link-libtasns1.patch,
d/p/0001-Link-directly-to-gmodule-for-the-modules-that-need-i.patch:
Drop patches, not needed anymore
* debian/patches/05_use_in_xfce.patch: Make gnome-keyring-daemon also start
- for XFCE, taken from Ubuntu (Closes: #522493)
- * debian/gnome-keyring.install: Drop
- - debian/tmp/usr/share/gnome-keyring/introspect
- - debian/tmp/etc/xdg/pkcs11.conf.defaults
-
- -- Laurent Bigonville <bigon at debian.org> Tue, 08 Mar 2011 11:15:58 +0100
+ for XFCE, taken from Ubuntu
+ * debian/gnome-keyring.install:
+ - Drop debian/tmp/usr/share/gnome-keyring/introspect,
+ debian/tmp/etc/xdg/pkcs11.conf.defaults
+ - Move back .desktop files to /etc/xdg/autostart to also startup
+ gnome-keyring-daemon for Lxde and Xfce (Closes: #599757)
+
+ -- Laurent Bigonville <bigon at debian.org> Tue, 08 Mar 2011 13:29:23 +0100
gnome-keyring (2.91.4-3) experimental; urgency=low
Modified: desktop/experimental/gnome-keyring/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/control?rev=26799&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/control [utf-8] Tue Mar 8 12:58:37 2011
@@ -55,10 +55,10 @@
libgck0 (= ${binary:Version}),
libglib2.0-dev (>= 2.25.0)
Description: GLib wrapper library for PKCS#11 - development
- GCK is a wrapper based on GLib implementing the PKCS#11 (Cryptoki)
+ GCK is a wrapper based on GLib implementing the PKCS#11 (Cryptoki)
interface.
.
- This package contains the static libraries, header files and
+ This package contains the static libraries, header files and
documentation needed to build applications using the GCK library.
Package: libgck0
@@ -67,10 +67,10 @@
Depends: ${misc:Depends},
${shlibs:Depends}
Description: Glib wrapper library for PKCS#11 - runtime
- GCK is a wrapper based on GLib implementing the PKCS#11 (Cryptoki)
+ GCK is a wrapper based on GLib implementing the PKCS#11 (Cryptoki)
interface.
.
- This package contains the shared libraries needed to run programs
+ This package contains the shared libraries needed to run programs
built against the GCK library.
Package: libpam-gnome-keyring
@@ -88,12 +88,12 @@
and other applications can use it to store passwords and other
sensitive information.
.
- This package contains a PAM module that will automatically unlock the
- keyrings using your login password, making gnome-keyring usage
+ This package contains a PAM module that will automatically unlock the
+ keyrings using your login password, making gnome-keyring usage
transparent without losing its security benefits.
.
- When installed, this module will automatically be used by GDM and
- gnome-screensaver to unlock your keyrings when logging in and when
+ When installed, this module will automatically be used by GDM and
+ gnome-screensaver to unlock your keyrings when logging in and when
unlocking the screen saver.
Package: libgcr-dev
Modified: desktop/experimental/gnome-keyring/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/control.in?rev=26799&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/control.in [utf-8] Tue Mar 8 12:58:37 2011
@@ -50,10 +50,10 @@
libgck0 (= ${binary:Version}),
libglib2.0-dev (>= 2.25.0)
Description: GLib wrapper library for PKCS#11 - development
- GCK is a wrapper based on GLib implementing the PKCS#11 (Cryptoki)
+ GCK is a wrapper based on GLib implementing the PKCS#11 (Cryptoki)
interface.
.
- This package contains the static libraries, header files and
+ This package contains the static libraries, header files and
documentation needed to build applications using the GCK library.
Package: libgck0
@@ -62,10 +62,10 @@
Depends: ${misc:Depends},
${shlibs:Depends}
Description: Glib wrapper library for PKCS#11 - runtime
- GCK is a wrapper based on GLib implementing the PKCS#11 (Cryptoki)
+ GCK is a wrapper based on GLib implementing the PKCS#11 (Cryptoki)
interface.
.
- This package contains the shared libraries needed to run programs
+ This package contains the shared libraries needed to run programs
built against the GCK library.
Package: libpam-gnome-keyring
@@ -83,12 +83,12 @@
and other applications can use it to store passwords and other
sensitive information.
.
- This package contains a PAM module that will automatically unlock the
- keyrings using your login password, making gnome-keyring usage
+ This package contains a PAM module that will automatically unlock the
+ keyrings using your login password, making gnome-keyring usage
transparent without losing its security benefits.
.
- When installed, this module will automatically be used by GDM and
- gnome-screensaver to unlock your keyrings when logging in and when
+ When installed, this module will automatically be used by GDM and
+ gnome-screensaver to unlock your keyrings when logging in and when
unlocking the screen saver.
Package: libgcr-dev
Modified: desktop/experimental/gnome-keyring/debian/gnome-keyring.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/gnome-keyring.install?rev=26799&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/gnome-keyring.install [utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/gnome-keyring.install [utf-8] Tue Mar 8 12:58:37 2011
@@ -5,6 +5,6 @@
debian/tmp/usr/lib/gnome-keyring/devel/*.so
debian/tmp/usr/share/glib-2.0/schemas/*
debian/tmp/usr/share/GConf/gsettings/*
-debian/tmp/etc/xdg/autostart /usr/share/gnome
+debian/tmp/etc/xdg/autostart
debian/tmp/usr/share/gnome-keyring-3/ui
debian/tmp/usr/lib/pkcs11/*.so
Modified: desktop/experimental/gnome-keyring/debian/gnome-keyring.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/gnome-keyring.postinst?rev=26799&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/gnome-keyring.postinst [utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/gnome-keyring.postinst [utf-8] Tue Mar 8 12:58:37 2011
@@ -1,11 +1,7 @@
-#! /bin/sh
+#!/bin/sh
set -e
PROGRAM=/usr/bin/gnome-keyring-daemon
-
-if [ "$1" = configure ] && dpkg --compare-versions "$2" le-nl "2.26.1-1"; then
- rm -f /etc/xdg/autostart/gnome-keyring-daemon.desktop
-fi
if [ "$1" = configure ]; then
if which setcap > /dev/null && [ -e $PROGRAM ]; then
More information about the pkg-gnome-commits
mailing list