Drizzle

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

  1. fix-libdrizzle-version
  2. Merge into development
Proposed by Brian Aker
Status: Merged
Approved by: Brian Aker
Approved revision: 2513
Merged at revision: 2514
Proposed branch: lp:~brianaker/drizzle/fix-libdrizzle-version
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 49 lines (+3/-18)
2 files modified
configure.ac (+2/-17)
libdrizzle-1.0/include.am (+1/-1)
To merge this branch: bzr merge lp:~brianaker/drizzle/fix-libdrizzle-version
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+93655@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Henrik Ingo (hingo) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
2626
27PANDORA_CANONICAL_TARGET(less-warnings, require-cxx, force-gcc42, version-from-vc) 27PANDORA_CANONICAL_TARGET(less-warnings, require-cxx, force-gcc42, version-from-vc)
2828
29LIBDRIZZLE_LIBRARY_VERSION=3:0:029LIBDRIZZLE_LIBRARY_VERSION=4:0:0
30# | | |
31# +------+ | +---+
32# | | |
33# current:revision:age
34# | | |
35# | | +- increment if interfaces have been added
36# | | set to zero if interfaces have been
37# | | removed or changed
38# | +- increment if source code has changed
39# | set to zero if current is incremented
40# +- increment if interfaces have been added, removed or
41# changed
42AC_SUBST(LIBDRIZZLE_LIBRARY_VERSION)
43
44OLDLIBDRIZZLE_LIBRARY_VERSION=2:0:1
45# | | |30# | | |
46# +------+ | +---+31# +------+ | +---+
47# | | |32# | | |
@@ -54,7 +39,7 @@
54# | set to zero if current is incremented39# | set to zero if current is incremented
55# +- increment if interfaces have been added, removed or40# +- increment if interfaces have been added, removed or
56# changed41# changed
57AC_SUBST(OLDLIBDRIZZLE_LIBRARY_VERSION)42AC_SUBST(LIBDRIZZLE_LIBRARY_VERSION)
5843
59# libdrizzle versioning when linked with GNU ld.44# libdrizzle versioning when linked with GNU ld.
60AS_IF([test "$lt_cv_prog_gnu_ld" = "yes"],[45AS_IF([test "$lt_cv_prog_gnu_ld" = "yes"],[
6146
=== 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 @@
46 $(AM_LDFLAGS) \46 $(AM_LDFLAGS) \
47 $(GCOV_LIBS) \47 $(GCOV_LIBS) \
48 -version-info \48 -version-info \
49 $(OLDLIBDRIZZLE_LIBRARY_VERSION)49 $(LIBDRIZZLE_LIBRARY_VERSION)
5050
51libdrizzle_1_0_libdrizzle_la_SOURCES= \51libdrizzle_1_0_libdrizzle_la_SOURCES= \
52 libdrizzle/column.cc \52 libdrizzle/column.cc \