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

Proposed by Henrik Ingo on 2012-02-13
Status: Rejected
Rejected by: Andrew Hutchings on 2012-12-18
Proposed branch: lp:~hingo/libdrizzle/libdrizzle-versioning
Merge into: lp:libdrizzle/1.0
Diff against target: 83 lines (+21/-4)
4 files modified
.bzrignore (+1/-2)
ChangeLog (+7/-0)
config/drizzle.ver (+1/-0)
configure.ac (+12/-2)
To merge this branch: bzr merge lp:~hingo/libdrizzle/libdrizzle-versioning
Reviewer Review Type Date Requested Status
Andrew Hutchings 2012-02-13 Disapprove on 2012-12-18
Review via email: mp+92814@code.launchpad.net

Description of the change

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

To post a comment you must log in.
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) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2012-02-12 10:27:08 +0000
3+++ .bzrignore 2012-02-19 21:04:17 +0000
4@@ -15,13 +15,11 @@
5 *.rpm
6 *replication.pb.*
7 *stamp-h
8-./ChangeLog
9 .DS_Store
10 .deps
11 .libs
12 .plugin.ini.stamp
13 .plugin.scan
14-ChangeLog
15 DEPENDENCIES
16 INSTALL
17 Makefile
18@@ -44,6 +42,7 @@
19 client/drizzletest
20 client/mysqlslap
21 client/drizzle_password_hash
22+config.in
23 comp_creator.gcno
24 compile
25 config.guess
26
27=== added file 'ChangeLog'
28--- ChangeLog 1970-01-01 00:00:00 +0000
29+++ ChangeLog 2012-02-19 21:04:17 +0000
30@@ -0,0 +1,7 @@
31+This is a standalone distribution of libdrizzle. The development of libdrizzle
32+takes place in the main drizzle repository lp:drizzle. Please see the ChangeLog
33+from a full drizzle distribution, it covers also changes to libdrizzle.
34+
35+Alternatively you can look at the commit history of the drizzle trunk, from
36+which the drizzle ChangeLog is generated:
37+bazaar.launchpad.net/~drizzle-developers/drizzle/development/files/head:/
38\ No newline at end of file
39
40=== added file 'config/drizzle.ver'
41--- config/drizzle.ver 1970-01-01 00:00:00 +0000
42+++ config/drizzle.ver 2012-02-19 21:04:17 +0000
43@@ -0,0 +1,1 @@
44+DRIZZLE7 { global: *; };
45
46=== modified file 'configure.ac'
47--- configure.ac 2012-02-12 10:12:32 +0000
48+++ configure.ac 2012-02-19 21:04:17 +0000
49@@ -8,7 +8,9 @@
50 # Use and distribution licensed under the BSD license. See
51 # the COPYING file in this directory for full text.
52
53-AC_INIT([libdrizzle],[1.0.1],[http://launchpad.net/libdrizzle])
54+# The full version number (4.0.0) must be updated in 2 places and the major
55+# version (4) in one additional place. If you find all 3 you get a price!
56+AC_INIT([libdrizzle4],[4.0.0],[http://launchpad.net/libdrizzle])
57
58 AC_CONFIG_AUX_DIR(config)
59
60@@ -29,7 +31,7 @@
61
62 PANDORA_CANONICAL_TARGET(ignore-shared-ptr)
63
64-LIBDRIZZLE_LIBRARY_VERSION=3:0:0
65+LIBDRIZZLE_LIBRARY_VERSION=4:0:0
66 # | | |
67 # +------+ | +---+
68 # | | |
69@@ -44,6 +46,14 @@
70 # changed
71 AC_SUBST(LIBDRIZZLE_LIBRARY_VERSION)
72
73+# libdrizzle versioning when linked with GNU ld.
74+AS_IF([test "$lt_cv_prog_gnu_ld" = "yes"],[
75+ LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/config/drizzle.ver"
76+ ])
77+AC_SUBST(LD_VERSION_SCRIPT)
78+
79+
80+
81 LT_PREREQ([2.2])
82 LT_INIT()
83 LT_LANG([C++])

Subscribers

People subscribed via source and target branches