Merge lp://qastaging/~hingo/libdrizzle/libdrizzle-versioning into lp://qastaging/libdrizzle/1.0
| Status: | Rejected |
|---|---|
| Rejected by: | Andrew Hutchings |
| Proposed branch: | lp://qastaging/~hingo/libdrizzle/libdrizzle-versioning |
| Merge into: | lp://qastaging/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://qastaging/~hingo/libdrizzle/libdrizzle-versioning |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Andrew Hutchings | Disapprove | ||
|
Review via email:
|
|||
Description of the change
This is based on my ramblings in the libdrizzle thread on drizzle-discuss
https:/
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
Unmerged revisions
- 2505. By Henrik Ingo
-
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
-
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
-
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.
1.0 branch now obsolete.