r25355 - in /desktop/experimental/gnome-keyring/debian: ./ patches/

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Sun Oct 10 20:12:03 UTC 2010 

Author: sjoerd
Date: Sun Oct 10 20:11:57 2010
New Revision: 25355

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25355
Log:
First pass

Added:
    desktop/experimental/gnome-keyring/debian/libgcr3.install
      - copied unchanged from r25353, desktop/experimental/gnome-keyring/debian/libgcr0.install
    desktop/experimental/gnome-keyring/debian/libgcr3.shlibs
      - copied unchanged from r25353, desktop/experimental/gnome-keyring/debian/libgcr0.shlibs
Removed:
    desktop/experimental/gnome-keyring/debian/libgcr0.install
    desktop/experimental/gnome-keyring/debian/libgcr0.shlibs
    desktop/experimental/gnome-keyring/debian/patches/02_uidir_relocate.patch
    desktop/experimental/gnome-keyring/debian/patches/05_hurd_maxpathlen.patch
    desktop/experimental/gnome-keyring/debian/patches/10_debugging_output.patch
Modified:
    desktop/experimental/gnome-keyring/debian/changelog
    desktop/experimental/gnome-keyring/debian/control.in
    desktop/experimental/gnome-keyring/debian/gnome-keyring.install
    desktop/experimental/gnome-keyring/debian/patches/06_init_timeout.patch
    desktop/experimental/gnome-keyring/debian/patches/series

Modified: desktop/experimental/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/changelog?rev=25355&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/changelog [utf-8] Sun Oct 10 20:11:57 2010
@@ -1,8 +1,18 @@
 gnome-keyring (2.91.1-1) UNRELEASED; urgency=low
 
   * New upstream release
-
- -- Sjoerd Simons <sjoerd at debian.org>  Sun, 10 Oct 2010 19:53:31 +0100
+  * Update soname of libgcr
+  * Update install files
+  * debian/patches/02_uidir_relocate.patch:
+    + Removed, merged upstream
+  * debian/patches/05_hurd_maxpathlen.patch:
+    + Removed, merged upstream
+  * debian/patches/10_debugging_output.patch:
+    + Removed, no longer needed
+  * debian/patches/06_init_timeout.patch
+    + Updated
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 10 Oct 2010 21:11:33 +0100
 
 gnome-keyring (2.30.3-3) unstable; urgency=low
 

Modified: desktop/experimental/gnome-keyring/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/control.in?rev=25355&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/control.in [utf-8] Sun Oct 10 20:11:57 2010
@@ -7,7 +7,7 @@
                cdbs,
                gnome-pkg-tools (>= 0.10),
                intltool (>= 0.35.0),
-               libgtk2.0-dev (>= 2.20.0),
+               libgtk3.0-dev (>= 2.20.0),
                libglib2.0-dev (>= 2.16.0),
                libtasn1-3-dev (>= 0.3.4),
                libtasn1-3-bin,
@@ -92,10 +92,10 @@
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
-         libgcr0 (= ${binary:Version}),
+         libgcr3 (= ${binary:Version}),
          libglib2.0-dev (>= 2.16.0),
          libgp11-dev (= ${binary:Version}),
-         libgtk2.0-dev (>= 2.20.0),
+         libgtk3.0-dev (>= 2.20.0),
          libtasn1-3-dev (>= 0.3.4),
          libtasn1-3-bin
 Description: Library for Crypto UI related task - development
@@ -104,7 +104,7 @@
  This package contains the static libraries, header files and
  documentation needed to build applications using the GCR library.
 
-Package: libgcr0
+Package: libgcr3
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},

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=25355&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/gnome-keyring.install [utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/gnome-keyring.install [utf-8] Sun Oct 10 20:11:57 2010
@@ -1,4 +1,3 @@
-debian/tmp/etc/gconf/schemas
 debian/tmp/usr/bin
 debian/tmp/usr/share/locale
 debian/tmp/usr/share/dbus-1/services
@@ -6,6 +5,8 @@
 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/usr/lib/glib-2.0/schemas/*
+debian/tmp/usr/share/GConf/gsettings/*
 debian/tmp/etc/xdg/autostart /usr/share/gnome
 debian/tmp/usr/share/gnome-keyring/ui
 debian/tmp/usr/share/gnome-keyring/introspect

Modified: desktop/experimental/gnome-keyring/debian/patches/06_init_timeout.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/patches/06_init_timeout.patch?rev=25355&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/patches/06_init_timeout.patch [utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/patches/06_init_timeout.patch [utf-8] Sun Oct 10 20:11:57 2010
@@ -1,11 +1,18 @@
-GNOME #631465
+From 495f135b168c87bfe9cc62928ac0b2f0b1080d18 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
+Date: Sun, 10 Oct 2010 21:10:57 +0100
+Subject: [PATCH] https://bugzilla.gnome.org/show_bug.cgi?id=631465
 
-Index: gnome-keyring-2.30.3/daemon/gkd-main.c
-===================================================================
---- gnome-keyring-2.30.3.orig/daemon/gkd-main.c	2010-10-05 21:59:31.531925308 +0200
-+++ gnome-keyring-2.30.3/daemon/gkd-main.c	2010-10-05 22:49:54.635458931 +0200
-@@ -82,6 +82,8 @@
- #define DEFAULT_COMPONENTS  "pkcs11,secrets"
+---
+ daemon/gkd-main.c |   14 ++++++++++++++
+ 1 files changed, 14 insertions(+), 0 deletions(-)
+
+diff --git a/daemon/gkd-main.c b/daemon/gkd-main.c
+index a19ceef..ddc3595 100644
+--- a/daemon/gkd-main.c
++++ b/daemon/gkd-main.c
+@@ -90,6 +90,8 @@
+ #	endif
  #endif
  
 +#define LOGIN_TIMEOUT 10
@@ -13,15 +20,15 @@
  static gchar* run_components = DEFAULT_COMPONENTS;
  static gboolean pkcs11_started = FALSE;
  static gboolean secrets_started = FALSE;
-@@ -92,6 +94,7 @@ static gboolean run_daemonized = FALSE;
- static gboolean run_for_login = FALSE;
+@@ -102,6 +104,7 @@ static gboolean run_for_login = FALSE;
  static gboolean run_for_start = FALSE;
+ static gboolean run_for_replace = FALSE;
  static gchar* login_password = NULL;
 +static guint timeout_id = 0;
- static const gchar* control_directory = NULL;
+ static gchar* control_directory = NULL;
  static gboolean initialization_completed = FALSE;
  static gboolean sig_thread_valid = FALSE;
-@@ -629,6 +632,8 @@ gkr_daemon_initialize_steps (const gchar
+@@ -673,6 +676,8 @@ gkr_daemon_initialize_steps (const gchar *components)
  
  	if (!initialization_completed) {
  		initialization_completed = TRUE;
@@ -30,7 +37,7 @@
  
  		/* Initialize new style PKCS#11 components */
  		if (!gkd_pkcs11_initialize ())
-@@ -690,6 +695,14 @@ gkd_main_complete_initialization (const
+@@ -734,6 +739,14 @@ gkd_main_complete_initialization (const gchar *components)
  	gkr_daemon_initialize_steps (components);
  }
  
@@ -45,7 +52,7 @@
  int
  main (int argc, char *argv[])
  {
-@@ -772,6 +785,7 @@ main (int argc, char *argv[])
+@@ -822,6 +835,7 @@ main (int argc, char *argv[])
  	if (run_for_login) {
  		login_password = read_login_password (STDIN);
  		atexit (clear_login_password);
@@ -53,3 +60,6 @@
  
  	/* Not a login daemon. Startup stuff now.*/
  	} else {
+-- 
+1.7.1
+

Modified: desktop/experimental/gnome-keyring/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/patches/series?rev=25355&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/patches/series [utf-8] Sun Oct 10 20:11:57 2010
@@ -1,8 +1,5 @@
 01_pam-logging-less-verbose.patch
-02_uidir_relocate.patch
 03_kfreebsd.patch
 04_link-libtasns1.patch
-05_hurd_maxpathlen.patch
 06_init_timeout.patch
-10_debugging_output.patch
 99_ltmain_as-needed.patch

More information about the pkg-gnome-commits mailing list