[fcm] 10/16: Merge tag 'upstream/2015.12.0' into debian/master

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository fcm.

commit e1e3ef792eb51ab530b359387273d576c8547d86
Merge: 43c6739 4bccb1e
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Jan 16 17:58:01 2016 +0000

    Merge tag 'upstream/2015.12.0' into debian/master

 CHANGES.md                                         | 13 ++++
 doc/etc/fcm-version.js                             |  2 +-
 doc/user_guide/annex_cfg.html                      |  7 +-
 doc/user_guide/command_ref.html                    | 66 +++++++++++++++++
 doc/user_guide/make.html                           | 24 ++++++
 lib/FCM/Admin/System.pm                            | 63 ++++++++--------
 lib/FCM/CLI/fcm-test-battery.pod                   | 53 +++++++++++---
 lib/FCM/System/Make/Build.pm                       | 85 +++++++++++++++-------
 sbin/post-commit-bg                                | 28 +++++--
 t/fcm-install-svn-hook/00-basic.t                  | 24 +++++-
 t/fcm-install-svn-hook/00-basic/commit-conf-2.out  |  2 +-
 ...-conf-2.out => commit-conf-site-override-2.out} |  2 +-
 ...mmit-conf.out => commit-conf-site-override.out} |  2 +-
 t/fcm-install-svn-hook/00-basic/commit-conf.out    |  2 +-
 t/fcm-make/50-build-target-dep.t                   | 46 ++++++++++++
 t/fcm-make/50-build-target-dep/fcm-make.cfg        |  4 +
 t/fcm-make/50-build-target-dep/src/greet.f90       |  7 ++
 t/fcm-make/50-build-target-dep/src/greet_world.f90 |  3 +
 t/fcm-make/51-build-target-no-dep.t                | 59 +++++++++++++++
 t/fcm-make/51-build-target-no-dep/fcm-make.cfg     |  7 ++
 t/fcm-make/51-build-target-no-dep/src/greet.f90    |  4 +
 .../51-build-target-no-dep/src/greet_mod.f90       |  3 +
 .../51-build-target-no-dep/src/greet_world.f90     |  3 +
 .../51-build-target-no-dep/src2/hello_mod.f90      |  6 ++
 t/svn-hooks/03-post-commit-bg.t                    | 39 +++++++++-
 t/svn-hooks/test_header_more                       |  1 +
 26 files changed, 466 insertions(+), 89 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fcm.git