[gnome-keyring] Release version 3.1.4

[Stefan Walter <stefw src gnome org>]

commit 456041b6cac4c0677b1583cc80a3e1b3a1657398
Author: Stef Walter <stefw collabora co uk>
Date:   Mon Jul 25 10:15:58 2011 +0200

    Release version 3.1.4
    
     * Include some changes to make comparing symbols easier.
     * Fix some issues that came up when doing make distcheck

 .gitignore                 |    1 +
 NEWS                       |   11 +++
 configure.ac               |    2 +-
 gck/Makefile.am            |    6 ++
 gcr/Makefile.am            |   18 +++--
 gcr/libgcr.symbols         |  183 --------------------------------------------
 gcr/tests/test-gnupg-key.c |    2 +-
 7 files changed, 30 insertions(+), 193 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 32e5ba0..f014961 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@ run-tests
 *.gcno
 *.gcda
 *.valid
+*.symbols
 
 /compile
 /ABOUT-NLS
diff --git a/NEWS b/NEWS
index 909eaea..fe1a9cc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+Changes in version 3.1.4 are:
+ * New GcrListSelector class for selecting multiple keys.
+ * Add icons for key and key pair.
+ * Gcr now has support for loading of GnuPG keys from gpg, including photos.
+ * New gcr dependency on p11-kit for loading PKCS#11 modules.
+ * Remove support for GTK+ 2.x
+ * Implement calculation of fingerprints in gcr for keys.
+ * Fix problems in daemon if IPC lock or FS capabilities are not available.
+ * Bug fixes and build fixes.
+ * Code cleanup and refactoring.
+
 Changes in version 3.1.1 are:
  * Add 'Export Certificate' option to right click of certificate widget.
  * Use file system linux capabilities for memory locking.
diff --git a/configure.ac b/configure.ac
index 8de1457..01c5804 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_INIT(daemon/gkd-main.c)
 
-AM_INIT_AUTOMAKE(gnome-keyring, 3.1.2)
+AM_INIT_AUTOMAKE(gnome-keyring, 3.1.4)
 AM_CONFIG_HEADER(config.h)
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
diff --git a/gck/Makefile.am b/gck/Makefile.am
index 70f1f4f..c8f44ce 100644
--- a/gck/Makefile.am
+++ b/gck/Makefile.am
@@ -87,3 +87,9 @@ DISTCLEANFILES = \
 
 gck-$(GCK_MAJOR).pc: gck.pc
 	cp gck.pc gck-$(GCK_MAJOR).pc
+
+symbols: libgck-$(VERSION).symbols
+
+libgck-$(VERSION).symbols: .libs/libgck- GCK_MAJOR@.so
+	nm -D .libs/libgck- GCK_MAJOR@.so | grep -F ' T ' | \
+		cut -d ' ' -f 3 | sort > $@
diff --git a/gcr/Makefile.am b/gcr/Makefile.am
index 8cc24bf..f303598 100644
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@ -102,7 +102,7 @@ libgcr_ GCR_MAJOR@_la_SOURCES = \
 	gcr-key-renderer.c gcr-key-renderer.h \
 	gcr-key-widget.c gcr-key-widget.h \
 	gcr-library.c gcr-library.h \
-	gcr-list-selector.c gcr-list-selector.h \
+	gcr-list-selector.c gcr-list-selector.h gcr-list-selector-private.h \
 	gcr-live-search.c gcr-live-search.h \
 	gcr-memory-icon.c gcr-memory-icon.h \
 	gcr-parser.c gcr-parser.h \
@@ -172,21 +172,23 @@ gcr-$(GCR_MAJOR).pc: gcr.pc
 
 # ----------------------------------------------------------------
 
-libgcr.symbols: .libs/libgcr- GCR_MAJOR@.so
-	nm -D .libs/libgcr- GCR_MAJOR@.so | grep -F ' T ' | \
-		cut -d ' ' -f 3 | sort > $@
-
 EXTRA_DIST = \
 	gcr.pc.in \
 	gcr-marshal.list \
 	$(ui_DATA) \
 	$(conf_DATA) \
-	libgcr.symbols
+	gcr-enum-types.h.template \
+	gcr-enum-types.c.template
 
 CLEANFILES = \
 	$(BUILT_SOURCES) \
 	$(pkgconfig_DATA)
 
 DISTCLEANFILES = \
-	$(pkgconfig_DATA) \
-	libgcr.symbols
+	$(pkgconfig_DATA)
+
+symbols: libgcr-$(VERSION).symbols
+
+libgcr-$(VERSION).symbols: .libs/libgcr- GCR_MAJOR@.so
+	nm -D .libs/libgcr- GCR_MAJOR@.so | grep -F ' T ' | \
+		cut -d ' ' -f 3 | sort > $@
diff --git a/gcr/tests/test-gnupg-key.c b/gcr/tests/test-gnupg-key.c
index ec6547d..152a0c0 100644
--- a/gcr/tests/test-gnupg-key.c
+++ b/gcr/tests/test-gnupg-key.c
@@ -101,7 +101,7 @@ test_markup (Test *test, gconstpointer unused)
 	gchar *markup;
 
 	g_object_get (test->key, "markup", &markup, NULL);
-	g_assert_cmpstr (markup, ==, "Werner Koch &lt;wk g10code com&gt;");
+	g_assert_cmpstr (markup, ==, "Werner Koch\n<small>wk g10code com</small>");
 
 	g_free (markup);
 }