From 7b89f12e66a280746fc8e7906505b2d769d19706 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Thu, 3 May 2018 16:12:04 +0200 Subject: =?UTF-8?q?Bump=20version:=200.4.0.21-60fd-dirty=20=E2=86=92=200.5?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit libosmotrau library version in debian package was wrong, fix it while releasing. Change-Id: I399618c7353a4150e3d571758b522dd2e9d9724f --- TODO-RELEASE | 1 - configure.ac | 6 +++--- debian/changelog | 37 +++++++++++++++++++++++++++++++++++++ debian/control | 8 ++++---- debian/libosmotrau1.install | 1 - debian/libosmotrau2.install | 1 + src/Makefile.am | 2 +- 7 files changed, 46 insertions(+), 10 deletions(-) delete mode 100644 debian/libosmotrau1.install create mode 100644 debian/libosmotrau2.install diff --git a/TODO-RELEASE b/TODO-RELEASE index b02e1eb..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,4 +7,3 @@ # 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 -libosmotrau addition New osmo_rtp_set_source_desc() wrapper around libortp diff --git a/configure.ac b/configure.ac index 05fbb12..0aca550 100644 --- a/configure.ac +++ b/configure.ac @@ -59,9 +59,9 @@ AC_SUBST(SYMBOL_VISIBILITY) dnl Generate the output AM_CONFIG_HEADER(config.h) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.10) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) PKG_CHECK_MODULES(ORTP, ortp >= 0.22.0) AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built)) diff --git a/debian/changelog b/debian/changelog index 13c0996..4c48e6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,40 @@ +libosmo-abis (0.5.0) unstable; urgency=medium + + [ Max ] + * Use value string check from osmo-ci + * cosmetic: update ipaccess_bts_handle_ccm() + * IPA: log remote address + + [ Neels Hofmeyr ] + * cosmetic: ipa.c: use msgb_dequeue(), drop local var + * jenkins: use osmo-clean-workspace.sh before and after build + * vty: skip installing cmds now always installed by default + * add --enable-sanitize config option + * configure: add --enable-werror + * jenkins.sh: use --enable-werror configure flag, not CFLAGS + + [ Alexander Couzens ] + * debian/rules: show testsuite.log when tests are failing + * unixsocket: fix a potential string overflow + + [ Harald Welte ] + * debian/copyright: fix upstream-name + * Add SPDX-License-Identifier to all source files + * Add a new osmo_rtp_set_source_desc() function to set the RTCP SDES items + * debian/control: Fix Vcs-Browser + + [ Pau Espin Pedrol ] + * contrib: jenkins.sh: Disable doxygen in libosmocore build + * e1_input.h: Remove dead declaration of unexistent API ipaccess_setup + * configure.ac: Fix condition check for RTP_SIGNAL_PTR_CAST define + * use osmo_init_logging2 + * git-version-gen: Check first for new tag format + + [ Stefan Sperling ] + * preserve 'when' flags of new osmo_fd in ipaccess_rcvmsg() + + -- Pau Espin Pedrol Thu, 03 May 2018 16:12:04 +0200 + libosmo-abis (0.4.0) unstable; urgency=medium * Move forward towards a new release. diff --git a/debian/control b/debian/control index dd958c8..10295e6 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,7 @@ Homepage: https://projects.osmocom.org/projects/libosmo-abis Package: libosmo-abis Section: oldlibs Architecture: any -Depends: libosmoabis5 (= ${binary:Version}), libosmotrau1 (= ${binary:Version}), ${misc:Depends} +Depends: libosmoabis5 (= ${binary:Version}), libosmotrau2 (= ${binary:Version}), ${misc:Depends} Multi-Arch: same Description: Legacy package for libosmo-abis libosmo-abis is an empty package helping in the transition to one @@ -40,7 +40,7 @@ Description: GSM A-bis handling It also implements drivers for mISDN and DAHDI based E1 cards, as well as some A-bis/IP dialects. -Package: libosmotrau1 +Package: libosmotrau2 Section: libs Architecture: any Multi-Arch: same @@ -58,7 +58,7 @@ Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - libosmotrau1 (= ${binary:Version}), + libosmotrau2 (= ${binary:Version}), libosmoabis5 (= ${binary:Version}) Description: Development headers for A-bis interface The libosmo-abis library contains common/shared code regarding the A-bis @@ -72,7 +72,7 @@ Multi-Arch: same Section: debug Priority: extra Depends: libosmoabis5 (= ${binary:Version}), - libosmotrau1 (= ${binary:Version}), + libosmotrau2 (= ${binary:Version}), ${misc:Depends} Description: Debug symbols for A-bis interface The libosmo-abis library contains common/shared code regarding the A-bis diff --git a/debian/libosmotrau1.install b/debian/libosmotrau1.install deleted file mode 100644 index 5a25619..0000000 --- a/debian/libosmotrau1.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libosmotrau.so.* diff --git a/debian/libosmotrau2.install b/debian/libosmotrau2.install new file mode 100644 index 0000000..5a25619 --- /dev/null +++ b/debian/libosmotrau2.install @@ -0,0 +1 @@ +usr/lib/*/libosmotrau.so.* diff --git a/src/Makefile.am b/src/Makefile.am index 7395d17..ab42d38 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,7 +2,7 @@ # 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 ABIS_LIBVERSION=6:0:0 -TRAU_LIBVERSION=2:0:0 +TRAU_LIBVERSION=3:0:1 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) -- cgit v1.2.3