[yoda-svn] yoda: Merge from 1.6.x branch

[YODA Mercurial]

details:   https://yoda.hepforge.org/hg/yoda/rev/c688d66e000a
branches:  
changeset: 1294:c688d66e000a
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Thu Sep 15 09:04:24 2016 +0100
description:
Merge from 1.6.x branch

diffs (truncated from 1704 to 50 lines):

--- a/.hgtags	Thu Jul 14 12:00:27 2016 +0100
+++ b/.hgtags	Thu Sep 15 09:04:24 2016 +0100
@@ -44,3 +44,4 @@
 0000000000000000000000000000000000000000 yoda-1.6.1
 3d956bb73656d46a3118a5a5d03d25420c04f538 yoda-1.6.1
 2a32b9e0b9a9f962bd9ebb2ac7e611981da14ce4 yoda-1.6.2
+6e222b9c2422baef39a531e2461213a51c898661 yoda-1.6.3
--- a/ChangeLog	Thu Jul 14 12:00:27 2016 +0100
+++ b/ChangeLog	Thu Sep 15 09:04:24 2016 +0100
@@ -1,3 +1,29 @@
+2016-09-06  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Update configure scripts to use newer (Py3-safe) Python testing macros.
+
+2016-08-09  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Version 1.6.3 release!
+
+2016-07-22  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add 'add' modes for scatter combination to yodamerge.
+
+	* Fix yodamerge scatter averaging to use the first AO.
+
+2016-07-21  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add --type-mismatch-mode flag and fallback logic to yodamerge.
+
+	* Fix yodamerge logic to handle cases where an AO only appears once.
+
+2016-07-19  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Deprecate flat2yoda script and add warning output to it and the AIDA conversion scripts.
+
+	* Add a convenience yoda2yoda script.
+
 2016-07-14  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Try to build PyROOT interface by default, if root-config is found.
--- a/bin/Makefile.am	Thu Jul 14 12:00:27 2016 +0100
+++ b/bin/Makefile.am	Thu Sep 15 09:04:24 2016 +0100
@@ -12,7 +12,11 @@
 dist_bin_SCRIPTS += yodacmp yodaplot
 
 ## Data format conversion
-dist_bin_SCRIPTS += yodacnv yoda2aida yoda2flat aida2yoda aida2flat flat2yoda
+dist_bin_SCRIPTS += yodacnv yoda2yoda yoda2flat
+## Deprecated scripts
+dist_bin_SCRIPTS += yoda2aida aida2yoda
+## Uber-deprecated scripts