[fcm] 07/16: Merge tag 'upstream/2015.11.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 37141c62b6af2cbb26fa84425903ddef659408ec
Merge: e09b4fd 9e9b41e
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Dec 4 18:24:58 2015 +0000

    Merge tag 'upstream/2015.11.0' into debian/master

 CHANGES.md                              | 16 +++++++++++
 debian/changelog                        |  2 +-
 doc/etc/fcm-version.js                  |  2 +-
 lib/FCM/System/Make/Build/FileType/C.pm |  2 +-
 lib/FCM/Util/Locator/FS.pm              |  4 +--
 lib/FCM1/CmBranch.pm                    |  4 +--
 sbin/post-revprop-change-bg             |  2 +-
 t/fcm-make/49-build-c-more.t            | 50 +++++++++++++++++++++++++++++++++
 t/fcm-make/49-build-c-more/fcm-make.cfg |  4 +++
 t/fcm-make/49-build-c-more/src/greet.c  |  4 +++
 t/fcm-make/49-build-c-more/src/hello.c  |  5 ++++
 t/fcm-make/49-build-c-more/src/hi.c     |  5 ++++
 t/fcm-merge/01-complex.t                |  3 +-
 t/fcm-switch/00-simple.t                |  3 +-
 t/fcm-switch/01-subtree.t               |  3 +-
 t/fcm-switch/test_header                |  2 +-
 t/fcm-update/00-simple.t                |  6 ++--
 t/fcm-update/01-subtree.t               |  6 ++--
 t/fcm-update/test_header                |  2 +-
 t/lib/bash/test_header                  |  8 ++++++
 20 files changed, 116 insertions(+), 17 deletions(-)

diff --cc debian/changelog
index f979cfb,0000000..b0eaac1
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,0 +1,5 @@@
- fcm (2015.5.0+dfsg.1-1) unstable; urgency=medium
++fcm (2015.11.0+dfsg.1-1) unstable; urgency=medium
 +
 +  * Initial release. (Closes: #788817)
 +
 + -- Alastair McKinstry <mckinstry at debian.org>  Wed, 08 Jul 2015 17:32:44 +0100

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