Bump version: 1.1.1.14-57ff-dirty → 1.2.01.2.0

Change-Id: I0536137e6221fd322536111dfda6e19d3c57de6c

6 files changed, 40 insertions, 17 deletions

diff --git a/TODO-RELEASE b/TODO-RELEASE
index 8c417cd..d0852fc 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -7,6 +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
-update libosmocore dependency to > 1.5.1 for OSMO_SOCK_F_{DSCP,PRIO}()
-libosmo-abis	new member	ipa_client_conn new struct members dscp, priority
-libosmo-abis	new member	ipa_server_link new struct members dscp, priority
diff --git a/configure.ac b/configure.ac
index 0becff9..d183a05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,10 +66,10 @@ AC_SUBST(SYMBOL_VISIBILITY)
 dnl Generate the output
 AM_CONFIG_HEADER(config.h)
 
-PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0)
-PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0)
-PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0)
-PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.5.0)
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.6.0)
+PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.6.0)
+PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.6.0)
+PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.6.0)
 PKG_CHECK_MODULES(ORTP, ortp >= 0.22.0)
 
 AC_ARG_ENABLE([dahdi],
diff --git a/contrib/libosmo-abis.spec.in b/contrib/libosmo-abis.spec.in
index 629db97..8add588 100644
--- a/contrib/libosmo-abis.spec.in
+++ b/contrib/libosmo-abis.spec.in
@@ -27,11 +27,11 @@ BuildRequires:  automake >= 1.6
 BuildRequires:  libtool >= 2
 BuildRequires:  pkgconfig >= 0.20
 BuildRequires:  xz
-BuildRequires:  pkgconfig(libosmocore) >= 1.5.0
-BuildRequires:  pkgconfig(libosmogsm) >= 1.5.0
-BuildRequires:  pkgconfig(libosmovty) >= 1.5.0
-BuildRequires:  pkgconfig(libosmocodec) >= 1.5.0
-BuildRequires:  pkgconfig(ortp) >= 0.22
+BuildRequires:  pkgconfig(libosmocore) >= 1.6.0
+BuildRequires:  pkgconfig(libosmogsm) >= 1.6.0
+BuildRequires:  pkgconfig(libosmovty) >= 1.6.0
+BuildRequires:  pkgconfig(libosmocodec) >= 1.6.0
+BuildRequires:  pkgconfig(ortp) >= 0.22.0
 BuildRequires:  pkgconfig(talloc)
 
 %description
@@ -59,8 +59,8 @@ Summary:        Development files for the Osmocom GSM A-bis library
 License:        AGPL-3.0-or-later
 Group:          Development/Libraries/C and C++
 Requires:       libosmoabis10 = %version
-Requires:       libosmocore-devel >= 0.3.0
-Requires:       libosmogsm-devel >= 0.3.10
+Requires:       libosmocore-devel >= 1.6.0
+Requires:       libosmogsm-devel >= 1.6.0
 
 %description -n libosmoabis-devel
 This library contains common/shared code regarding the GSM A-bis
diff --git a/debian/changelog b/debian/changelog
index 0d69185..e889ba6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+libosmo-abis (1.2.0) unstable; urgency=medium
+
+  [ Keith ]
+  * Configure E1 pcap file per line
+  * Log TRAU FSM at INFO not NOTICE
+  * Fix up vty 'show' commands for E1 line/timeslots
+
+  [ Harald Welte ]
+  * ipa: Introduce support for user-specific DSCP and priority
+  * e1_input: Allow (vty) configuration of IP DSCP and socket priority
+  * trau: Introduce osmo_rtp_socket_set_priority()
+
+  [ Philipp Maier ]
+  * ipaccess: do not block ipaccess_line_update on failure
+
+  [ Pau Espin Pedrol ]
+  * Use new stat item/ctr getter APIs
+  * osmo_ortp: Fix seqno reset to 0 upon ssrc_changed
+  * e1_input: Fix line not removed from e1inp_line_list when freed
+  * e1_input: Document e1inp_line_create()
+  * ipaccess: Allow reconfiguring the ipa line during line_update()
+  * ipaccess: e1inp_ipa_bts_rsl_connect: Fix memleak recreating ipa_client_conn
+  * e1inp_input: Fix e1inp_line_clone removing original line from global list when freed
+
+ -- Pau Espin Pedrol <pespin@sysmocom.de>  Tue, 16 Nov 2021 14:18:45 +0100
+
 libosmo-abis (1.1.1) unstable; urgency=medium
 
   * attempt to fix RPM spec file after recent soversion bump
diff --git a/debian/control b/debian/control
index 4608ad6..3601b43 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                libdpkg-perl,
                git,
-               libosmocore-dev (>= 1.5.0),
+               libosmocore-dev (>= 1.6.0),
                pkg-config,
                libortp-dev
 Standards-Version: 3.9.7
diff --git a/src/Makefile.am b/src/Makefile.am
index 346e67b..96e38b1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,8 @@
 # This is _NOT_ the library release version, it's an API version.
 # 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=10:0:0
-TRAU_LIBVERSION=6:0:4
+ABIS_LIBVERSION=11:0:1
+TRAU_LIBVERSION=7:0:5
 
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
 AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOE1D_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(COVERAGE_CFLAGS)