[gedit] Release 2.31.5

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 48ed1ebfb78a55401c596c4bdb872418c47476b5
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Mon Jul 12 17:54:35 2010 +0200

    Release 2.31.5

 NEWS                                            |   15 +++++++++++++++
 README                                          |   12 ++++++------
 configure.ac                                    |    6 +++---
 plugins/filebrowser/Makefile.am                 |    4 ++--
 plugins/pythonconsole/pythonconsole/Makefile.am |    2 +-
 plugins/time/Makefile.am                        |    2 +-
 6 files changed, 28 insertions(+), 13 deletions(-)
---
diff --git a/NEWS b/NEWS
index 6cebc9c..9729935 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,19 @@
 ============
+gedit 2.31.5
+============
+
+New Features and Fixes
+======================
+- Port pythonconsole to libpeas and gsettings. (Ignacio Casal Quinteiro)
+- Use XDG directories (Garrett Regier)
+- Misc bugfixes
+
+New and updated translations
+============================
+- es (Jorge González)
+- gl (Fran Diéguez)
+
+============
 gedit 2.31.4
 ============
 
diff --git a/README b/README
index dadce90..674f41c 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 General Information
 ===================
 
-This is version 2.31.4 of gedit. gedit is a small and lightweight UTF-8 text 
+This is version 2.31.5 of gedit. gedit is a small and lightweight UTF-8 text 
 editor for the GNOME environment.
 
 gedit is part of GNOME and uses the latest GTK+ and GNOME libraries.
@@ -65,14 +65,14 @@ Information about gedit mailing lists can be found at
 Installation
 ============
 
-gedit requires GTK+-2.16.x, GtkSourceView 2.4.x and GConf libraries.
-PyGobject 2.12.x, PyGtk 2.12.x and PyGtkSourceView 2.4.x are required to
-enable python plugins support.
+gedit requires GTK+-3.0.x and GtkSourceView 3.0.x and libpeas 0.5.2 libraries.
+PyGobject 2.21.5 and gobject-introspection 0.9.0 are required to enable python
+plugins support.
 
 Simple install procedure:
 
-  % gzip -cd gedit-2.31.4.tar.gz | tar xvf - 	# unpack the sources
-  % cd gedit-2.31.4				# change to the toplevel directory
+  % gzip -cd gedit-2.31.5.tar.gz | tar xvf - 	# unpack the sources
+  % cd gedit-2.31.5				# change to the toplevel directory
   % ./configure					# run the `configure' script
   % make					# build gedit
   [ Become root if necessary ]
diff --git a/configure.ac b/configure.ac
index 8c4a5b6..955b919 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_PREREQ(2.63.2)
 
 m4_define(gedit_major_version,  2)
 m4_define(gedit_minor_version, 31)
-m4_define(gedit_micro_version,  4)
+m4_define(gedit_micro_version,  5)
 m4_define(gedit_version, gedit_major_version.gedit_minor_version.gedit_micro_version)
 
 AC_INIT([gedit],[gedit_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=gedit],[gedit],[http://projects.gnome.org/gedit/])
@@ -273,8 +273,8 @@ PKG_CHECK_MODULES(GEDIT, [
 	gio-2.0 >= 2.25.11
 	gtk+-3.0 >= 2.90.0
 	gtksourceview-3.0 >= 2.11.2
-	libpeas-1.0
-	libpeasui-1.0
+	libpeas-1.0 >= 0.5.2
+	libpeasui-1.0 >= 0.5.2
 ])
 
 if test "$os_osx" = "no" &&
diff --git a/plugins/filebrowser/Makefile.am b/plugins/filebrowser/Makefile.am
index 73426c1..ac37999 100644
--- a/plugins/filebrowser/Makefile.am
+++ b/plugins/filebrowser/Makefile.am
@@ -66,7 +66,7 @@ gedit-file-browser-marshal.c: gedit-file-browser-marshal.list $(GLIB_GENMARSHAL)
 plugin_DATA = $(plugin_in_files:.gedit-plugin.desktop.in=.gedit-plugin)
 
 gsettings_ENUM_NAMESPACE = org.gnome.gedit.plugins.filebrowser
-gsettings_ENUM_FILES = $(NOINST_H_FILES)
+gsettings_ENUM_FILES = $(top_srcdir)/plugins/filebrowser/*.h
 gsettings_SCHEMAS = org.gnome.gedit.plugins.filebrowser.gschema.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
@@ -80,7 +80,7 @@ EXTRA_DIST = \
 	gedit-file-browser-enum-types.c.template	\
 	gedit-file-browser-enum-register.c.template	\
 	gedit-file-browser-marshal.list			\
-	org.gnome.gedit.file-browser.gschema.xml.in.in
+	org.gnome.gedit.plugins.filebrowser.gschema.xml.in.in
 
 CLEANFILES = \
 	$(plugin_DATA)		\
diff --git a/plugins/pythonconsole/pythonconsole/Makefile.am b/plugins/pythonconsole/pythonconsole/Makefile.am
index 9270e61..5b8e0fa 100644
--- a/plugins/pythonconsole/pythonconsole/Makefile.am
+++ b/plugins/pythonconsole/pythonconsole/Makefile.am
@@ -16,7 +16,7 @@ gsettings_SCHEMAS = org.gnome.gedit.pythonconsole.gschema.xml
 
 EXTRA_DIST =		\
 	$(ui_DATA)	\
-	org.gnome.gedit.plugins.pythonconsole.gschema.xml.in.in
+	org.gnome.gedit.pythonconsole.gschema.xml.in.in
 
 CLEANFILES = $(gsettings_SCHEMAS)
 DISTCLEANFILES = $(gsettings_SCHEMAS)
diff --git a/plugins/time/Makefile.am b/plugins/time/Makefile.am
index 107c1ce..f34303b 100644
--- a/plugins/time/Makefile.am
+++ b/plugins/time/Makefile.am
@@ -28,7 +28,7 @@ plugin_in_files = time.gedit-plugin.desktop.in
 plugin_DATA = $(plugin_in_files:.gedit-plugin.desktop.in=.gedit-plugin)
 
 gsettings_ENUM_NAMESPACE = org.gnome.gedit.plugins.time
-gsettings_ENUM_FILES = gedit-time-plugin.c
+gsettings_ENUM_FILES = $(top_srcdir)/plugins/time/gedit-time-plugin.c
 gsettings_SCHEMAS = org.gnome.gedit.time.gschema.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@