seahorse r2055 - in trunk: . po

[nnielsen svn gnome org]

Author: nnielsen
Date: Tue Jan 29 04:24:26 2008
New Revision: 2055
URL: http://svn.gnome.org/viewvc/seahorse?rev=2055&view=rev

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



Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/NEWS
   trunk/README
   trunk/configure.in
   trunk/po/ChangeLog

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Tue Jan 29 04:24:26 2008
@@ -48,7 +48,8 @@
     
 DISTCHECK_CONFIGURE_FLAGS = \
     --disable-scrollkeeper \
-    --disable-update-mime-database
+    --disable-update-mime-database \
+    --with-nautilus-ext-dir=/tmp
 
 distuninstallcheck:
 	@:

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Tue Jan 29 04:24:26 2008
@@ -1,3 +1,15 @@
+seahorse 2.21.90
+----------------
+
+    * Remove options that screw with gpg.conf on seahorse-agent startup,
+      since this was unsafe and naive.
+    * Update libsoup optional dependency to depend on 2.4.x [Dan Winship]
+    * Add icon for the gedit plugin [Adam Schreiber]
+    * Don't add extra dot to encrypted or compressed files [Kip Warner]
+    * Fix build problems with nautilus 2.21.x and later [Wouter Bolsterlee]
+    * Install nautilus extension to correct directory [Brian Pepple]
+    * Support better dropping of text keys onto main window [Christian Persch] 
+    
 seahorse 2.21.4
 ---------------
 

Modified: trunk/README
==============================================================================
--- trunk/README	(original)
+++ trunk/README	Tue Jan 29 04:24:26 2008
@@ -1,5 +1,5 @@
 Seahorse: a Gnome encryption interface.
-This describes version 2.21.4
+This describes version 2.21.90
 
 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: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Jan 29 04:24:26 2008
@@ -5,7 +5,7 @@
 dnl ****************************************************************************
 dnl MAIN SEAHORSE VERSION (update after release)
 
-AC_INIT(seahorse, 2.21.5)
+AC_INIT(seahorse, 2.21.90)
 
 dnl ****************************************************************************
 dnl LIBCRYPTUI libtool versioning
@@ -309,10 +309,23 @@
         AC_SUBST(NAUTILUS_LIBS)
     fi
 
+	dnl   We have this --with-nautils-ext-dir option primarily so it 
+	dnl   can work with DISTCHECK_CONFIGURE_FLAGS in Makefile.am
+	dnl   and get around autotools limitations.
+	 
+    AC_ARG_WITH([nautilus-ext-dir],
+                [AC_HELP_STRING([--with-nautilus-ext-dir=DIR],
+                                [directory to nautilus extension config])],
+                [], [with_nautilus_ext_dir=""])
+
     # Fetch the extension directory
     if test "$enable_nautilus" = "yes"; then
-	NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
-	AC_SUBST(NAUTILUS_EXTENSION_DIR)
+        if test -z "$with_nautilus_ext_dir"; then
+            NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
+        else
+            NAUTILUS_EXTENSION_DIR="$with_nautilus_ext_dir"
+        fi
+        AC_SUBST(NAUTILUS_EXTENSION_DIR)
     fi
 fi