[gnote] Hard require on libxml++ 2.26. Should prevent some bugs (Bug #583807, Bug #583808, Bug #579292, Bug

[Hubert Figuière <hub src gnome org>]

commit 6e0bdfa82f64b6c325224410876e97dd550ee544
Author: Hubert Figuiere <hub figuiere net>
Date:   Mon May 25 15:05:35 2009 -0400

    Hard require on libxml++ 2.26. Should prevent some bugs (Bug #583807, Bug #583808, Bug #579292, Bug #579316)
    See: http://git.gnome.org/cgit/libxml++/commit/?id=24b3ec06f5c5ebd0529100a5506a8038f14bac5b
---
 .gitignore   |    1 +
 NEWS         |    6 +++++-
 configure.ac |    6 +++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 751a4b2..4975ac4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,7 @@ src/libgnote.a
 src/notetest
 src/stringtest
 src/trietest
+src/uritest
 src/addins/addins.mk
 src/addins/fixedwidth/fixedwidth.so
 m4/intltool.m4
diff --git a/NEWS b/NEWS
index 20904a5..b39f8f3 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,9 @@ New features:
 
 Fixes:
 
+  * Hard require on libxml++ 2.26. Should prevent some bugs (Bug #583807, 
+    Bug #583808, Bug #579292, Bug #579316)
+    See: http://git.gnome.org/cgit/libxml++/commit/?id=24b3ec06f5c5ebd0529100a5506a8038f14bac5b
   * Note is now trackable. Should avoid a crash related to signals.
     (Closes #581618)
   * Remove obsolete UTF-8 keyword in .desktop (Closes #581623) 
@@ -35,7 +38,8 @@ Translations:
     - German (de)
     - Japanese (ja)
     - Spanish (es)
-  * Added greek help.
+  * Added Greek manual.
+  * Added Spanish manual.
     
 0.3.1 "Five-One-Four" - 2009/05/05
 
diff --git a/configure.ac b/configure.ac
index 2086a58..8039c67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,10 @@ LIBGLIBMM_VERSION=2.0
 LIBGTKMM_VERSION=2.12.0
 dnl LIBGLADEMM_VERSION=2.6.0
 dnl LIBGCONFMM_VERSION=2.6.0
+dnl libxml++ 2.24 has too many bugs, mostly in TextReader
+dnl see http://git.gnome.org/cgit/libxml++/commit/?id=4ff42fba42e3f89986d30231a4e8e604592c8fff
+dnl and https://bugzilla.gnome.org/show_bug.cgi?id=583825
+LIBXMLPP_VERSION=2.26.0
 LIBGCONF_VERSION=2.0.0
 LIBGNOMEUI_VERSION=2.0.0
 LIBPANELAPPLETMM_VERSION=2.22.0
@@ -70,7 +74,7 @@ PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= $GTK_VERSION])
 PKG_CHECK_MODULES(LIBGTKMM, [gtkmm-2.4 >= $LIBGTKMM_VERSION])
 PKG_CHECK_MODULES(LIBXML, [libxml-2.0])
 PKG_CHECK_MODULES(LIBXSLT, [libxslt])
-PKG_CHECK_MODULES(LIBXMLPP, [libxml++-2.6])
+PKG_CHECK_MODULES(LIBXMLPP, [libxml++-2.6 >= $LIBXMLPP_VERSION])
 PKG_CHECK_MODULES(GCONF, [gconf-2.0])
 dnl PKG_CHECK_MODULES(LIBGLADEMM, [libglademm-2.4 >= $LIBGLADEMM_VERSION])
 dnl PKG_CHECK_MODULES(LIBGNOMEUI, [libgnomeui-2.0 >= $LIBGNOMEUI_VERSION])