From 516c9d6cb7fdc98f8715f88aac6ede620a5a1dee Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 9 Jul 2018 15:31:43 +0100 Subject: [PATCH 01/16] Ignore nano save files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b68a5aa8d9..aa21db4eeb 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ *.pb.h *.pc *.pyc +*.save *.swp *.tar.gz *.trs From 0d0d0ab2b906ad5ffb76677e6547d8e19e2aca94 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Tue, 10 Jul 2018 03:34:25 +0100 Subject: [PATCH 02/16] Release 0.10.7 --- NEWS | 8 +++----- config/ola_version.m4 | 2 +- debian/changelog | 6 ++++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index aca00a0760..a7cfa89b5b 100644 --- a/NEWS +++ b/NEWS @@ -1,12 +1,10 @@ -x/y/2018 ola-0.10.7 +10/07/2018 ola-0.10.7 Features: * Allow multiple KiNet ports to be patched to the same universe #1414 - * Support libftdi1 too in FTDI DMX #1012 Debian #810374 + * Allow multiple FTDI ports to be patched to the same universe + * Support libftdi1 as well as libftdi0 in FTDI DMX #1012 Debian #810374 * Support FTDI DMX via libftdi1 on Windows - API: - * - RDM Tests: * Fix a bug in the RDM tests when a responder supports sensor PIDs #1388 diff --git a/config/ola_version.m4 b/config/ola_version.m4 index 8d71f16c7c..592880fc4a 100644 --- a/config/ola_version.m4 +++ b/config/ola_version.m4 @@ -19,7 +19,7 @@ # ----------------------------------------------------------------------------- m4_define([ola_major_version], [0]) m4_define([ola_minor_version], [10]) -m4_define([ola_revision_version], [6]) +m4_define([ola_revision_version], [7]) m4_define([ola_version], [ola_major_version.ola_minor_version.ola_revision_version]) diff --git a/debian/changelog b/debian/changelog index 38645aca70..d425a0c63f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ola (0.10.7-1) unstable; urgency=low + + * New upstream release + + -- Simon Newton Tue, 10 Jul 2018 02:32:00 +0000 + ola (0.10.6-1) unstable; urgency=low * New upstream release From f0d258dcb3240a475bc2f6f9baf783b7417b40bb Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 11 Jul 2018 10:24:57 +0100 Subject: [PATCH 03/16] Revert "Release 0.10.7" This reverts commit 0d0d0ab2b906ad5ffb76677e6547d8e19e2aca94. --- NEWS | 8 +++++--- config/ola_version.m4 | 2 +- debian/changelog | 6 ------ 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/NEWS b/NEWS index a7cfa89b5b..aca00a0760 100644 --- a/NEWS +++ b/NEWS @@ -1,10 +1,12 @@ -10/07/2018 ola-0.10.7 +x/y/2018 ola-0.10.7 Features: * Allow multiple KiNet ports to be patched to the same universe #1414 - * Allow multiple FTDI ports to be patched to the same universe - * Support libftdi1 as well as libftdi0 in FTDI DMX #1012 Debian #810374 + * Support libftdi1 too in FTDI DMX #1012 Debian #810374 * Support FTDI DMX via libftdi1 on Windows + API: + * + RDM Tests: * Fix a bug in the RDM tests when a responder supports sensor PIDs #1388 diff --git a/config/ola_version.m4 b/config/ola_version.m4 index 592880fc4a..8d71f16c7c 100644 --- a/config/ola_version.m4 +++ b/config/ola_version.m4 @@ -19,7 +19,7 @@ # ----------------------------------------------------------------------------- m4_define([ola_major_version], [0]) m4_define([ola_minor_version], [10]) -m4_define([ola_revision_version], [7]) +m4_define([ola_revision_version], [6]) m4_define([ola_version], [ola_major_version.ola_minor_version.ola_revision_version]) diff --git a/debian/changelog b/debian/changelog index d425a0c63f..38645aca70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,3 @@ -ola (0.10.7-1) unstable; urgency=low - - * New upstream release - - -- Simon Newton Tue, 10 Jul 2018 02:32:00 +0000 - ola (0.10.6-1) unstable; urgency=low * New upstream release From c650d57b16980303b7bd86f146bf18e6cb84d501 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 11 Jul 2018 10:28:21 +0100 Subject: [PATCH 04/16] Return Avahi first, in case the Bonjour version is actually just Avahi's compatibility layer --- NEWS | 2 ++ olad/DiscoveryAgent.cpp | 16 +++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/NEWS b/NEWS index aca00a0760..8dba8bc350 100644 --- a/NEWS +++ b/NEWS @@ -22,6 +22,8 @@ x/y/2018 ola-0.10.7 * Downstream Debian fixes * Fix an incorrect response if we have the sensor PIDs but no sensors * Stop trying to build opendmx kernel plugin on Windows + * Prefer Avahi over Bonjour for our DiscoveryAgent, in case the Bonjour + version is actually just Avahi's compatibility layer Internal: * Various minor log formatting tidying up diff --git a/olad/DiscoveryAgent.cpp b/olad/DiscoveryAgent.cpp index 22db1e4f3e..b3c2a41e3b 100644 --- a/olad/DiscoveryAgent.cpp +++ b/olad/DiscoveryAgent.cpp @@ -23,23 +23,25 @@ #include #endif // HAVE_CONFIG_H -#ifdef HAVE_DNSSD -#include "olad/BonjourDiscoveryAgent.h" -#endif // HAVE_DNSSD - #ifdef HAVE_AVAHI #include "olad/AvahiDiscoveryAgent.h" #endif // HAVE_AVAHI +#ifdef HAVE_DNSSD +#include "olad/BonjourDiscoveryAgent.h" +#endif // HAVE_DNSSD + namespace ola { DiscoveryAgentInterface* DiscoveryAgentFactory::New() { -#ifdef HAVE_DNSSD - return new BonjourDiscoveryAgent(); -#endif // HAVE_DNSSD + // Return Avahi first, in case the Bonjour version is actually just Avahi's + // compatibility layer #ifdef HAVE_AVAHI return new AvahiDiscoveryAgent(); #endif // HAVE_AVAHI +#ifdef HAVE_DNSSD + return new BonjourDiscoveryAgent(); +#endif // HAVE_DNSSD return NULL; } } // namespace ola From 50267d86d1ce783a54511b7b1f8f07cd9205838f Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 11 Jul 2018 10:32:20 +0100 Subject: [PATCH 05/16] Add libavahi-client-dev to the Debian build depends so we get the Avahi functionality on Debian --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index e2ab493ef0..d5102199ef 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: ola Priority: optional Maintainer: Wouter Verhelst Uploaders: RenZO -Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, bash-completion, libcppunit-dev, bison, flex, pkg-config, uuid-dev, python, python-protobuf, libprotobuf-dev, protobuf-compiler, libprotoc-dev, libusb-1.0-0-dev, libftdi-dev, liblo-dev, libmicrohttpd-dev, libncurses5-dev, python-numpy +Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, bash-completion, libcppunit-dev, bison, flex, pkg-config, uuid-dev, python, python-protobuf, libprotobuf-dev, protobuf-compiler, libprotoc-dev, libusb-1.0-0-dev, libftdi-dev, liblo-dev, libmicrohttpd-dev, libncurses5-dev, libavahi-client-dev, python-numpy Standards-Version: 3.9.8 Section: libs Vcs-Git: https://github.com/OpenLightingProject/ola.git From d2a73869623844cb33b5ecfcb71ec4a881e43250 Mon Sep 17 00:00:00 2001 From: Simon Newton Date: Sun, 28 Feb 2016 14:23:04 -0800 Subject: [PATCH 06/16] Fix a Python include. (cherry picked from commit fc40e17aaa669c86dadb09426b2503f87d0b4e4c) --- tools/rdm/rdm_responder_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/rdm/rdm_responder_test.py b/tools/rdm/rdm_responder_test.py index cffe8b860e..712764e017 100755 --- a/tools/rdm/rdm_responder_test.py +++ b/tools/rdm/rdm_responder_test.py @@ -25,7 +25,7 @@ import sys import textwrap import time -from TimingStats import TimingStats +from ola.testing.rdm.TimingStats import TimingStats from ola import PidStore from ola import Version from ola.ClientWrapper import ClientWrapper From d3c9e1137f46fdbf197119092c73722bb2365be7 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 11 Jul 2018 10:45:40 +0100 Subject: [PATCH 07/16] Tidy the import order --- tools/rdm/rdm_responder_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/rdm/rdm_responder_test.py b/tools/rdm/rdm_responder_test.py index 712764e017..37d165d952 100755 --- a/tools/rdm/rdm_responder_test.py +++ b/tools/rdm/rdm_responder_test.py @@ -19,13 +19,13 @@ from ola.testing.rdm import TestDefinitions, TestRunner from ola.testing.rdm.DMXSender import DMXSender from ola.testing.rdm.TestState import TestState +from ola.testing.rdm.TimingStats import TimingStats import datetime import logging import re import sys import textwrap import time -from ola.testing.rdm.TimingStats import TimingStats from ola import PidStore from ola import Version from ola.ClientWrapper import ClientWrapper From e5cfd36d06df35cdafe8f8d20855d14297917154 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 11 Jul 2018 10:46:54 +0100 Subject: [PATCH 08/16] More Debian CI tests --- debian/tests/control | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/tests/control b/debian/tests/control index 6c38d82589..a3224483f5 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,5 +1,8 @@ Test-Command: olad --help Depends: ola +Test-Command: rdm_responder_test.py --help +Depends: ola, ola-rdm-tests + Test-Command: set -e ; for py in $(pyversions -s 2>/dev/null) ; do cd "$ADTTMP" ; echo "Testing with $py:" ; $py -c "from ola.ClientWrapper import ClientWrapper; print(ClientWrapper)" ; done Depends: python-all, ola, ola-python From e831e28d2b5dd752360ad943cde12c2cdaa9e9d8 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 11 Jul 2018 10:55:37 +0100 Subject: [PATCH 09/16] More NEWS updates --- NEWS | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS b/NEWS index 8dba8bc350..97957d372d 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,7 @@ x/y/2018 ola-0.10.7 RDM Tests: * Fix a bug in the RDM tests when a responder supports sensor PIDs #1388 + * Fix a bug in imports for rdm_responder_test.py Bugs: * Fix the build on Windows From 94510798d65dede150ab719b67b00b22190923c9 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 11 Jul 2018 11:01:16 +0100 Subject: [PATCH 10/16] Fix the Debian Depends for libola-dev, closes Debian #902143 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index d5102199ef..618808a441 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Package: libola-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: ola (= ${binary:Version}), ${misc:Depends} +Depends: ola (= ${binary:Version}), libprotobuf-dev, ${misc:Depends} Description: Open Lighting Architecture - development libraries The DMX512 standard for Digital MultipleX is used for digital communication networks commonly used to control stage lighting and From 4efd316fb244365ed2addb61dccd9a412d4447bf Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 11 Jul 2018 11:07:51 +0100 Subject: [PATCH 11/16] Revert "Revert "Release 0.10.7"" This reverts commit f0d258dcb3240a475bc2f6f9baf783b7417b40bb. --- NEWS | 8 +++----- config/ola_version.m4 | 2 +- debian/changelog | 6 ++++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index 97957d372d..1cf329ae9d 100644 --- a/NEWS +++ b/NEWS @@ -1,12 +1,10 @@ -x/y/2018 ola-0.10.7 +10/07/2018 ola-0.10.7 Features: * Allow multiple KiNet ports to be patched to the same universe #1414 - * Support libftdi1 too in FTDI DMX #1012 Debian #810374 + * Allow multiple FTDI ports to be patched to the same universe + * Support libftdi1 as well as libftdi0 in FTDI DMX #1012 Debian #810374 * Support FTDI DMX via libftdi1 on Windows - API: - * - RDM Tests: * Fix a bug in the RDM tests when a responder supports sensor PIDs #1388 * Fix a bug in imports for rdm_responder_test.py diff --git a/config/ola_version.m4 b/config/ola_version.m4 index 8d71f16c7c..592880fc4a 100644 --- a/config/ola_version.m4 +++ b/config/ola_version.m4 @@ -19,7 +19,7 @@ # ----------------------------------------------------------------------------- m4_define([ola_major_version], [0]) m4_define([ola_minor_version], [10]) -m4_define([ola_revision_version], [6]) +m4_define([ola_revision_version], [7]) m4_define([ola_version], [ola_major_version.ola_minor_version.ola_revision_version]) diff --git a/debian/changelog b/debian/changelog index 38645aca70..d425a0c63f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ola (0.10.7-1) unstable; urgency=low + + * New upstream release + + -- Simon Newton Tue, 10 Jul 2018 02:32:00 +0000 + ola (0.10.6-1) unstable; urgency=low * New upstream release From d9f28f280ccfa70c3df40b7a3d102a23276745da Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Thu, 12 Jul 2018 11:22:31 +0100 Subject: [PATCH 12/16] Revert "Revert "Revert "Release 0.10.7""" This reverts commit 4efd316fb244365ed2addb61dccd9a412d4447bf. --- NEWS | 8 +++++--- config/ola_version.m4 | 2 +- debian/changelog | 6 ------ 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/NEWS b/NEWS index 1cf329ae9d..97957d372d 100644 --- a/NEWS +++ b/NEWS @@ -1,10 +1,12 @@ -10/07/2018 ola-0.10.7 +x/y/2018 ola-0.10.7 Features: * Allow multiple KiNet ports to be patched to the same universe #1414 - * Allow multiple FTDI ports to be patched to the same universe - * Support libftdi1 as well as libftdi0 in FTDI DMX #1012 Debian #810374 + * Support libftdi1 too in FTDI DMX #1012 Debian #810374 * Support FTDI DMX via libftdi1 on Windows + API: + * + RDM Tests: * Fix a bug in the RDM tests when a responder supports sensor PIDs #1388 * Fix a bug in imports for rdm_responder_test.py diff --git a/config/ola_version.m4 b/config/ola_version.m4 index 592880fc4a..8d71f16c7c 100644 --- a/config/ola_version.m4 +++ b/config/ola_version.m4 @@ -19,7 +19,7 @@ # ----------------------------------------------------------------------------- m4_define([ola_major_version], [0]) m4_define([ola_minor_version], [10]) -m4_define([ola_revision_version], [7]) +m4_define([ola_revision_version], [6]) m4_define([ola_version], [ola_major_version.ola_minor_version.ola_revision_version]) diff --git a/debian/changelog b/debian/changelog index d425a0c63f..38645aca70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,3 @@ -ola (0.10.7-1) unstable; urgency=low - - * New upstream release - - -- Simon Newton Tue, 10 Jul 2018 02:32:00 +0000 - ola (0.10.6-1) unstable; urgency=low * New upstream release From abd4aeeb2ea4543e3d32ac2b905b0e3d5cadaed7 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Thu, 12 Jul 2018 11:24:48 +0100 Subject: [PATCH 13/16] Clean up another pkg-config file --- libolaserver.pc.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libolaserver.pc.in b/libolaserver.pc.in index 07515fe34d..16e0a14161 100644 --- a/libolaserver.pc.in +++ b/libolaserver.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: libolaserver Version: @VERSION@ Description: Open Lighting Architecture Server -Requires: -Libs: -L${libdir} -L${libdir}/olad -lola -lolacommon -lolaserver -lprotobuf @OLA_SERVER_LIBS@ +Requires: protobuf +Libs: -L${libdir} -L${libdir}/olad -lola -lolacommon -lolaserver @OLA_SERVER_LIBS@ Cflags: -I${includedir} From 1e3f6820b9a141a542d66e6a15553e3c29c50070 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Thu, 12 Jul 2018 11:25:00 +0100 Subject: [PATCH 14/16] Revert "Revert "Revert "Revert "Release 0.10.7"""" This reverts commit d9f28f280ccfa70c3df40b7a3d102a23276745da. --- NEWS | 8 +++----- config/ola_version.m4 | 2 +- debian/changelog | 6 ++++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index 97957d372d..1cf329ae9d 100644 --- a/NEWS +++ b/NEWS @@ -1,12 +1,10 @@ -x/y/2018 ola-0.10.7 +10/07/2018 ola-0.10.7 Features: * Allow multiple KiNet ports to be patched to the same universe #1414 - * Support libftdi1 too in FTDI DMX #1012 Debian #810374 + * Allow multiple FTDI ports to be patched to the same universe + * Support libftdi1 as well as libftdi0 in FTDI DMX #1012 Debian #810374 * Support FTDI DMX via libftdi1 on Windows - API: - * - RDM Tests: * Fix a bug in the RDM tests when a responder supports sensor PIDs #1388 * Fix a bug in imports for rdm_responder_test.py diff --git a/config/ola_version.m4 b/config/ola_version.m4 index 8d71f16c7c..592880fc4a 100644 --- a/config/ola_version.m4 +++ b/config/ola_version.m4 @@ -19,7 +19,7 @@ # ----------------------------------------------------------------------------- m4_define([ola_major_version], [0]) m4_define([ola_minor_version], [10]) -m4_define([ola_revision_version], [6]) +m4_define([ola_revision_version], [7]) m4_define([ola_version], [ola_major_version.ola_minor_version.ola_revision_version]) diff --git a/debian/changelog b/debian/changelog index 38645aca70..d425a0c63f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ola (0.10.7-1) unstable; urgency=low + + * New upstream release + + -- Simon Newton Tue, 10 Jul 2018 02:32:00 +0000 + ola (0.10.6-1) unstable; urgency=low * New upstream release From c305d6d7ef9a06be39f5fc861f86be77e29fc1e5 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Fri, 13 Jul 2018 10:53:10 +0100 Subject: [PATCH 15/16] Revert "Revert "Revert "Revert "Revert "Release 0.10.7""""" This reverts commit 1e3f6820b9a141a542d66e6a15553e3c29c50070. --- NEWS | 8 +++++--- config/ola_version.m4 | 2 +- debian/changelog | 6 ------ 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/NEWS b/NEWS index 1cf329ae9d..97957d372d 100644 --- a/NEWS +++ b/NEWS @@ -1,10 +1,12 @@ -10/07/2018 ola-0.10.7 +x/y/2018 ola-0.10.7 Features: * Allow multiple KiNet ports to be patched to the same universe #1414 - * Allow multiple FTDI ports to be patched to the same universe - * Support libftdi1 as well as libftdi0 in FTDI DMX #1012 Debian #810374 + * Support libftdi1 too in FTDI DMX #1012 Debian #810374 * Support FTDI DMX via libftdi1 on Windows + API: + * + RDM Tests: * Fix a bug in the RDM tests when a responder supports sensor PIDs #1388 * Fix a bug in imports for rdm_responder_test.py diff --git a/config/ola_version.m4 b/config/ola_version.m4 index 592880fc4a..8d71f16c7c 100644 --- a/config/ola_version.m4 +++ b/config/ola_version.m4 @@ -19,7 +19,7 @@ # ----------------------------------------------------------------------------- m4_define([ola_major_version], [0]) m4_define([ola_minor_version], [10]) -m4_define([ola_revision_version], [7]) +m4_define([ola_revision_version], [6]) m4_define([ola_version], [ola_major_version.ola_minor_version.ola_revision_version]) diff --git a/debian/changelog b/debian/changelog index d425a0c63f..38645aca70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,3 @@ -ola (0.10.7-1) unstable; urgency=low - - * New upstream release - - -- Simon Newton Tue, 10 Jul 2018 02:32:00 +0000 - ola (0.10.6-1) unstable; urgency=low * New upstream release From b8029dc70be1137fca9f3be6b67ee5ca7a79508d Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Fri, 13 Jul 2018 10:59:05 +0100 Subject: [PATCH 16/16] Really release 0.10.7 --- NEWS | 9 ++++----- config/ola_version.m4 | 2 +- debian/changelog | 6 ++++++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index 97957d372d..b479b7b685 100644 --- a/NEWS +++ b/NEWS @@ -1,12 +1,10 @@ -x/y/2018 ola-0.10.7 +13/7/2018 ola-0.10.7 Features: * Allow multiple KiNet ports to be patched to the same universe #1414 - * Support libftdi1 too in FTDI DMX #1012 Debian #810374 + * Allow multiple FTDI ports to be patched to the same universe + * Support libftdi1 as well as libftdi0 in FTDI DMX #1012 Debian #810374 * Support FTDI DMX via libftdi1 on Windows - API: - * - RDM Tests: * Fix a bug in the RDM tests when a responder supports sensor PIDs #1388 * Fix a bug in imports for rdm_responder_test.py @@ -25,6 +23,7 @@ x/y/2018 ola-0.10.7 * Stop trying to build opendmx kernel plugin on Windows * Prefer Avahi over Bonjour for our DiscoveryAgent, in case the Bonjour version is actually just Avahi's compatibility layer + * Clean up the libolaserver pkg-config file Internal: * Various minor log formatting tidying up diff --git a/config/ola_version.m4 b/config/ola_version.m4 index 8d71f16c7c..592880fc4a 100644 --- a/config/ola_version.m4 +++ b/config/ola_version.m4 @@ -19,7 +19,7 @@ # ----------------------------------------------------------------------------- m4_define([ola_major_version], [0]) m4_define([ola_minor_version], [10]) -m4_define([ola_revision_version], [6]) +m4_define([ola_revision_version], [7]) m4_define([ola_version], [ola_major_version.ola_minor_version.ola_revision_version]) diff --git a/debian/changelog b/debian/changelog index 38645aca70..fbaab91ea2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ola (0.10.7-1) unstable; urgency=low + + * New upstream release + + -- Peter Newman Fri, 13 Jul 2018 10:56:00 +0100 + ola (0.10.6-1) unstable; urgency=low * New upstream release