seahorse r2330 - in seahorse-plugins/trunk: . po

[nnielsen svn gnome org]

Author: nnielsen
Date: Tue Aug  5 19:36:17 2008
New Revision: 2330
URL: http://svn.gnome.org/viewvc/seahorse?rev=2330&view=rev

Log:
	* configure.in: 
	* Makefile.am:
	* NEWS: 
	* README: Release version 2.23.6


Modified:
   seahorse-plugins/trunk/ChangeLog
   seahorse-plugins/trunk/Makefile.am
   seahorse-plugins/trunk/NEWS
   seahorse-plugins/trunk/README
   seahorse-plugins/trunk/configure.in
   seahorse-plugins/trunk/po/ChangeLog
   seahorse-plugins/trunk/po/POTFILES.in

Modified: seahorse-plugins/trunk/Makefile.am
==============================================================================
--- seahorse-plugins/trunk/Makefile.am	(original)
+++ seahorse-plugins/trunk/Makefile.am	Tue Aug  5 19:36:17 2008
@@ -42,7 +42,8 @@
 DISTCHECK_CONFIGURE_FLAGS = \
     --disable-scrollkeeper \
     --disable-update-mime-database \
-    --with-nautilus-ext-dir=/tmp
+    --with-nautilus-ext-dir=/tmp \
+    --with-epiphany-ext-dir=/tmp
 
 distuninstallcheck:
 	@:

Modified: seahorse-plugins/trunk/NEWS
==============================================================================
--- seahorse-plugins/trunk/NEWS	(original)
+++ seahorse-plugins/trunk/NEWS	Tue Aug  5 19:36:17 2008
@@ -1,3 +1,17 @@
+seahorse-plugins 2.23.6
+-----------------------
+
+    * Detect xulrunner properly on Debian. [Debian Maintainers]
+    * Close file descriptors when forking in seahorse-agent
+      [Josselin Mouette]
+    * Nautilus plugin prompts to create key when needed. [Adam Schreiber]
+    * Port to gio from gnome-vfs.
+    * Remove usage of deprecated APIs. [Adam Schreiber, Saleem Abdulrasool]
+    * Remove libgnome/ui dependency [Saleem Abdulrasool].
+    * Grab keyboard focus in passphrase prompt. [Josselin Mouette]
+    * Close window if open when tray icon clicked. [Josselin Mouette]
+    * Build fixes [Brian Cameron]
+
 seahorse 2.22.0
 ---------------
 

Modified: seahorse-plugins/trunk/README
==============================================================================
--- seahorse-plugins/trunk/README	(original)
+++ seahorse-plugins/trunk/README	Tue Aug  5 19:36:17 2008
@@ -1,5 +1,5 @@
 seahorse-plugins: plugins and utilities for encryption in GNOME
-This describes version 2.23.0
+This describes version 2.23.6
 
 Seahorse is a graphical interface for managing and using encryption keys. 
 Currently it supports PGP keys (using GPG/GPGME) and SSH keys. Its goal is to 

Modified: seahorse-plugins/trunk/configure.in
==============================================================================
--- seahorse-plugins/trunk/configure.in	(original)
+++ seahorse-plugins/trunk/configure.in	Tue Aug  5 19:36:17 2008
@@ -5,7 +5,7 @@
 dnl ****************************************************************************
 dnl MAIN SEAHORSE VERSION (update after release)
 
-AC_INIT(seahorse-plugins, 2.23.0)
+AC_INIT(seahorse-plugins, 2.23.6)
 
 dnl ****************************************************************************
 
@@ -439,7 +439,17 @@
             EPIPHANY_EXTENSION_INIT([$E_API_VERSION], [$EPIPHANY_REQUIRED])
             AC_SUBST([E_API_VERSION])
 
-            EPIPHANY_EXTENSIONS_DIR=$(pkg-config --variable=extensionsdir epiphany-$E_API_VERSION)
+            AC_ARG_WITH([epiphany-ext-dir],
+                        [AC_HELP_STRING([--with-epiphany-ext-dir=DIR],
+                        [directory to epiphany extension config])],
+                        [], [with_epiphany_ext_dir=""])
+
+            # This is used by 'make distcheck'. See Makefile.am
+            if test -z "$with_nautilus_ext_dir"; then
+                EPIPHANY_EXTENSIONS_DIR=$(pkg-config --variable=extensionsdir epiphany-$E_API_VERSION)
+            else
+                EPIPHANY_EXTENSIONS_DIR="$with_epiphany_ext_dir"
+            fi
             AC_SUBST([EPIPHANY_EXTENSIONS_DIR])
 
             AC_SUBST([EPIPHANY_DEPENDENCY_CFLAGS])

Modified: seahorse-plugins/trunk/po/POTFILES.in
==============================================================================
--- seahorse-plugins/trunk/po/POTFILES.in	(original)
+++ seahorse-plugins/trunk/po/POTFILES.in	Tue Aug  5 19:36:17 2008
@@ -9,6 +9,7 @@
 agent/seahorse-agent-status.c
 data/seahorse.schemas.in
 libseahorse/seahorse-gpg-options.c
+libseahorse/seahorse-multi-encrypt.glade
 libseahorse/seahorse-notification.c
 libseahorse/seahorse-notify.glade
 libseahorse/seahorse-passphrase.c