summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2017-08-23 10:59:24 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2017-08-23 10:59:24 +0200
commit0ca115acae8a5b8b0c51a3b19a1f9381b7347bf4 (patch)
tree006a271e8c0fcfe113837794cf5d0d41fdca9afc
parentee7aae13524f67a4cc6e7f7404cbcae4693dbc25 (diff)
downloaddabmux-0ca115acae8a5b8b0c51a3b19a1f9381b7347bf4.tar.gz
dabmux-0ca115acae8a5b8b0c51a3b19a1f9381b7347bf4.tar.bz2
dabmux-0ca115acae8a5b8b0c51a3b19a1f9381b7347bf4.zip
Prepare release v1.3.1v1.3.1
-rw-r--r--ChangeLog8
-rw-r--r--README.md13
-rw-r--r--configure.ac11
3 files changed, 24 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ac4595..fae1d56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
This file contains information about the changes done to
ODR-DabMux in this repository
+2017-08-23: Matthias P. Braendli <matthias@mpb.li>
+ (v1.3.1):
+ Add retords.pl script for Xymon monitoring tool.
+ Add odr-zmq2edi tool, and add necessary metadata to
+ the ZMQ output of ODR-DabMux. The configuration file
+ was extended in a backward-compatible way. Handling
+ of the TAI clock subsystem has been adapted too.
+
2017-06-30: Matthias P. Braendli <matthias@mpb.li>
(v1.3.0):
Add support for FIG0/24 to announce that a service is present
diff --git a/README.md b/README.md
index 61a9a2b..f7c81db 100644
--- a/README.md
+++ b/README.md
@@ -27,11 +27,15 @@ Features of ODR-DabMux:
- Something that will one day become a nice GUI for configuration,
see gui/README.md
-The src/ directory contains the source code of ODR-DabMux.
+Additional tools: odr-zmq2edi, a tool that can convert a ZeroMQ ETI stream
+to an EDI stream. odr-zmq2farsync, a tool that can drive a FarSync card from
+a ZeroMQ ETI stream.
+
+The src/ directory contains the source code of ODR-DabMux and the additional
+tools.
The doc/ directory contains the ODR-DabMux documentation, a few example
-configuration file, and the example munin script for the statistics
-server.
+configuration files, and the munin and xymon scripts for the statistics server.
The lib/ directory contains source code of libraries needed to build
ODR-DabMux.
@@ -50,7 +54,8 @@ Contributions and Contact
=========================
Contributions to this tool are welcome, you can reach users and developers
-through the CRC-mmbTools google group.
+through the
+[CRC-mmbTools google group](https://groups.google.com/forum/#!forum/crc-mmbtools).
There is a list of ideas and thoughts about new possible features and improvements
in the TODO file.
diff --git a/configure.ac b/configure.ac
index 5e63c55..8bc723a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,23 +1,26 @@
# Copyright (C) 2008, 2009 Her Majesty the Queen in Right of Canada
# (Communications Research Center Canada)
+#
+# Copyright (C) 2017
+# Matthias P. Braendli, matthias.braendli@mpb.li
# This file is part of ODR-DabMux.
-#
+#
# ODR-DabMux is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
-#
+#
# ODR-DabMux is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.61)
-AC_INIT([ODR-DabMux], [1.3.0], [matthias.braendli@mpb.li])
+AC_INIT([ODR-DabMux], [1.3.1], [matthias.braendli@mpb.li])
AC_CONFIG_AUX_DIR([build-aux])
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE([-Wall subdir-objects foreign])