Release 2.26.1

svn path=/branches/gnome-2-26/; revision=1722

6 files changed, 26 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 181f2117..6d61bbfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+=== gnome-keyring 2.26.1 ===
+
+2009-04-12  Stef Walter  <stef@memberwebs.com>
+
+	* NEWS: 
+	* docs/reference/gcr/Makefile.am:
+	* docs/reference/gp11/Makefile.am:
+	* docs/reference/gnome-keyring/Makefile.am: Version 2.26.1
+
 2009-04-12  Stef Walter  <stef@memberwebs.com>
 
 	* gcr/gcr-certificate.c: Fill in some API documentation.
diff --git a/NEWS b/NEWS
index 22e75960..486ec8a5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+Changes in version 2.26.1 are:
+* Fix many problems with the new secure memory allocator.
+* DBus now automatically starts the gnome-keyring service properly.
+* When auto activating the gnome-keyring DBus service, check for an 
+  already running daemon.
+* Don't print critical warnings when registering with DBus fails.
+* Bump glib dependency.
+* Add DBus method for getting the gnome-keyring environment variables.
+* Fix crash when prompting to unlock the keyring.
+* Initialize daemon with LOGNAME and USERNAME environment variables.
+* Build fixes [Ed Schouten]
+
 Changes in version 2.26.0 are:
 * Implement support for running gnome-keyring-daemon under valgrind.
 * Checks for asn1Parser tool when configuring. [Alberto Ruiz].
diff --git a/docs/reference/gcr/Makefile.am b/docs/reference/gcr/Makefile.am
index d2e82e3a..43eba2bc 100644
--- a/docs/reference/gcr/Makefile.am
+++ b/docs/reference/gcr/Makefile.am
@@ -79,7 +79,7 @@ expand_content_files=
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS= -I$(top_srcdir) -I$(top_builddir) $(GOBJECT_CFLAGS) -Wno-error
-GTKDOC_LIBS= $(GOBJECT_LIBS) $(top_srcdir)/$(DOC_MODULE)/lib$(DOC_MODULE).la
+GTKDOC_LIBS= $(GOBJECT_LIBS) $(top_builddir)/$(DOC_MODULE)/lib$(DOC_MODULE).la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/docs/reference/gnome-keyring/Makefile.am b/docs/reference/gnome-keyring/Makefile.am
index 0c4890f6..2b171527 100644
--- a/docs/reference/gnome-keyring/Makefile.am
+++ b/docs/reference/gnome-keyring/Makefile.am
@@ -79,7 +79,7 @@ expand_content_files=
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS= -I$(top_srcdir) -I$(top_builddir) $(GOBJECT_CFLAGS) -Wno-error
-GTKDOC_LIBS= $(GOBJECT_LIBS) $(top_srcdir)/library/libgnome-keyring.la
+GTKDOC_LIBS= $(GOBJECT_LIBS) $(top_builddir)/library/libgnome-keyring.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/docs/reference/gp11/Makefile.am b/docs/reference/gp11/Makefile.am
index 849adc0e..d6e73730 100644
--- a/docs/reference/gp11/Makefile.am
+++ b/docs/reference/gp11/Makefile.am
@@ -79,7 +79,7 @@ expand_content_files=
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS= -I$(top_srcdir) -I$(top_builddir) $(GOBJECT_CFLAGS) -Wno-error
-GTKDOC_LIBS= $(GOBJECT_LIBS) $(top_srcdir)/$(DOC_MODULE)/lib$(DOC_MODULE).la
+GTKDOC_LIBS= $(GOBJECT_LIBS) $(top_builddir)/$(DOC_MODULE)/lib$(DOC_MODULE).la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/po/ChangeLog b/po/ChangeLog
index 59a53afe..99dd0bc0 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,5 @@
+=== gnome-keyring 2.26.1 ===
+
 2009-03-30  Baris Cicek <baris@teamforce.name.tr>
 
 	* tr.po: Updated Turkish translation.