[gedit] Release 2.31.6

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 74b11554b78367d5fe38ea50a71ebf335f1ded27
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Wed Aug 4 18:39:10 2010 +0200

    Release 2.31.6

 NEWS                                               |   22 ++++++++++++++++++++
 README                                             |    8 +++---
 configure.ac                                       |    4 +-
 plugins/pythonconsole/Makefile.am                  |   15 ++++++++++--
 ...e.gedit.plugins.pythonconsole.gschema.xml.in.in |    0
 plugins/pythonconsole/pythonconsole/Makefile.am    |   13 +----------
 6 files changed, 41 insertions(+), 21 deletions(-)
---
diff --git a/NEWS b/NEWS
index 9729935..7bdd806 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,26 @@
 ============
+gedit 2.31.6
+============
+
+New Features and Fixes
+======================
+- Port plugins to use the new object property approach from libpeas. (Ignacio Casal Quinteiro)
+- Misc bugfixes
+
+New and updated translations
+============================
+- de (Mario Blättermann)
+- gl (Fran Diéguez)
+- kn (Shankar Prasad)
+- nb (Kjartan Maraas)
+- ro (Lucian Adrian Grijincu)
+- sv (Daniel Nylander)
+- zh_CN (Aron Xu)
+- zh_CN (YunQiang Su)
+- zh_HK (Chao-Hsiung Liao)
+- zh_TW (Chao-Hsiung Liao)
+
+============
 gedit 2.31.5
 ============
 
diff --git a/README b/README
index 674f41c..720649a 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 General Information
 ===================
 
-This is version 2.31.5 of gedit. gedit is a small and lightweight UTF-8 text 
+This is version 2.31.6 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+-3.0.x and GtkSourceView 3.0.x and libpeas 0.5.2 libraries.
+gedit requires GTK+-3.0.x and GtkSourceView 3.0.x and libpeas 0.5.4 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.5.tar.gz | tar xvf - 	# unpack the sources
-  % cd gedit-2.31.5				# change to the toplevel directory
+  % gzip -cd gedit-2.31.6.tar.gz | tar xvf - 	# unpack the sources
+  % cd gedit-2.31.6				# 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 2051b31..8e4e86a 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,  5)
+m4_define(gedit_micro_version,  6)
 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/])
@@ -414,8 +414,8 @@ plugins/filebrowser/org.gnome.gedit.plugins.filebrowser.gschema.xml.in
 plugins/filebrowser/Makefile
 plugins/modelines/Makefile
 plugins/pythonconsole/Makefile
+plugins/pythonconsole/org.gnome.gedit.plugins.pythonconsole.gschema.xml.in
 plugins/pythonconsole/pythonconsole/Makefile
-plugins/pythonconsole/pythonconsole/org.gnome.gedit.plugins.pythonconsole.gschema.xml.in
 plugins/sort/Makefile
 plugins/spell/Makefile
 plugins/taglist/Makefile
diff --git a/plugins/pythonconsole/Makefile.am b/plugins/pythonconsole/Makefile.am
index c27227f..4707989 100644
--- a/plugins/pythonconsole/Makefile.am
+++ b/plugins/pythonconsole/Makefile.am
@@ -7,9 +7,18 @@ plugin_in_files = pythonconsole.gedit-plugin.desktop.in
 
 plugin_DATA = $(plugin_in_files:.gedit-plugin.desktop.in=.gedit-plugin)
 
-EXTRA_DIST = $(plugin_in_files)
+gsettings_SCHEMAS = org.gnome.gedit.plugins.pythonconsole.gschema.xml
 
-CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
+ INTLTOOL_XML_NOMERGE_RULE@
+ GSETTINGS_RULES@
+
+EXTRA_DIST =			\
+	$(plugin_in_files)	\
+	org.gnome.gedit.plugins.pythonconsole.gschema.xml.in.in
+
+CLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS)
+DISTCLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS)
+
+MAINTAINERCLEANFILES = $(gsettings_SCHEMAS:.xml=.valid)
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/pythonconsole/pythonconsole/org.gnome.gedit.plugins.pythonconsole.gschema.xml.in.in b/plugins/pythonconsole/org.gnome.gedit.plugins.pythonconsole.gschema.xml.in.in
similarity index 100%
rename from plugins/pythonconsole/pythonconsole/org.gnome.gedit.plugins.pythonconsole.gschema.xml.in.in
rename to plugins/pythonconsole/org.gnome.gedit.plugins.pythonconsole.gschema.xml.in.in
diff --git a/plugins/pythonconsole/pythonconsole/Makefile.am b/plugins/pythonconsole/pythonconsole/Makefile.am
index 591c802..8841bb1 100644
--- a/plugins/pythonconsole/pythonconsole/Makefile.am
+++ b/plugins/pythonconsole/pythonconsole/Makefile.am
@@ -9,18 +9,7 @@ plugin_PYTHON =		\
 uidir = $(GEDIT_PLUGINS_DATA_DIR)/pythonconsole/ui
 ui_DATA = config.ui
 
-gsettings_SCHEMAS = org.gnome.gedit.plugins.pythonconsole.gschema.xml
-
- INTLTOOL_XML_NOMERGE_RULE@
- GSETTINGS_RULES@
-
 EXTRA_DIST =		\
-	$(ui_DATA)	\
-	org.gnome.gedit.plugins.pythonconsole.gschema.xml.in.in
-
-CLEANFILES = $(gsettings_SCHEMAS)
-DISTCLEANFILES = $(gsettings_SCHEMAS)
-
-MAINTAINERCLEANFILES = $(gsettings_SCHEMAS:.xml=.valid)
+	$(ui_DATA)
 
 -include $(top_srcdir)/git.mk