[fcm] 03/05: Merge tag 'upstream_2015.5.0'
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jun 19 11:10:48 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository fcm.
commit a509d89360f16554cb0b2f3c552b673af0b33cbf
Merge: 5eda717 5a95f64
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Jun 15 11:11:24 2015 +0100
Merge tag 'upstream_2015.5.0'
CHANGES.md | 144 +++
CONTRIBUTING.md | 1 +
README.md | 2 +-
bin/fcm | 2 +-
bin/fcm_graphic_diff | 6 +-
bin/fcm_graphic_merge | 23 +-
bin/fcm_gui | 2 +-
bin/fcm_internal | 2 +-
bin/fcm_test_battery | 7 +-
doc/collaboration/index.html | 2 +-
doc/etc/fcm-terms-of-use.html | 2 +-
doc/etc/fcm-version.js | 2 +-
doc/etc/fcm.css | 2 +-
doc/etc/fcm.js | 2 +-
doc/index.html | 2 +-
doc/installation/index.html | 5 +-
doc/release_notes/1-1.html | 2 +-
doc/release_notes/1-2.html | 2 +-
doc/release_notes/1-3.html | 2 +-
doc/release_notes/1-4.html | 2 +-
doc/release_notes/1-5.html | 2 +-
doc/release_notes/2-0.html | 2 +-
doc/release_notes/2-1.html | 2 +-
doc/release_notes/2-2.html | 2 +-
doc/release_notes/2-3-1.html | 2 +-
doc/release_notes/2-3.html | 2 +-
doc/release_notes/index.html | 2 +-
doc/user_guide/annex_bld_cfg.html | 2 +-
doc/user_guide/annex_cfg.html | 44 +-
doc/user_guide/annex_ext_cfg.html | 2 +-
doc/user_guide/annex_fcm_cfg.html | 2 +-
doc/user_guide/annex_quick_ref.html | 2 +-
doc/user_guide/annex_quick_ref_tree_conflicts.html | 2 +-
doc/user_guide/api.html | 2 +-
doc/user_guide/build.html | 2 +-
doc/user_guide/code_management.html | 2 +-
doc/user_guide/command_ref.html | 44 +-
doc/user_guide/extract.html | 2 +-
doc/user_guide/getting_started.html | 2 +-
doc/user_guide/index.html | 2 +-
doc/user_guide/introduction.html | 2 +-
doc/user_guide/make.html | 159 ++-
doc/user_guide/overview.html | 2 +-
doc/user_guide/system_admin.html | 2 +-
doc/user_guide/working_practices.html | 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 | 71 +-
lib/FCM/Admin/User.pm | 2 +-
lib/FCM/Admin/Users/LDAP.pm | 2 +-
lib/FCM/Admin/Users/Passwd.pm | 34 +-
lib/FCM/Admin/Util.pm | 13 +-
lib/FCM/CLI.pm | 2 +-
lib/FCM/CLI/Exception.pm | 2 +-
lib/FCM/CLI/Parser.pm | 17 +-
lib/FCM/CLI/fcm-export-items.pod | 2 +-
lib/FCM/CLI/fcm-make.pod | 21 +-
lib/FCM/CLI/fcm-merge.pod | 10 +-
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 | 9 +-
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 | 8 +-
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 | 8 +-
lib/FCM/System/Exception.pm | 2 +-
lib/FCM/System/Make.pm | 55 +-
lib/FCM/System/Make/Build.pm | 120 +-
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 | 6 +-
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 +-
.../System/Make/Build/Task/Preprocess/Fortran.pm | 2 +-
lib/FCM/System/Make/Build/Task/Share.pm | 2 +-
lib/FCM/System/Make/Extract.pm | 166 ++-
lib/FCM/System/Make/Mirror.pm | 34 +-
lib/FCM/System/Make/Preprocess.pm | 2 +-
lib/FCM/System/Make/Share/Config.pm | 39 +-
lib/FCM/System/Make/Share/Dest.pm | 139 ++-
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 | 7 +-
lib/FCM/Util/Exception.pm | 2 +-
lib/FCM/Util/Locator.pm | 2 +-
lib/FCM/Util/Locator/FS.pm | 15 +-
lib/FCM/Util/Locator/SSH.pm | 6 +-
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 | 5 +-
lib/FCM1/BuildTask.pm | 2 +-
lib/FCM1/CfgFile.pm | 10 +-
lib/FCM1/CfgLine.pm | 4 +-
lib/FCM1/Cm.pm | 39 +-
lib/FCM1/CmBranch.pm | 2 +-
lib/FCM1/CmUrl.pm | 2 +-
lib/FCM1/Config.pm | 2 +-
lib/FCM1/ConfigSystem.pm | 6 +-
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 | 26 +-
sbin/post-commit-bg-notify-who | 64 +-
sbin/post-revprop-change-bg | 8 +-
sbin/pre-commit | 4 +-
sbin/pre-commit-verify-branch-owner | 2 +-
sbin/pre-revprop-change | 2 +-
sbin/svnperms.py | 9 +-
sbin/trac_hook | 2 +-
t/fcm-add-trac-env/00-basic.t | 2 +-
t/fcm-add/00-simple.t | 15 +-
t/fcm-add/test_header | 2 +-
t/fcm-backup-svn-repos/00-basic.t | 2 +-
t/fcm-branch-create/00-simple.t | 3 +-
t/fcm-branch-create/test_header | 2 +-
t/fcm-branch-delete/00-simple.t | 5 +-
.../02-bad.t => fcm-branch-delete/01-bad-arg.t} | 34 +-
t/fcm-branch-delete/test_header | 2 +-
t/fcm-branch-diff/00-simple.t | 455 ++------
t/fcm-branch-diff/test_header | 2 +-
t/fcm-branch-info/00-simple.t | 3 +-
t/fcm-branch-info/test_header | 2 +-
t/fcm-branch-list/00-simple.t | 3 +-
t/fcm-branch-list/test_header | 2 +-
.../27-args-only.t => fcm-build/00-geninterface.t} | 47 +-
t/fcm-build/test_header | 1 +
t/fcm-commit/00-simple.t | 59 +-
t/fcm-commit/01-subtree.t | 60 +-
t/fcm-commit/02-bad.t | 3 +-
t/fcm-commit/03-message-file.t | 3 +-
t/fcm-commit/{02-bad.t => 04-externals.t} | 43 +-
t/fcm-commit/test_header | 2 +-
t/fcm-conflicts/00-tree-add-add.t | 3 +-
t/fcm-conflicts/01-tree-delete-delete.t | 3 +-
t/fcm-conflicts/02-tree-delete-edit.t | 3 +-
t/fcm-conflicts/03-tree-delete-rename.t | 3 +-
t/fcm-conflicts/04-tree-edit-delete.t | 3 +-
t/fcm-conflicts/05-tree-edit-rename.t | 3 +-
t/fcm-conflicts/06-tree-rename-delete.t | 3 +-
t/fcm-conflicts/07-tree-rename-edit.t | 3 +-
t/fcm-conflicts/08-tree-rename-rename-diff.t | 3 +-
t/fcm-conflicts/09-tree-rename-rename-same.t | 3 +-
t/fcm-conflicts/10-text.t | 54 +-
t/fcm-conflicts/test_header | 2 +-
t/fcm-diff/00-simple.t | 105 +-
t/fcm-diff/test_header | 2 +-
t/fcm-install-svn-hook/00-basic.t | 6 +-
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 +-
.../02-build-ext-iface/expected/t1.interface | 6 +
t/fcm-make/02-build-ext-iface/src/t1.f90 | 14 +
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 | 4 +-
t/fcm-make/08-build-dup-dep.t | 4 +-
t/fcm-make/09-build-dep-o.t | 10 +-
t/fcm-make/10-log.t | 16 +-
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 | 4 +-
t/fcm-make/15-extract-loc-reset.t | 2 +-
t/fcm-make/16-build-dep-o-2.t | 4 +-
t/fcm-make/17-build-cyclic.t | 4 +-
t/fcm-make/18-build-use-intrinsic.t | 4 +-
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 | 13 +-
.../{26-no-config.t => 37-no-such-config-file.t} | 8 +-
t/fcm-make/38-extract-inherit-set-primary.t | 79 ++
...e-relative-cfg.t => 39-build-source-with-dot.t} | 54 +-
...in-2-dirs.t => 40-extract-fs-source-with-dot.t} | 75 +-
t/fcm-make/41-ctx-name.t | 177 +++
t/fcm-make/42-make-mirror-make2.t | 125 ++
t/fcm-make/43-ctx-name-inherit.t | 98 ++
t/fcm-make/44-ctx-name-inherit-compat.t | 92 ++
t/fcm-make/45-dest-mv.t | 85 ++
t/fcm-make/46-archive-mode.t | 111 ++
t/fcm-merge/00-simple.t | 235 ++--
t/fcm-merge/01-complex.t | 1192 +++++++++-----------
t/fcm-merge/02-reverse.t | 135 +++
t/fcm-merge/test_header | 40 +-
t/fcm-recover-svn-repos/00-basic.t | 2 +-
t/fcm-status/00-simple.t | 26 +-
t/fcm-status/test_header | 2 +-
t/fcm-switch/00-simple.t | 65 +-
t/fcm-switch/01-subtree.t | 92 +-
t/fcm-switch/test_header | 2 +-
t/fcm-update/00-simple.t | 84 +-
t/fcm-update/01-subtree.t | 83 +-
t/fcm-update/test_header | 2 +-
t/lib/bash/test_header | 86 +-
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 | 5 +-
t/svn-hooks/03-post-commit-bg.t | 88 +-
t/svn-hooks/04-svnperms.t | 121 ++
t/svn-hooks/test_header_more | 7 +-
t/svn-username/00-branch.t | 2 +-
t/svn-username/test_header | 2 +-
tutorial/fcm-tutorial-repos-create | 2 +-
usr/bin/fcm | 2 +-
303 files changed, 3564 insertions(+), 2403 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