[fcm] 12/17: Merge tag 'upstream/2017.02.0' into debian/master
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jul 28 09:29:06 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository fcm.
commit 4e07f86bbafc72632b3d0697a3aa27f37cbad980
Merge: a919f76 396db40
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sat Mar 25 15:31:18 2017 +0000
Merge tag 'upstream/2017.02.0' into debian/master
CHANGES.md | 13 +++++++++++++
README.md | 2 +-
bin/fcm | 2 +-
bin/fcm_graphic_diff | 2 +-
bin/fcm_graphic_merge | 2 +-
bin/fcm_gui | 2 +-
bin/fcm_internal | 2 +-
bin/fcm_test_battery | 2 +-
doc/etc/fcm-version.js | 2 +-
doc/etc/fcm.css | 2 +-
doc/etc/fcm.js | 2 +-
etc/svn-hooks/post-commit | 2 +-
etc/svn-hooks/post-revprop-change | 2 +-
etc/svn-hooks/pre-commit | 2 +-
etc/svn-hooks/pre-revprop-change | 2 +-
lib/FCM/Admin/Config.pm | 2 +-
lib/FCM/Admin/Project.pm | 2 +-
lib/FCM/Admin/Runner.pm | 2 +-
lib/FCM/Admin/System.pm | 2 +-
lib/FCM/Admin/User.pm | 2 +-
lib/FCM/Admin/Users/LDAP.pm | 2 +-
lib/FCM/Admin/Users/Passwd.pm | 2 +-
lib/FCM/Admin/Util.pm | 2 +-
lib/FCM/CLI.pm | 2 +-
lib/FCM/CLI/Exception.pm | 2 +-
lib/FCM/CLI/Parser.pm | 2 +-
lib/FCM/Class/CODE.pm | 2 +-
lib/FCM/Class/Exception.pm | 2 +-
lib/FCM/Class/HASH.pm | 2 +-
lib/FCM/Context/ConfigEntry.pm | 2 +-
lib/FCM/Context/Event.pm | 2 +-
lib/FCM/Context/Keyword.pm | 2 +-
lib/FCM/Context/Locator.pm | 2 +-
lib/FCM/Context/Make.pm | 2 +-
lib/FCM/Context/Make/Build.pm | 2 +-
lib/FCM/Context/Make/Extract.pm | 2 +-
lib/FCM/Context/Make/Mirror.pm | 2 +-
lib/FCM/Context/Make/Share/Property.pm | 2 +-
lib/FCM/Context/Task.pm | 2 +-
lib/FCM/Exception.pm | 2 +-
lib/FCM/System.pm | 2 +-
lib/FCM/System/CM.pm | 2 +-
lib/FCM/System/CM/CommitMessage.pm | 2 +-
lib/FCM/System/CM/Prompt.pm | 2 +-
lib/FCM/System/CM/ResolveConflicts.pm | 2 +-
lib/FCM/System/CM/SVN.pm | 2 +-
lib/FCM/System/Exception.pm | 2 +-
lib/FCM/System/Make.pm | 2 +-
lib/FCM/System/Make/Build.pm | 2 +-
lib/FCM/System/Make/Build/FileType.pm | 2 +-
lib/FCM/System/Make/Build/FileType/C.pm | 2 +-
lib/FCM/System/Make/Build/FileType/CPP.pm | 2 +-
lib/FCM/System/Make/Build/FileType/CXX.pm | 2 +-
lib/FCM/System/Make/Build/FileType/Data.pm | 2 +-
lib/FCM/System/Make/Build/FileType/FPP.pm | 2 +-
lib/FCM/System/Make/Build/FileType/Fortran.pm | 2 +-
lib/FCM/System/Make/Build/FileType/H.pm | 2 +-
lib/FCM/System/Make/Build/FileType/NS.pm | 2 +-
lib/FCM/System/Make/Build/FileType/Script.pm | 2 +-
lib/FCM/System/Make/Build/Task/Archive.pm | 2 +-
lib/FCM/System/Make/Build/Task/Compile.pm | 2 +-
lib/FCM/System/Make/Build/Task/Compile/C.pm | 2 +-
lib/FCM/System/Make/Build/Task/Compile/CXX.pm | 2 +-
lib/FCM/System/Make/Build/Task/Compile/Fortran.pm | 2 +-
lib/FCM/System/Make/Build/Task/ExtractInterface.pm | 2 +-
lib/FCM/System/Make/Build/Task/Install.pm | 2 +-
lib/FCM/System/Make/Build/Task/Link.pm | 2 +-
lib/FCM/System/Make/Build/Task/Link/C.pm | 2 +-
lib/FCM/System/Make/Build/Task/Link/CXX.pm | 2 +-
lib/FCM/System/Make/Build/Task/Link/Fortran.pm | 2 +-
lib/FCM/System/Make/Build/Task/Preprocess.pm | 2 +-
lib/FCM/System/Make/Build/Task/Preprocess/C.pm | 2 +-
lib/FCM/System/Make/Build/Task/Preprocess/Fortran.pm | 2 +-
lib/FCM/System/Make/Build/Task/Share.pm | 2 +-
lib/FCM/System/Make/Extract.pm | 2 +-
lib/FCM/System/Make/Mirror.pm | 2 +-
lib/FCM/System/Make/Preprocess.pm | 2 +-
lib/FCM/System/Make/Share/Config.pm | 2 +-
lib/FCM/System/Make/Share/Dest.pm | 2 +-
lib/FCM/System/Make/Share/Subsystem.pm | 2 +-
lib/FCM/System/Misc.pm | 2 +-
lib/FCM/System/Old.pm | 2 +-
lib/FCM/Util.pm | 2 +-
lib/FCM/Util/ConfigReader.pm | 2 +-
lib/FCM/Util/ConfigUpgrade.pm | 2 +-
lib/FCM/Util/Event.pm | 2 +-
lib/FCM/Util/Exception.pm | 2 +-
lib/FCM/Util/Locator.pm | 2 +-
lib/FCM/Util/Locator/FS.pm | 2 +-
lib/FCM/Util/Locator/SSH.pm | 2 +-
lib/FCM/Util/Locator/SVN.pm | 2 +-
lib/FCM/Util/Reporter.pm | 2 +-
lib/FCM/Util/Shell.pm | 2 +-
lib/FCM/Util/TaskRunner.pm | 2 +-
lib/FCM1/Base.pm | 2 +-
lib/FCM1/Build.pm | 2 +-
lib/FCM1/Build/Fortran.pm | 2 +-
lib/FCM1/BuildSrc.pm | 2 +-
lib/FCM1/BuildTask.pm | 2 +-
lib/FCM1/CfgFile.pm | 2 +-
lib/FCM1/CfgLine.pm | 2 +-
lib/FCM1/Cm.pm | 6 ++++--
lib/FCM1/CmBranch.pm | 2 +-
lib/FCM1/CmUrl.pm | 2 +-
lib/FCM1/Config.pm | 2 +-
lib/FCM1/ConfigSystem.pm | 2 +-
lib/FCM1/Dest.pm | 2 +-
lib/FCM1/Exception.pm | 2 +-
lib/FCM1/Extract.pm | 2 +-
lib/FCM1/ExtractConfigComparator.pm | 2 +-
lib/FCM1/ExtractFile.pm | 2 +-
lib/FCM1/ExtractSrc.pm | 2 +-
lib/FCM1/Interactive.pm | 2 +-
lib/FCM1/Interactive/InputGetter.pm | 2 +-
lib/FCM1/Interactive/InputGetter/CLI.pm | 2 +-
lib/FCM1/Interactive/InputGetter/GUI.pm | 2 +-
lib/FCM1/Keyword.pm | 2 +-
lib/FCM1/ReposBranch.pm | 2 +-
lib/FCM1/SrcDirLayer.pm | 2 +-
lib/FCM1/Timer.pm | 2 +-
lib/FCM1/Util.pm | 2 +-
lib/FCM1/Util/ClassLoader.pm | 2 +-
man/man1/fcm.1 | 2 +-
sbin/fcm-add-svn-repos | 2 +-
sbin/fcm-add-svn-repos-and-trac-env | 2 +-
sbin/fcm-add-trac-env | 2 +-
sbin/fcm-backup-svn-repos | 2 +-
sbin/fcm-backup-trac-env | 2 +-
sbin/fcm-commit-update | 2 +-
sbin/fcm-daily-update | 2 +-
sbin/fcm-install-svn-hook | 2 +-
sbin/fcm-manage-trac-env-session | 2 +-
sbin/fcm-manage-users | 2 +-
sbin/fcm-recover-svn-repos | 2 +-
sbin/fcm-recover-trac-env | 2 +-
sbin/fcm-rpmbuild | 2 +-
sbin/fcm-user-to-email | 2 +-
sbin/fcm-vacuum-trac-env-db | 2 +-
sbin/my-regular-update.example | 2 +-
sbin/post-commit-bg | 2 +-
sbin/post-commit-bg-notify-who | 2 +-
sbin/post-revprop-change-bg | 2 +-
sbin/pre-commit | 2 +-
sbin/pre-commit-verify-branch-owner | 2 +-
sbin/pre-revprop-change | 2 +-
sbin/trac_hook | 2 +-
t/fcm-add-trac-env/00-basic.t | 2 +-
t/fcm-add/00-simple.t | 2 +-
t/fcm-backup-svn-repos/00-basic.t | 2 +-
t/fcm-branch-create/00-simple.t | 2 +-
t/fcm-branch-delete/00-simple.t | 2 +-
t/fcm-branch-delete/01-bad-arg.t | 2 +-
t/fcm-branch-delete/02-rosie.t | 2 +-
t/fcm-branch-diff/00-simple.t | 2 +-
t/fcm-branch-diff/test_header | 2 +-
t/fcm-branch-info/00-simple.t | 2 +-
t/fcm-branch-info/test_header | 2 +-
t/fcm-branch-list/00-simple.t | 2 +-
t/fcm-branch-list/test_header | 2 +-
t/fcm-build/00-geninterface.t | 2 +-
t/fcm-cfg-print/00-env.t | 2 +-
t/fcm-commit/00-simple.t | 2 +-
t/fcm-commit/01-subtree.t | 2 +-
t/fcm-commit/02-bad.t | 2 +-
t/fcm-commit/03-message-file.t | 2 +-
t/fcm-commit/04-externals.t | 2 +-
t/fcm-commit/test_header | 2 +-
t/fcm-conflicts/00-tree-add-add.t | 2 +-
t/fcm-conflicts/01-tree-delete-delete.t | 2 +-
t/fcm-conflicts/02-tree-delete-edit.t | 2 +-
t/fcm-conflicts/03-tree-delete-rename.t | 2 +-
t/fcm-conflicts/04-tree-edit-delete.t | 2 +-
t/fcm-conflicts/05-tree-edit-rename.t | 2 +-
t/fcm-conflicts/06-tree-rename-delete.t | 2 +-
t/fcm-conflicts/07-tree-rename-edit.t | 2 +-
t/fcm-conflicts/08-tree-rename-rename-diff.t | 2 +-
t/fcm-conflicts/09-tree-rename-rename-same.t | 2 +-
t/fcm-conflicts/10-text.t | 2 +-
t/fcm-conflicts/11-tree-edit-replace.t | 2 +-
t/fcm-conflicts/test_header | 2 +-
t/fcm-diff/00-simple.t | 2 +-
t/fcm-diff/test_header | 2 +-
t/fcm-install-svn-hook/00-basic.t | 2 +-
t/fcm-install-svn-hook/01-housekeep-log.t | 2 +-
t/fcm-install-svn-hook/02-env.t | 2 +-
t/fcm-install-svn-hook/test_header_more | 2 +-
t/fcm-keyword-print/00-simple.t | 2 +-
t/fcm-loc-layout/00-simple.t | 2 +-
t/fcm-loc-layout/test_header | 2 +-
t/fcm-make/00-build-basic.t | 2 +-
t/fcm-make/00-build-basic/bin/my-ld | 2 +-
t/fcm-make/01-build-link-opts.t | 2 +-
t/fcm-make/02-build-ext-iface.t | 2 +-
t/fcm-make/03-build-include-paths.t | 2 +-
t/fcm-make/04-build-libs.t | 2 +-
t/fcm-make/05-build-c-cxx-basic.t | 2 +-
t/fcm-make/06-extract-ssh.t | 2 +-
t/fcm-make/07-build-ns-dep.t | 2 +-
t/fcm-make/08-build-dup-dep.t | 2 +-
t/fcm-make/09-build-dep-o.t | 2 +-
t/fcm-make/10-log.t | 2 +-
t/fcm-make/11-preprocess-include-path.t | 2 +-
t/fcm-make/12-build-class-prop.t | 2 +-
t/fcm-make/13-build-target-prop.t | 2 +-
t/fcm-make/13-build-target-prop/bin/my-fc | 2 +-
t/fcm-make/14-build-etc.t | 2 +-
t/fcm-make/15-extract-loc-reset.t | 2 +-
t/fcm-make/16-build-dep-o-2.t | 2 +-
t/fcm-make/17-build-cyclic.t | 2 +-
t/fcm-make/18-build-use-intrinsic.t | 2 +-
t/fcm-make/19-build-inherit-prop.t | 2 +-
t/fcm-make/20-args.t | 2 +-
t/fcm-make/21-inherit-steps.t | 2 +-
t/fcm-make/22-build-2-bad-mod-over-inherit.t | 2 +-
t/fcm-make/23-build-omp.t | 2 +-
t/fcm-make/24-build-c-main-camel.t | 2 +-
t/fcm-make/25-build-cyclic-2.t | 2 +-
t/fcm-make/26-no-config.t | 2 +-
t/fcm-make/27-args-only.t | 2 +-
t/fcm-make/28-bad-arg.t | 2 +-
t/fcm-make/29-relative-cfg.t | 2 +-
t/fcm-make/30-relative-cfg-in-svn.t | 2 +-
t/fcm-make/31-relative-cfg-in-ssh.t | 2 +-
t/fcm-make/32-include-relative-cfg.t | 2 +-
t/fcm-make/33-include-relative-cfg-in-svn.t | 2 +-
t/fcm-make/34-include-relative-cfg-in-ssh.t | 2 +-
t/fcm-make/35-include-relative-cfg-in-2-dirs.t | 2 +-
t/fcm-make/36-build-fail-cont-basic.t | 2 +-
t/fcm-make/37-no-such-config-file.t | 2 +-
t/fcm-make/38-extract-inherit-set-primary.t | 2 +-
t/fcm-make/39-build-source-with-dot.t | 2 +-
t/fcm-make/40-extract-fs-source-with-dot.t | 2 +-
t/fcm-make/41-ctx-name.t | 2 +-
t/fcm-make/42-make-mirror-make2.t | 2 +-
t/fcm-make/43-ctx-name-inherit.t | 2 +-
t/fcm-make/44-ctx-name-inherit-compat.t | 2 +-
t/fcm-make/45-dest-mv.t | 2 +-
t/fcm-make/46-archive-mode.t | 2 +-
t/fcm-make/47-build-target-modifier-ns.t | 2 +-
t/fcm-make/48-build-sha1.t | 2 +-
t/fcm-make/49-build-c-more.t | 2 +-
t/fcm-make/50-build-target-dep.t | 2 +-
t/fcm-make/51-build-target-no-dep.t | 2 +-
t/fcm-make/52-require-version.t | 2 +-
t/fcm-make/53-extract-conflict-incr.t | 2 +-
t/fcm-make/54-build-ignore-missing-dep-ns.t | 2 +-
t/fcm-merge/00-simple.t | 2 +-
t/fcm-merge/01-complex.t | 2 +-
t/fcm-merge/02-reverse.t | 2 +-
t/fcm-recover-svn-repos/00-basic.t | 2 +-
t/fcm-status/00-simple.t | 2 +-
t/fcm-status/test_header | 2 +-
t/fcm-switch/00-simple.t | 2 +-
t/fcm-switch/01-subtree.t | 2 +-
t/fcm-update/00-simple.t | 2 +-
t/fcm-update/01-subtree.t | 2 +-
t/lib/bash/svn_test_header | 2 +-
t/lib/bash/test_header | 2 +-
t/svn-hooks/00-pre-revprop-change.t | 2 +-
t/svn-hooks/01-post-revprop-change-bg.t | 2 +-
t/svn-hooks/02-pre-commit.t | 2 +-
t/svn-hooks/03-post-commit-bg.t | 2 +-
t/svn-hooks/04-svnperms.t | 2 +-
t/svn-hooks/test_header_more | 2 +-
t/svn-username/00-branch.t | 2 +-
t/svn-username/test_header | 2 +-
tutorial/fcm-tutorial-repos-create | 2 +-
usr/bin/fcm | 2 +-
268 files changed, 283 insertions(+), 268 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fcm.git
More information about the debian-science-commits
mailing list