Merge lp:~hingo/libdrizzle/libdrizzle-versioning into lp:libdrizzle/1.0

[Henrik Ingo]

This is based on my ramblings in the libdrizzle thread on drizzle-discuss
https://lists.launchpad.net/drizzle-discuss/msg08698.html

There are various fixes, but most importantly I felt that the only sane thing to do is to bump the so version to 4.0.0 since 2.0 is ambiguous (the so version 2.0.1 is based on the code in libdrizzle-1.0 and so version 3.0.0 is libdrizzle-2.0...)

If this is cool and you merge it, you should also merge the corresponding change to 4.0.0 on lp:drizzle side:
lp:~hingo/drizzle/drizzle-libdrizzle-version-sync

[lp:~hingo/libdrizzle/libdrizzle-versioning]

2504. By Henrik Ingo on 2012-02-15

Move OLDLIBDRIZZLE_LIBRARY_VERSION down to 2.0.1 since a drizzle rc
has been released with this number. (Discussion about 4.0.0 still
ongoing, but this is the correct value for now.)

2505. By Henrik Ingo on 2012-02-19

Match changes that Brian did at lp:~brianaker/drizzle/fix-libdrizzle-version

The variable name is now LIBDRIZZLE_LIBRARY_VERSION
The version is 4:0:0
(This builds the libdrizzle-1.0/ sources. libdrizzle-2.0/ is vanished
from configure.)

[Andrew Hutchings (linuxjedi)]

1.0 branch now obsolete.

review: Disapprove

Unmerged revisions

2505. By Henrik Ingo on 2012-02-19

Match changes that Brian did at lp:~brianaker/drizzle/fix-libdrizzle-version

The variable name is now LIBDRIZZLE_LIBRARY_VERSION
The version is 4:0:0
(This builds the libdrizzle-1.0/ sources. libdrizzle-2.0/ is vanished
from configure.)

2504. By Henrik Ingo on 2012-02-15

Move OLDLIBDRIZZLE_LIBRARY_VERSION down to 2.0.1 since a drizzle rc
has been released with this number. (Discussion about 4.0.0 still
ongoing, but this is the correct value for now.)

2503. By Henrik Ingo on 2012-02-13

Changed LIBDRIZZLE_LIBRARY_VERSION back to OLDLIBDRIZZLE_LIBRARY_VERSION
so that is is the same variable in lp:libdrizzle and in lp:drizzle.
(Also, keeping the same name as was used until now helps people follow
which is which.)

Bumped library version to 4:0:0 to avoid ambiguity of 2.0, 1.0 and 3.0.
Also the AC_INIT version is 4.0.0.

Changed package name to libdrizzle4.

Copied back LD_VERSION_SCRIPT.

make dist expects a ChangeLog. Created one that says to read the
drizzle ChangeLog.

=== modified file '.bzrignore'
--- .bzrignore	2012-02-12 10:27:08 +0000
+++ .bzrignore	2012-02-19 21:04:17 +0000
@@ -15,13 +15,11 @@
 *.rpm
 *replication.pb.*
 *stamp-h
-./ChangeLog
 .DS_Store
 .deps
 .libs
 .plugin.ini.stamp
 .plugin.scan
-ChangeLog
 DEPENDENCIES
 INSTALL
 Makefile
@@ -44,6 +42,7 @@
 client/drizzletest
 client/mysqlslap
 client/drizzle_password_hash
+config.in
 comp_creator.gcno
 compile
 config.guess

=== added file 'ChangeLog'
--- ChangeLog	1970-01-01 00:00:00 +0000
+++ ChangeLog	2012-02-19 21:04:17 +0000
@@ -0,0 +1,7 @@
+This is a standalone distribution of libdrizzle. The development of libdrizzle 
+takes place in the main drizzle repository lp:drizzle. Please see the ChangeLog
+from a full drizzle distribution, it covers also changes to libdrizzle.
+
+Alternatively you can look at the commit history of the drizzle trunk, from 
+which the drizzle ChangeLog is generated:
+bazaar.launchpad.net/~drizzle-developers/drizzle/development/files/head:/
\ No newline at end of file

=== added file 'config/drizzle.ver'
--- config/drizzle.ver	1970-01-01 00:00:00 +0000
+++ config/drizzle.ver	2012-02-19 21:04:17 +0000
@@ -0,0 +1,1 @@
+DRIZZLE7 { global: *; };

=== modified file 'configure.ac'
--- configure.ac	2012-02-12 10:12:32 +0000
+++ configure.ac	2012-02-19 21:04:17 +0000
@@ -8,7 +8,9 @@
 # Use and distribution licensed under the BSD license.  See
 # the COPYING file in this directory for full text.
 
-AC_INIT([libdrizzle],[1.0.1],[http://launchpad.net/libdrizzle])
+# The full version number (4.0.0) must be updated in 2 places and the major
+# version (4) in one additional place. If you find all 3 you get a price!
+AC_INIT([libdrizzle4],[4.0.0],[http://launchpad.net/libdrizzle])
 
 AC_CONFIG_AUX_DIR(config)
 
@@ -29,7 +31,7 @@
 
 PANDORA_CANONICAL_TARGET(ignore-shared-ptr)
 
-LIBDRIZZLE_LIBRARY_VERSION=3:0:0
+LIBDRIZZLE_LIBRARY_VERSION=4:0:0
 #                          | | |
 #                   +------+ | +---+
 #                   |        |     |
@@ -44,6 +46,14 @@
 #                      changed
 AC_SUBST(LIBDRIZZLE_LIBRARY_VERSION)
 
+# libdrizzle versioning when linked with GNU ld.
+AS_IF([test "$lt_cv_prog_gnu_ld" = "yes"],[
+  LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/config/drizzle.ver"
+  ])
+AC_SUBST(LD_VERSION_SCRIPT)
+
+
+
 LT_PREREQ([2.2])
 LT_INIT()
 LT_LANG([C++])