Release version 2.29.4GNOME_KEYRING_2_29_4

And do a bunch of distcheck fixes.

8 files changed, 38 insertions, 7 deletions

diff --git a/NEWS b/NEWS
index cf69fea6..19acc777 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,24 @@
+Changes in version 2.29.4 are:
+ * Refactor how the daemon starts up.
+ * Allow init with already present environment variables, using --start.
+ * Install autostart files for each component of the daemon.
+ * New DBus Secret Service API for accessing passwords and secrets.
+ * Old protocol for accessing secrets is no longer present.
+ * libgnome-keyring is now its own module, and no longer bundled
+   with gnome-keyring.
+ * Use normal GtkEntry when prompting for passwords.
+ * Requires GTK+ 2.18
+ * Implement new more flexible control protocol for pam and startup.
+ * Complete more of the gp11 PKCS#11 wrapper library.
+ * Implement AES key wrapping and unwrapping in PKCS#11 components.
+ * Implement DH key generation and derivation in PKCS#11 components.
+ * Integrate testing of PKCS#11 components via p11-tests.
+ * Implement PKCS#11 component for storing 'keyring' style secrets.
+ * Don't complain if we can't set session environment variables.
+ * When running a debug build, warnings are fatal.
+ * Refactor testing.
+ * Encrypted channel for password with prompting dialog.
+
 Changes in version 2.28.2 are:
  * Add license to reference documentation.
  * Sent output of g_printerr to syslog.
diff --git a/autogen.sh b/autogen.sh
index 39df1408..dccb1842 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,8 +8,7 @@ PKG_NAME="gnome-keyring"
 REQUIRED_AUTOMAKE_VERSION=1.6
 
 (test -f $srcdir/configure.in \
-  && test -f $srcdir/library/gnome-keyring.h \
-  && test -f $srcdir/library/gnome-keyring.c) || {
+  && test -f $srcdir/daemon/gkd-main.c) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level $PKG_NAME directory"
     exit 1
diff --git a/daemon/prompt/Makefile.am b/daemon/prompt/Makefile.am
index ee4c3986..01c0a2f3 100644
--- a/daemon/prompt/Makefile.am
+++ b/daemon/prompt/Makefile.am
@@ -50,7 +50,9 @@ gkd-prompt-marshal.c: gkd-prompt-marshal.list $(GLIB_GENMARSHAL)
 	echo "#include \"gkd-prompt-marshal.h\"" > $@ && \
 	$(GLIB_GENMARSHAL) $< --body --prefix=gkd_prompt_marshal >> $@
 
-EXTRA_DIST = gkd-prompt-marshal.list
+EXTRA_DIST = \
+	gkd-prompt-marshal.list \
+	$(ui_DATA)
 
 # ------------------------------------------------------------------
 # PROMPT TOOL
diff --git a/pkcs11/gck/Makefile.am b/pkcs11/gck/Makefile.am
index 6d04a55e..b6bdb320 100644
--- a/pkcs11/gck/Makefile.am
+++ b/pkcs11/gck/Makefile.am
@@ -29,7 +29,7 @@ libgck_la_SOURCES = \
 	gck-data-der.c gck-data-der.h \
 	gck-data-file.c gck-data-file.h \
 	gck-data-types.h \
-	gck-dh-key.c gdk-dh-key.h \
+	gck-dh-key.c gck-dh-key.h \
 	gck-dh-mechanism.c gck-dh-mechanism.h \
 	gck-dh-private-key.c gck-dh-private-key.h \
 	gck-dh-public-key.c gck-dh-public-key.h \
diff --git a/pkcs11/secret-store/tests/Makefile.am b/pkcs11/secret-store/tests/Makefile.am
index ce80ed90..c5d47d80 100644
--- a/pkcs11/secret-store/tests/Makefile.am
+++ b/pkcs11/secret-store/tests/Makefile.am
@@ -17,4 +17,7 @@ UNIT_LIBS =  \
 	$(top_builddir)/pkcs11/gck/libgck.la \
 	$(top_builddir)/egg/libegg.la
 
+EXTRA_DIST = \
+	test-data
+
 include $(top_srcdir)/tests/gtest.make
diff --git a/pkcs11/secret-store/tests/test-secret-module.c b/pkcs11/secret-store/tests/test-secret-module.c
index 36462ded..7562aab1 100644
--- a/pkcs11/secret-store/tests/test-secret-module.c
+++ b/pkcs11/secret-store/tests/test-secret-module.c
@@ -50,8 +50,10 @@ copy_scratch_file (const gchar *basename)
 	gsize n_data;
 
 	filename = test_data_filename (basename);
-	if (!g_file_get_contents (filename, &data, &n_data, NULL))
+	if (!g_file_get_contents (filename, &data, &n_data, NULL)) {
+		g_warning ("couldn't read: %s", filename);
 		g_return_if_reached ();
+	}
 	g_free (filename);
 
 	filename = test_scratch_filename (basename);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index dd502834..f0555140 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,7 +4,9 @@ daemon/data/gnome-keyring.schemas.in
 daemon/dbus/gkd-secret-change.c
 daemon/dbus/gkd-secret-create.c
 daemon/dbus/gkd-secret-unlock.c
-daemon/gnome-keyring-daemon.desktop.in.in
+daemon/gnome-keyring-pkcs11.desktop.in.in
+daemon/gnome-keyring-secrets.desktop.in.in
+daemon/gnome-keyring-ssh.desktop.in.in
 daemon/org.gnome.keyring.service.in
 daemon/pkcs11/gkd-pkcs11-auth.c
 daemon/prompt/gkd-prompt-tool.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index fcfbed80..d9cecbd5 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,3 +1,5 @@
-daemon/gnome-keyring-daemon.desktop.in
+daemon/gnome-keyring-pkcs11.desktop.in
+daemon/gnome-keyring-secrets.desktop.in
+daemon/gnome-keyring-ssh.desktop.in
 gcr/gcr-import-dialog.ui
 gcr/gcr-certificate-basics-widget.ui