summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--NEWS9
-rw-r--r--configure.in4
-rw-r--r--po/ChangeLog5
-rw-r--r--po/POTFILES.in1
-rw-r--r--src/nautilus-application.c2
6 files changed, 30 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 66a6b2a94..750ccd40b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
2008-01-14 Alexander Larsson <alexl@redhat.com>
+ * src/nautilus-application.c:
+ Correct includes
+
+ * NEWS:
+ Update for release
+
+ * configure.in:
+ Update version to 2.21.5
+ Require eel 2.21.5
+
+2008-01-14 Alexander Larsson <alexl@redhat.com>
+
* configure.in:
Require glib 2.15.2
diff --git a/NEWS b/NEWS
index 8cb6c204c..6084b086f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+Major changes in 2.21.5 are:
+* Add autorun/automount feature
+* Better handling of sensitivity of delete menu items
+* Better handling of mount/unmount/eject in many places
+* Fix for extensions with submenus
+* Fix crashes
+* Updated some icons to the Tango look
+* Fix some portability issues
+
Major changes in 2.21.2 are:
* Update pkg-config files with new extensions dir
* Add some gio features to extension API
diff --git a/configure.in b/configure.in
index 33381a660..416f9d638 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl ===========================================================================
m4_define(bonobo_activation_minver, 2.1.0)
m4_define(bonobo_minver, 2.1.0)
-m4_define(eel_minver, 2.21.1)
+m4_define(eel_minver, 2.21.5)
m4_define(esound_minver, 0.2.27)
m4_define(glib_minver, 2.15.2)
m4_define(gnome_desktop_minver, 2.9.91)
@@ -28,7 +28,7 @@ dnl Interface break is not allowed.
m4_define(nautilus_extension_current, 2)
m4_define(nautilus_extension_revision, 0)
-AC_INIT([nautilus],[2.21.3],
+AC_INIT([nautilus],[2.21.5],
[http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus])
dnl ===========================================================================
diff --git a/po/ChangeLog b/po/ChangeLog
index 0c7388cb6..1852706f9 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-14 Alexander Larsson <alexl@redhat.com>
+
+ * POTFILES.in:
+ Add nautilus-autorun.c
+
2008-01-14 Kjartan Maraas <kmaraas@gnome.org>
* nb.po: Updated Norwegian bokmål translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 49518c363..67494ff5e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,6 +7,7 @@ libnautilus-extension/nautilus-column.c
libnautilus-extension/nautilus-menu-item.c
libnautilus-extension/nautilus-property-page.c
libnautilus-private/apps_nautilus_preferences.schemas.in
+libnautilus-private/nautilus-autorun.c
libnautilus-private/nautilus-clipboard.c
libnautilus-private/nautilus-column-chooser.c
libnautilus-private/nautilus-column-utilities.c
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 1564d8c9f..6c3f75805 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -55,7 +55,7 @@
#include "nautilus-shell-interface.h"
#include "nautilus-shell.h"
#include "nautilus-window-bookmarks.h"
-#include "nautilus-file-operations.h"
+#include "libnautilus-private/nautilus-file-operations.h"
#include "nautilus-window-private.h"
#include "nautilus-window-manage-views.h"
#include <libxml/xmlsave.h>