Merge pull request #1443 from peternewman/0.10-json-patch-header

Cut the 0.10.7 release

.gitignore

@@ -14,6 +14,7 @@
 *.pb.h
 *.pc
 *.pyc
+*.save
 *.swp
 *.tar.gz
 *.trs

NEWS

@@ -1,14 +1,13 @@
-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
 
  Bugs:
  * Fix the build on Windows
@@ -22,6 +21,9 @@ 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
+ * Clean up the libolaserver pkg-config file
 
  Internal:
  * Various minor log formatting tidying up

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])

debian/changelog

@@ -1,3 +1,9 @@
+ola (0.10.7-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Peter Newman <[email protected]>  Fri, 13 Jul 2018 10:56:00 +0100
+
 ola (0.10.6-1) unstable; urgency=low
 
   * New upstream release

debian/control

@@ -2,7 +2,7 @@ Source: ola
 Priority: optional
 Maintainer: Wouter Verhelst <[email protected]>
 Uploaders: RenZO <[email protected]>
-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
@@ -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

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

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}

olad/DiscoveryAgent.cpp

@@ -23,23 +23,25 @@
 #include <config.h>
 #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

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 TimingStats import TimingStats
 from ola import PidStore
 from ola import Version
 from ola.ClientWrapper import ClientWrapper