Prepare release v1.2.0v1.2.0

6 files changed, 31 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index d23ba2f..e597ed5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,22 @@
 This file contains information about the changes done to
 ODR-DabMux in this repository
 
+2017-01-24: Matthias P. Braendli <matthias@mpb.li>
+	(v1.2.0):
+		Remove the libfec dependency.
+		Adapt several FIGs to EN 300 401 V2.1.1.
+		Add FIG0/6 for service linking information.
+		Big overhaul of all inputs.
+		TCP output improvements, stability and handling of multiple
+		connections.
+		Fix ZeroMQ input encryption for MPEG inputs.
+		Rework PRBS source and describe it better.
+		Remove unused bridge, SLIP, Test and nonfunctional
+		DMB input.
+		Add fragment interleaver for the EDI output.
+		Fix important issue when both EDI and TIST are enabled.
+		Enable syslog logger earlier.
+
 2016-09-02: Matthias P. Braendli <matthias@mpb.li>
 	(v1.1.0):
 		Switch FIG0/10 to long form, the latest draft spec marks the
diff --git a/INSTALL.md b/INSTALL.md
index 4abc06f..5e01634 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -2,9 +2,7 @@ Required dependencies:
 ======================
 
 * Boost 1.48 or later
-* ZeroMQ 4 from [http://www.zeromq.org](http://www.zeromq.org).
-  Please prefer the zeromq from your distribution, but mind that some distributions
-  ship ZeroMQ 2, which is not enough.
+* ZeroMQ 4 or later
 * (optional) cURL to download the TAI-UTC bulletin, needed for the EDI output.
 
 Simple install procedure using tarball release:
@@ -13,7 +11,7 @@ Simple install procedure using tarball release:
 Install odr-dabmux
 ------------------
 
-    % tar xjf odr-dabmux-x.y.z.tar.bz2      # Unpack the source
+    % tar xjf odr-dabmux-x.y.z.tar.gz       # Unpack the source
     % cd odr-dabmux-x.y.z                   # Change to the source directory
     % ./configure
                                             # Run the configure script
@@ -35,6 +33,9 @@ that did not yet make its way into a release, you can clone the
 * Bootstrap autotools: <pre>% ./bootstrap.sh</pre>
 * Then use ./configure as above
 
+It is advised to run the bootstrap and configure steps again every
+time you pull updates from the repository.
+
 Develop on OSX and FreeBSD
 ==========================
 
@@ -51,8 +52,7 @@ before calling ./configure
     CFLAGS="-I/usr/local/include"
     CXXFLAGS="-I/usr/local/include"
 
-
-In both cases, raw output is not available.
+On both systems, raw output is not available.
 
 Advanced install procedure:
 ===========================
diff --git a/Makefile.am b/Makefile.am
index 131ba7c..b1578f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,5 +23,5 @@ SUBDIRS	=src lib
 
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST	=COPYING NEWS README.md INSTALL.md LICENCE AUTHORS ChangeLog TODO doc src/fec/README.md src/fec/LICENCE
+EXTRA_DIST	=COPYING NEWS README.md INSTALL.md LICENCE AUTHORS ChangeLog TODO doc
 
diff --git a/README.md b/README.md
index c17f0db..a68f16e 100644
--- a/README.md
+++ b/README.md
@@ -14,9 +14,9 @@ Features of ODR-DabMux:
 - Standards-compliant DAB multiplexer
 - Configuration file, see doc/example.mux
 - Timestamping support required for SFN
-- ZeroMQ ETI output that can be used with ODR-DabMod
-- ZeroMQ input that can be used with FDK-AAC-DABplus
-  and Toolame-DAB, and supports CURVE authentication
+- ZeroMQ and TCP ETI outputs that can be used with ODR-DabMod
+- ZeroMQ input that can be used with ODR-AudioEnc
+  which supports CURVE authentication
 - Logging to syslog
 - Monitoring using munin tool
 - Includes a Telnet and ZMQ Remote Control for setting/getting parameters
@@ -27,7 +27,7 @@ Features of ODR-DabMux:
 
 The src/ directory contains the source code of ODR-DabMux.
 
-The doc/ directory contains the ODR-DabMux documentation, an example
+The doc/ directory contains the ODR-DabMux documentation, a few example
 configuration file, and the example munin script for the statistics
 server.
 
diff --git a/configure.ac b/configure.ac
index 34abe67..8aefaef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 # along with ODR-DabMux.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.61)
-AC_INIT([ODR-DabMux], [1.1.0], [matthias.braendli@mpb.li])
+AC_INIT([ODR-DabMux], [1.2.0], [matthias.braendli@mpb.li])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE([-Wall subdir-objects foreign])
diff --git a/src/Makefile.am b/src/Makefile.am
index 0d1c454..065477b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -120,3 +120,6 @@ odr_zmq2farsync_SOURCES  = zmq2farsync/zmq2farsync.cpp \
 odr_zmq2farsync_LDADD    = $(ZMQ_LIBS)
 odr_zmq2farsync_CFLAGS   = -Wall $(GITVERSION_FLAGS) -I$(FARSYNC_DIR)
 odr_zmq2farsync_CXXFLAGS = -Wall -std=c++11 $(GITVERSION_FLAGS) -I$(FARSYNC_DIR)
+
+EXTRA_DIST = fec/README.md \
+			 fec/LICENSE