[fcm] 08/17: Merge branch 'upstream' into debian/master 2016.12.0 release

[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 a329be119e0f06c066f5808a40fe253b8c3e241e
Merge: 768bc6a 147e858
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Dec 15 15:26:37 2016 +0000

    Merge branch 'upstream' into debian/master 2016.12.0 release

 CHANGES.md                                         | 20 ++++++--
 doc/etc/fcm-version.js                             |  2 +-
 lib/FCM/System/Make/Build.pm                       |  7 +--
 lib/FCM1/CmBranch.pm                               |  6 +--
 lib/FCM1/CmUrl.pm                                  | 28 ++++++----
 t/fcm-add-trac-env/00-basic.t                      |  2 +-
 t/fcm-branch-delete/02-rosie.t                     | 39 ++++++++++++++
 t/fcm-make/54-build-ignore-missing-dep-ns.t        | 60 ++++++++++++++++++++++
 .../54-build-ignore-missing-dep-ns/fcm-make.cfg    |  7 +++
 .../54-build-ignore-missing-dep-ns/src/greet.f90   |  4 ++
 .../src/greet_mod.f90                              |  3 ++
 .../src/greet_world.f90                            |  3 ++
 .../src2/hello_mod.f90                             |  6 +++
 t/lib/bash/svn_test_header                         |  3 +-
 14 files changed, 166 insertions(+), 24 deletions(-)

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