[libgnome-keyring: 3/3] Release version 3.5.3

[Stefan Walter <stefw src gnome org>]

commit 3059be0e878808c6cdcaac1ff0955743b1cb15fb
Author: Stef Walter <stefw gnome org>
Date:   Mon Jun 25 10:05:56 2012 +0200

    Release version 3.5.3

 Makefile.am         |    3 +++
 NEWS                |    4 ++++
 configure.ac        |    2 +-
 library/Makefile.am |   19 ++++++++++---------
 4 files changed, 18 insertions(+), 10 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 96789ad..745c6e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,3 +39,6 @@ dist-hook:
 	else \
 		echo A git clone is required to generate a ChangeLog >&2; \
 	fi
+
+upload-release: $(DIST_ARCHIVES)
+		scp $(DIST_ARCHIVES) master.gnome.org:
diff --git a/NEWS b/NEWS
index 88cba03..d56de65 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Changes in version 3.5.3 are:
+ * Fix debugging for G_MESSAGES_DEBUG
+ * Some minor fixes to avoid vala regressions
+
 Changes in version 3.4.1 are:
  * Build fixes
  * Fix copyright headers
diff --git a/configure.ac b/configure.ac
index 9d2a434..fbd958f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([libgnome-keyring], [3.4.1])
+AC_INIT([libgnome-keyring], [3.5.3])
 AC_CONFIG_SRCDIR([library/gnome-keyring.h])
 AM_INIT_AUTOMAKE([tar-ustar])
 AC_CONFIG_MACRO_DIR([build/m4])
diff --git a/library/Makefile.am b/library/Makefile.am
index ccfd328..1d06e7b 100644
--- a/library/Makefile.am
+++ b/library/Makefile.am
@@ -13,19 +13,22 @@ INCLUDES= \
 	$(LIBRARY_CFLAGS) \
 	$(LIBGCRYPT_CFLAGS)
 
+PUBLIC_SOURCES = \
+	gnome-keyring.c \
+	gnome-keyring.h \
+	gnome-keyring-memory.h \
+	gnome-keyring-memory.c \
+	gnome-keyring-result.h \
+	gnome-keyring-utils.c
+
 libgnome_keyring_la_SOURCES = \
 	gkr-callback.c gkr-callback.h \
 	gkr-debug.c gkr-debug.h \
 	gkr-misc.c gkr-misc.h \
 	gkr-operation.c gkr-operation.h \
 	gkr-session.c gkr-session.h \
-	gnome-keyring.c \
-	gnome-keyring.h \
-	gnome-keyring-memory.h \
-	gnome-keyring-memory.c \
 	gnome-keyring-private.h \
-	gnome-keyring-result.h \
-	gnome-keyring-utils.c
+	$(PUBLIC_SOURCES)
 
 libgnomekeyringinclude_HEADERS = \
 	gnome-keyring.h \
@@ -64,13 +67,11 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 
 if HAVE_INTROSPECTION
 # the gkr-* files are not part of the public API
-introspection_sources = $(filter-out gkr-% %-private.h,$(libgnome_keyring_la_SOURCES))
-
 GnomeKeyring-1.0.gir: $(lib_LTLIBRARIES)
 GnomeKeyring_1_0_gir_INCLUDES = GObject-2.0
 GnomeKeyring_1_0_gir_CFLAGS = $(INCLUDES)
 GnomeKeyring_1_0_gir_LIBS = $(lib_LTLIBRARIES)
-GnomeKeyring_1_0_gir_FILES = $(introspection_sources)
+GnomeKeyring_1_0_gir_FILES = $(PUBLIC_SOURCES)
 GnomeKeyring_1_0_gir_SCANNERFLAGS = --c-include "gnome-keyring.h"
 INTROSPECTION_GIRS += GnomeKeyring-1.0.gir