From 4e72ee0d0f678ec91dee5ad33e8796b56e8c078d Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 13 Dec 2016 18:41:17 +0100 Subject: Catch-up with git version tags * update debian/changelog * update TODO-RELEASE * add comments to Makefile.am and TODO-RELEASE to simplify the process in future * add link to libtool docs to Makefile.am to simplify LIBVERSION maintenance Related: OS#1861 Change-Id: I22c257e357f597519120232d742d6a61289db021 --- TODO-RELEASE | 14 ++++++++------ debian/changelog | 26 ++++++++++++++++++++++++++ debian/control | 6 +++--- debian/libosmocore7.install | 1 - debian/libosmocore8.install | 1 + debian/libosmogsm5.install | 1 - debian/libosmogsm7.install | 1 + src/Makefile.am | 5 +++-- src/codec/Makefile.am | 3 ++- src/ctrl/Makefile.am | 3 ++- src/gsm/Makefile.am | 5 +++-- src/sim/Makefile.am | 3 ++- src/vty/Makefile.am | 3 ++- 13 files changed, 53 insertions(+), 19 deletions(-) delete mode 100644 debian/libosmocore7.install create mode 100644 debian/libosmocore8.install delete mode 100644 debian/libosmogsm5.install create mode 100644 debian/libosmogsm7.install diff --git a/TODO-RELEASE b/TODO-RELEASE index 17f6521d..fb0bfeab 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1,7 +1,9 @@ +# When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install +# according to https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info +# In short: +# LIBVERSION=c:r:a +# If the library source code has changed at all since the last update, then increment revision: c:r + 1:a. +# If any interfaces have been added, removed, or changed since the last update: c + 1:0:0. +# If any interfaces have been added since the last public release: c:r:a + 1. +# If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmogsm internal API update Internal API for GPRS cipher implementors updated to accommodate for arbitrary key lengths -libosmocore change major external talloc dependency / internal talloc removal -libosmocore change major size of ph_data_param struct changed / Extend L1SAP PH-DATA with presence information -libosmocore change major size of ph_data_param struct changed / Extend L1SAP PH-DATA with measurement information -libosmocore change major size of ph_tch_param struct changed / Extend with RTP Marker -libosmocore change major size of struct log_target changed / Extend with GSMTAP diff --git a/debian/changelog b/debian/changelog index 0877d272..a5ca3d60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,29 @@ +libosmocore (0.9.6) unstable; urgency=medium + + * doc: osmocom-authn-protocol.txt: fix numbering, mark unused sync msgs + * New upstream release of libosmocore. + + -- Max Tue, 13 Dec 2016 18:23:56 +0100 + +libosmocore (0.9.5) unstable; urgency=medium + + * fix: DLGSUP logging category "unusable" + * New upstream release of libosmocore. + * ph_data_param struct changed / Extend L1SAP PH-DATA with measurement information + * size of ph_tch_param struct changed / Extend with RTP Marker + * size of struct log_target changed / Extend with GSMTAP + + -- Max Tue, 13 Dec 2016 18:22:56 +0100 + +libosmocore (0.9.4) unstable; urgency=medium + + * New upstream release of libosmocore. + * Internal API for GPRS cipher implementors updated to accommodate for arbitrary key lengths + * external talloc dependency / internal talloc removal + * size of ph_data_param struct changed / Extend L1SAP PH-DATA with presence information + + -- Max Tue, 13 Dec 2016 18:21:56 +0100 + libosmocore (0.9.3) unstable; urgency=medium * Send all stats values after re-configuration. diff --git a/debian/control b/debian/control index 468bd079..c91ce773 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Vcs-Browser: http://git.osmocom.org/gitweb?p=libosmocore.git;a=summary Package: libosmocore Section: libs Architecture: any -Depends: libosmocodec0, libosmocore7, libosmogb4, libosmogsm5, libosmovty3, libosmoctrl0, ${misc:Depends} +Depends: libosmocodec0, libosmocore8, libosmogb4, libosmogsm7, libosmovty3, libosmoctrl0, ${misc:Depends} Multi-Arch: foreign Description: Open Source MObile COMmunications CORE library @@ -22,7 +22,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Multi-Arch: same Description: Osmo codec library -Package: libosmocore7 +Package: libosmocore8 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -36,7 +36,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Multi-Arch: same Description: Osmo GPRS GB library -Package: libosmogsm5 +Package: libosmogsm7 Section: libs Architecture: any Build-Depends: python (>= 2.7.6) diff --git a/debian/libosmocore7.install b/debian/libosmocore7.install deleted file mode 100644 index b73331b9..00000000 --- a/debian/libosmocore7.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libosmocore*.so.* diff --git a/debian/libosmocore8.install b/debian/libosmocore8.install new file mode 100644 index 00000000..b73331b9 --- /dev/null +++ b/debian/libosmocore8.install @@ -0,0 +1 @@ +usr/lib/*/libosmocore*.so.* diff --git a/debian/libosmogsm5.install b/debian/libosmogsm5.install deleted file mode 100644 index 5e617298..00000000 --- a/debian/libosmogsm5.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libosmogsm*.so.* diff --git a/debian/libosmogsm7.install b/debian/libosmogsm7.install new file mode 100644 index 00000000..5e617298 --- /dev/null +++ b/debian/libosmogsm7.install @@ -0,0 +1 @@ +usr/lib/*/libosmogsm*.so.* diff --git a/src/Makefile.am b/src/Makefile.am index 6a9c6758..0cf2665c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,7 @@ # This is _NOT_ the library release version, it's an API version. -# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -LIBVERSION=7:0:0 +# Please read chapter "Library interface versions" of the libtool documentation +# before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html +LIBVERSION=8:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) diff --git a/src/codec/Makefile.am b/src/codec/Makefile.am index 5c69c285..f61d2fe8 100644 --- a/src/codec/Makefile.am +++ b/src/codec/Makefile.am @@ -1,5 +1,6 @@ # This is _NOT_ the library release version, it's an API version. -# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification +# Please read chapter "Library interface versions" of the libtool documentation +# before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=0:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include $(TALLOC_CFLAGS) diff --git a/src/ctrl/Makefile.am b/src/ctrl/Makefile.am index b4a3da43..8bf34429 100644 --- a/src/ctrl/Makefile.am +++ b/src/ctrl/Makefile.am @@ -1,5 +1,6 @@ # This is _NOT_ the library release version, it's an API version. -# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification +# Please read chapter "Library interface versions" of the libtool documentation +# before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=0:0:0 AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS) diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index 4ea55e1d..4ec441fd 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -1,6 +1,7 @@ # This is _NOT_ the library release version, it's an API version. -# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -LIBVERSION=6:0:1 +# Please read chapter "Library interface versions" of the libtool documentation +# before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html +LIBVERSION=7:0:1 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS) AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} diff --git a/src/sim/Makefile.am b/src/sim/Makefile.am index bcdaf210..4d21f2ad 100644 --- a/src/sim/Makefile.am +++ b/src/sim/Makefile.am @@ -1,5 +1,6 @@ # This is _NOT_ the library release version, it's an API version. -# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification +# Please read chapter "Library interface versions" of the libtool documentation +# before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=0:0:0 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index 620a8cb9..52cdc8e8 100644 --- a/src/vty/Makefile.am +++ b/src/vty/Makefile.am @@ -1,5 +1,6 @@ # This is _NOT_ the library release version, it's an API version. -# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification +# Please read chapter "Library interface versions" of the libtool documentation +# before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=3:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -- cgit v1.2.3