Release gnome-keyring 2.21.3.2 with more build fixes so it builds in

	* keyrings/Makefile.am:
	* pk/Makefile.am:
	* pkcs11/Makefile.am:
	* pkcs11/gkr-pkcs11-module-export.map: (removed)
	* ssh/Makefile.am:
	* ui/Makefile.am:
	* NEWS:
	* configure.in: Release gnome-keyring 2.21.3.2 with more build
	fixes so it builds in jhbuild


svn path=/trunk/; revision=949

9 files changed, 29 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 0035bd7b..5d66bedd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+=== gnome-keyring 2.21.3.2 ===
+
+2007-12-05  Stef Walter  <stef@memberwebs.com>
+
+	* keyrings/Makefile.am:
+	* pk/Makefile.am:
+	* pkcs11/Makefile.am:
+	* pkcs11/gkr-pkcs11-module-export.map: (removed)
+	* ssh/Makefile.am:
+	* ui/Makefile.am:
+	* NEWS:
+	* configure.in: Release gnome-keyring 2.21.3.2 with more build
+	fixes so it builds in jhbuild
+
+
 2007-12-04  Stef Walter  <stef@memberwebs.com>
 
 	* pkcs11/Makefile.am: Don't append version numbers to 
diff --git a/NEWS b/NEWS
index e4c9323f..3ded2a0a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+Changes in version 2.21.3.2 are:
+* x86_64 build fixes
+* Build and install fixes
+* Fix problems with assertions when not in debug mode.
+* Fix some crashers
+* Better ASN.1 and PKCS#11 date parsing and handling
+* Fix return results from C_GetAttributeValue
+* Lookup certificates related to keys properly.
+
 Changes in version 2.21.3.1 are:
 * Build fixes
 * Use SHA1 instead of MD5 where possible.
diff --git a/configure.in b/configure.in
index fccdb37f..4967b50a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 AC_INIT(library/gnome-keyring.h)
 
-AM_INIT_AUTOMAKE(gnome-keyring, 2.21.4)
+AM_INIT_AUTOMAKE(gnome-keyring, 2.21.3.2)
 AM_CONFIG_HEADER(config.h)
 	
 AM_SANITY_CHECK
diff --git a/keyrings/Makefile.am b/keyrings/Makefile.am
index 4b774973..57584c98 100644
--- a/keyrings/Makefile.am
+++ b/keyrings/Makefile.am
@@ -7,6 +7,7 @@ INCLUDES=	\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 	-I$(top_srcdir) 				\
 	-I$(top_builddir) 				\
+	$(DAEMON_CFLAGS)				\
 	$(GOBJECT_CFLAGS) 				\
 	$(GLIB_CFLAGS)
 
diff --git a/pk/Makefile.am b/pk/Makefile.am
index 98cb8eba..b283f18c 100644
--- a/pk/Makefile.am
+++ b/pk/Makefile.am
@@ -7,6 +7,7 @@ INCLUDES=	\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 	-I$(top_srcdir) 				\
 	-I$(top_builddir) 				\
+	$(DAEMON_CFLAGS)				\
 	$(GOBJECT_CFLAGS) 				\
 	$(GLIB_CFLAGS)
 
diff --git a/pkcs11/Makefile.am b/pkcs11/Makefile.am
index 2bf9c528..5dd9591c 100644
--- a/pkcs11/Makefile.am
+++ b/pkcs11/Makefile.am
@@ -1,6 +1,5 @@
 
 EXTRA_DIST = \
-	gkr-pkcs11-module-export.map \
 	pkcs11.h \
 	pkcs11n.h 
 
diff --git a/pkcs11/gkr-pkcs11-module-export.map b/pkcs11/gkr-pkcs11-module-export.map
deleted file mode 100755
index 5e9476c9..00000000
--- a/pkcs11/gkr-pkcs11-module-export.map
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	global: C_GetFunctionList;
-	local: *;
-};
-
diff --git a/ssh/Makefile.am b/ssh/Makefile.am
index 4efb8c34..2aace067 100644
--- a/ssh/Makefile.am
+++ b/ssh/Makefile.am
@@ -7,6 +7,7 @@ INCLUDES=	\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 	-I$(top_srcdir) 				\
 	-I$(top_builddir) 				\
+	$(DAEMON_CFLAGS)				\
 	$(GOBJECT_CFLAGS) 				\
 	$(GLIB_CFLAGS)
 
diff --git a/ui/Makefile.am b/ui/Makefile.am
index e40c7664..43cfa4b1 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES=	\
 	-I$(top_srcdir) 				\
 	-I$(top_srcdir)/library/			\
 	-I$(top_builddir) 				\
+	$(DAEMON_CFLAGS)				\
 	$(GOBJECT_CFLAGS) 				\
 	$(GLIB_CFLAGS)					\
 	$(GTK_CFLAGS)