[glom] libglom: Change the ABI to 1.20, to avoid clashing with 1.16.

[Murray Cumming <murrayc src gnome org>]

commit b329a93034b81dc28ac4d5a08a39f255b7ba9163
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Oct 19 12:24:23 2010 +0200

    libglom: Change the ABI to 1.20, to avoid clashing with 1.16.
    
    * configure.ac:
    * glom/libglom/init.h:
    * glom/python_embed/python_module/py_glom_module.cc:
    * tests/test_load_python_library.cc: Change it everywhere.

 ChangeLog                                         |   11 ++++++++++-
 configure.ac                                      |    4 ++--
 glom/libglom/init.h                               |    4 ++--
 glom/python_embed/python_module/py_glom_module.cc |    2 +-
 tests/test_load_python_library.cc                 |    2 +-
 5 files changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 81eb11e..6194d9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,13 @@
-2010-10-19  Murray Cumming  <murrayc murrayc-desktop>
+2010-10-19  Murray Cumming  <murrayc murrayc com>
+
+	libglom: Change the ABI to 1.20, to avoid clashing with 1.16.
+
+	* configure.ac:
+	* glom/libglom/init.h:
+	* glom/python_embed/python_module/py_glom_module.cc:
+	* tests/test_load_python_library.cc: Change it everywhere.
+
+2010-10-19  Murray Cumming  <murrayc murrayc com>
 
 	distcheck: Remove check for NEWS update.
 
diff --git a/configure.ac b/configure.ac
index f6ea16d..0d323f8 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.15.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=Glom],[glom])
+AC_INIT([Glom],[1.19.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=Glom],[glom])
 AC_PREREQ(2.63)
 
 AC_CONFIG_SRCDIR([glom/main.cc])
@@ -37,7 +37,7 @@ LT_INIT([disable-static win32-dll])
 # Used for the install directories for headers.  The same number is used in
 # the library name, which must be kept in sync, but variables can't be used
 # with that.
-AC_SUBST([GLOM_ABI_VERSION], [1.16])
+AC_SUBST([GLOM_ABI_VERSION], [1.20])
 AC_DEFINE_UNQUOTED([GLOM_ABI_VERSION], ["$GLOM_ABI_VERSION"],
 		   [Define to the Glom ABI version string.])
 
diff --git a/glom/libglom/init.h b/glom/libglom/init.h
index 0c59f62..2353995 100644
--- a/glom/libglom/init.h
+++ b/glom/libglom/init.h
@@ -59,12 +59,12 @@
  *
  * If your source file is @c program.cc, you can compile it with:
  * @code
- * g++ program.cc -o program  `pkg-config --cflags --libs glom-1.16`
+ * g++ program.cc -o program  `pkg-config --cflags --libs glom-1.20`
  * @endcode
  *
  * Alternatively, if using autoconf, use the following in @c configure.ac:
  * @code
- * PKG_CHECK_MODULES([DEPS], [glom-1.16])
+ * PKG_CHECK_MODULES([DEPS], [glom-1.20])
  * @endcode
  * Then use the generated @c DEPS_CFLAGS and @c DEPS_LIBS variables in the
  * project @c Makefile.am files. For example:
diff --git a/glom/python_embed/python_module/py_glom_module.cc b/glom/python_embed/python_module/py_glom_module.cc
index 57ed235..415a076 100644
--- a/glom/python_embed/python_module/py_glom_module.cc
+++ b/glom/python_embed/python_module/py_glom_module.cc
@@ -29,7 +29,7 @@
 
 using namespace Glom;
 
-BOOST_PYTHON_MODULE(glom_1_16)
+BOOST_PYTHON_MODULE(glom_1_20)
 {
   boost::python::docstring_options doc_options(
     true, // show the docstrings from here
diff --git a/tests/test_load_python_library.cc b/tests/test_load_python_library.cc
index 48670d8..a8dc3e0 100644
--- a/tests/test_load_python_library.cc
+++ b/tests/test_load_python_library.cc
@@ -6,7 +6,7 @@ int main()
 {
   // Attempt to dynamically load the python module,
   // attempting to resolve all symbols immediately:
-  const char* path = "glom/python_embed/python_module/.libs/glom_1.16.so";
+  const char* path = "glom/python_embed/python_module/.libs/glom_1.20.so";
   void* lib = dlopen(path, RTLD_NOW);
 
   if(!lib)