[glom] 1.21.5

[Murray Cumming <murrayc src gnome org>]

commit ef8f4eaf86bdbde9011e552ec9d47a57a8157a79
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Jan 25 10:40:06 2012 +0100

    1.21.5

 ChangeLog                                |    2 ++
 NEWS                                     |    6 ++++++
 configure.ac                             |    2 +-
 tests/test_document_load_translations.cc |    2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index fc6627f..22a1abe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+1.21.5:
+
 2012-01-25  Murray Cumming  <murrayc murrayc com>
 
 	Depend on libgda 5.0.3 because we need the GdaNumeric corrections.
diff --git a/NEWS b/NEWS
index 9198e1a..895dc10 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+1.21.5 (unstable):
+
+* Depend on libgda 5.0.3 because we need the GdaNumeric corrections.
+  This avoids errors when creating from examples, when using a 
+  non-English locale. This fixes bug #668346 (Janne)
+
 1.21.4 (unstable):
 
 * libglom: Use std::vector instead of std::list, for consistency.
diff --git a/configure.ac b/configure.ac
index 1fd9ca0..51df0d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([Glom],[1.21.4],[http://bugzilla.gnome.org/enter_bug.cgi?product=Glom],[glom])
+AC_INIT([Glom],[1.21.5],[http://bugzilla.gnome.org/enter_bug.cgi?product=Glom],[glom])
 AC_PREREQ(2.63)
 
 AC_CONFIG_SRCDIR([glom/main.cc])
diff --git a/tests/test_document_load_translations.cc b/tests/test_document_load_translations.cc
index b637cc4..3b8671f 100644
--- a/tests/test_document_load_translations.cc
+++ b/tests/test_document_load_translations.cc
@@ -243,7 +243,7 @@ int main()
   }
 
   const std::vector<Glib::ustring> locales = document.get_translation_available_locales();
-  g_assert(locales.size() == 4);
+  g_assert(locales.size() == 5);
   g_assert(contains(locales, "de"));
 
   const std::vector<Glib::ustring> table_names = document.get_table_names();