Merge lp:~brianaker/drizzle/fix-libdrizzle-version into lp:~drizzle-trunk/drizzle/development

[Brian Aker]

[Henrik Ingo (hingo)]

FYI
I have updated https://code.launchpad.net/~hingo/libdrizzle/libdrizzle-versioning so that it matches changes made by Brian in this branch. libdrizzle should work just fine after these changes - fingers crossed.

=== modified file 'configure.ac'
--- configure.ac	2012-02-08 21:33:04 +0000
+++ configure.ac	2012-02-17 21:54:18 +0000
@@ -26,22 +26,7 @@
 
 PANDORA_CANONICAL_TARGET(less-warnings, require-cxx, force-gcc42, version-from-vc) 
 
-LIBDRIZZLE_LIBRARY_VERSION=3:0:0
-#                          | | |
-#                   +------+ | +---+
-#                   |        |     |
-#                current:revision:age
-#                   |        |     |
-#                   |        |     +- increment if interfaces have been added
-#                   |        |        set to zero if interfaces have been
-#                   |        |        removed or changed
-#                   |        +- increment if source code has changed
-#                   |           set to zero if current is incremented
-#                   +- increment if interfaces have been added, removed or
-#                      changed
-AC_SUBST(LIBDRIZZLE_LIBRARY_VERSION)
-
-OLDLIBDRIZZLE_LIBRARY_VERSION=2:0:1
+LIBDRIZZLE_LIBRARY_VERSION=4:0:0
 #                             | | |
 #                      +------+ | +---+
 #                      |        |     |
@@ -54,7 +39,7 @@
 #                      |           set to zero if current is incremented
 #                      +- increment if interfaces have been added, removed or
 #                         changed
-AC_SUBST(OLDLIBDRIZZLE_LIBRARY_VERSION)
+AC_SUBST(LIBDRIZZLE_LIBRARY_VERSION)
 
 # libdrizzle versioning when linked with GNU ld.
 AS_IF([test "$lt_cv_prog_gnu_ld" = "yes"],[

=== modified file 'libdrizzle-1.0/include.am'
--- libdrizzle-1.0/include.am	2012-01-13 06:27:22 +0000
+++ libdrizzle-1.0/include.am	2012-02-17 21:54:18 +0000
@@ -46,7 +46,7 @@
 				      $(AM_LDFLAGS) \
 				      $(GCOV_LIBS) \
 				      -version-info \
-				      $(OLDLIBDRIZZLE_LIBRARY_VERSION)
+				      $(LIBDRIZZLE_LIBRARY_VERSION)
 
 libdrizzle_1_0_libdrizzle_la_SOURCES= \
 				      libdrizzle/column.cc \