diff --git a/configure.ac b/configure.ac index 4556f36..95b47be 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.67]) -AC_INIT([amplet2], [0.11.0], [amp@wand.net.nz]) +AC_INIT([amplet2], [0.11.1], [amp@wand.net.nz]) #AC_CONFIG_SRCDIR([src/measured/measured.c]) AM_INIT_AUTOMAKE([subdir-objects]) AC_CONFIG_HEADERS([config.h]) @@ -50,7 +50,8 @@ AM_CONDITIONAL([MINGW], [test x$mingw = xtrue]) # amplet2-0.10.5: 4:2:0 (ABI version 4) # amplet2-0.10.6: 5:0:0 (ABI version 5) # amplet2-0.11.0: 6:0:0 (ABI version 6) -LIBAMP_LIBTOOL_VERSION=6:0:0 +# amplet2-0.11.1: 6:1:0 (ABI version 6) +LIBAMP_LIBTOOL_VERSION=6:1:0 AC_SUBST(LIBAMP_LIBTOOL_VERSION) # Checks for programs. diff --git a/debian/changelog b/debian/changelog index a8837c3..83b85ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +amplet2 (0.11.1-1) unstable; urgency=low + + * amplet2: Fix checking getifaddrs() to correctly recognise success. + * server: Build python2 and python3 versions of ampsave packages. + * sip: Only build sip packages if dependency libpjproject-dev is available. + + -- Brendon Jones Thu, 26 Nov 2020 14:10:37 +1300 + amplet2 (0.11.0-1) unstable; urgency=low * all tests: keep destinations that don't resolve (#4). diff --git a/rpm/amplet2.spec b/rpm/amplet2.spec index e0c895b..33f954c 100644 --- a/rpm/amplet2.spec +++ b/rpm/amplet2.spec @@ -1,5 +1,5 @@ Name: amplet2 -Version: 0.11.0 +Version: 0.11.1 Release: 1%{?dist} Summary: AMP Network Performance Measurement Suite @@ -174,6 +174,10 @@ fi %changelog +* Thu Nov 26 2020 Brendon Jones 0.11.1-1 +- amplet2: Fix checking getifaddrs() to correctly recognise success. +- package: Remove ampsave python code from client RPM packages. + * Thu Nov 19 2020 Brendon Jones 0.11.0-1 - all tests: keep destinations that don't resolve (#4). - amplet2: add trailing ':' when setting interface using ub_ctx_set_option. diff --git a/src/tests/python/setup.py b/src/tests/python/setup.py index f9a508a..7ed8ae2 100644 --- a/src/tests/python/setup.py +++ b/src/tests/python/setup.py @@ -4,7 +4,7 @@ from distutils.core import setup setup(name="ampsave", - version="0.11.0", + version="0.11.1", description="AMP server data storage package", author="Brendon Jones", author_email='contact@wand.net.nz', diff --git a/w32/amplet2-client.wxs b/w32/amplet2-client.wxs index a94049d..2ef7506 100644 --- a/w32/amplet2-client.wxs +++ b/w32/amplet2-client.wxs @@ -2,7 +2,7 @@ - +