[fcm] 05/16: Merge branch 'upstream' 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 e09b4fd51fb3cd3a5b503a380bfc24d3a71d9d1e
Merge: 2850daa 4220d53
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Oct 23 16:51:11 2015 +0100

    Merge branch 'upstream' into debian/master

 CHANGES.md                                         |  57 +++++++++++
 CONTRIBUTING.md                                    |   1 +
 doc/etc/fcm-version.js                             |   2 +-
 doc/user_guide/annex_cfg.html                      |  23 +++--
 doc/user_guide/command_ref.html                    |   2 +-
 doc/user_guide/make.html                           |  41 +++++---
 doc/user_guide/overview.html                       |   6 +-
 lib/FCM/Admin/System.pm                            |  91 ++++++++++++------
 lib/FCM/Admin/Users/LDAP.pm                        |   2 +-
 lib/FCM/Admin/Users/Passwd.pm                      |   2 +-
 lib/FCM/CLI/Parser.pm                              |   7 +-
 lib/FCM/CLI/fcm-branch-create.pod                  |   2 +-
 lib/FCM/Context/Make/Build.pm                      |   4 +-
 lib/FCM/System/Make/Build.pm                       | 107 ++++++++++++++-------
 lib/FCM/System/Make/Preprocess.pm                  |   6 +-
 lib/FCM/Util.pm                                    |  32 ++++--
 lib/FCM/Util/Locator.pm                            |  10 +-
 lib/FCM1/Cm.pm                                     |   5 +-
 sbin/post-commit-bg                                |  20 ++--
 sbin/pre-commit                                    |  17 +++-
 t/fcm-keyword-print/00-simple.t                    |   4 +-
 t/fcm-make/47-build-target-modifier-ns.t           |  93 ++++++++++++++++++
 .../47-build-target-modifier-ns/fcm-make.cfg       |   4 +
 .../src/greet/greet.f90                            |   6 ++
 .../47-build-target-modifier-ns/src/greet/world.nl |   3 +
 .../src/hello/hello.f90                            |   6 ++
 .../47-build-target-modifier-ns/src/hello/world.nl |   3 +
 t/fcm-make/48-build-sha1.t                         |  65 +++++++++++++
 t/fcm-make/48-build-sha1/fcm-make.cfg              |   5 +
 t/fcm-make/48-build-sha1/src/hello.f90             |   3 +
 t/svn-hooks/02-pre-commit.t                        |  12 ++-
 t/svn-hooks/03-post-commit-bg.t                    |  71 ++++++++++----
 32 files changed, 571 insertions(+), 141 deletions(-)

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