[gnome-keyring] Release version 3.5.3

[Stefan Walter <stefw src gnome org>]

commit ade50dce2dc18c27d81e0dc5de35748dd308ae81
Author: Stef Walter <stefw gnome org>
Date:   Mon Jun 25 10:37:14 2012 +0200

    Release version 3.5.3
    
     * And fix some tests

 Makefile.am                                     |    3 +++
 NEWS                                            |    7 +++++++
 configure.ac                                    |    4 ++--
 pkcs11/gnome2-store/tests/test-gnome2-storage.c |    3 +--
 4 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 988d28c..2ad142b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,3 +74,6 @@ clear-coverage:
 	$(LCOV) --directory . --zerocounters
 
 endif
+
+upload-release: $(DIST_ARCHIVES)
+		scp $(DIST_ARCHIVES) master.gnome.org:
diff --git a/NEWS b/NEWS
index 64ec9a9..7e65dd4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Changes in version 3.5.3 are:
+ * Return correct introspect data for Secret Service
+ * Fix the gnome2-store for gcr importer, and test
+ * Debug and logging fixes
+ * Updated translations
+ * Build fixes
+
 Changes in version 3.4.1 are:
  * Set 'text/plain' content type on secrets returned from daemon
  * Use correct XDG_RUNTIME_DIR when started from PAM
diff --git a/configure.ac b/configure.ac
index 0cfd53d..04bd599 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_INIT(daemon/gkd-main.c)
 
-AM_INIT_AUTOMAKE(gnome-keyring, 3.5.0)
+AM_INIT_AUTOMAKE(gnome-keyring, 3.5.3)
 
 AM_CONFIG_HEADER(config.h)
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -198,7 +198,7 @@ fi
 
 PKG_CHECK_MODULES(GCK, gck-1 >= 3.3.4)
 PKG_CHECK_MODULES(GCR, gcr-3 >= 3.3.3)
-PKG_CHECK_MODULES(GCR_BASE, gcr-base-3 >= 3.3.3)
+PKG_CHECK_MODULES(GCR_BASE, gcr-base-3 >= 3.5.3)
 
 DAEMON_CFLAGS="$DAEMON_CFLAGS $GCK_CFLAGS $GCR_BASE_CFLAGS"
 DAEMON_LIBS="$DAEMON_LIBS $GCK_LIBS $GCR_BASE_LIBS"
diff --git a/pkcs11/gnome2-store/tests/test-gnome2-storage.c b/pkcs11/gnome2-store/tests/test-gnome2-storage.c
index c72b374..10d6d30 100644
--- a/pkcs11/gnome2-store/tests/test-gnome2-storage.c
+++ b/pkcs11/gnome2-store/tests/test-gnome2-storage.c
@@ -94,7 +94,6 @@ static void
 setup_module (Test *test,
               gconstpointer unused)
 {
-	CK_ATTRIBUTE label = { CKA_LABEL, NULL, 0 };
 	CK_ATTRIBUTE url = { CKA_URL, NULL, 0 };
 	gchar *contents;
 	gsize length;
@@ -116,8 +115,8 @@ setup_module (Test *test,
 	rv = gkm_gnome2_storage_refresh (test->storage);
 	gkm_assert_cmprv (rv, ==, CKR_OK);
 
+	/* We already have the CKA_LABEL attribute */
 	gkm_store_register_schema (GKM_STORE (test->storage), &url, NULL, 0);
-	gkm_store_register_schema (GKM_STORE (test->storage), &label, NULL, 0);
 
 	/*
 	 * Create a new object that hasn't yet been stored in the storage.