[kdesrc-build/make_it_mojo] /: Merge remote-tracking branch 'origin/master' into make_it_mojo

[Michael Pyne]

Git commit 9cbc7d16a5f262ebe17025840d8b91834684ea49 by Michael Pyne.
Committed on 14/10/2018 at 23:59.
Pushed by mpyne into branch 'make_it_mojo'.

Merge remote-tracking branch 'origin/master' into make_it_mojo

Conflicts:
	modules/ksb/Application.pm

M  +1    -0    CMakeLists.txt
M  +11   -1    doc/index.docbook
M  +14   -0    doc/man-kdesrc-build.1.docbook
M  +5    -2    modules/ksb/Application.pm
M  +2    -2    modules/ksb/BuildContext.pm
M  +14   -2    modules/ksb/Updater/Git.pm
M  +1    -1    modules/ksb/Util.pm

https://commits.kde.org/kdesrc-build/9cbc7d16a5f262ebe17025840d8b91834684ea49

diff --cc CMakeLists.txt
index 410cb4e,1ea5bca..1566ec0
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -44,10 -45,9 +44,11 @@@ if (KDESRC_BUILD_INSTALL_MODULES
          modules/ksb/ModuleResolver.pm
          modules/ksb/ModuleSet.pm
          modules/ksb/OptionsBase.pm
+         modules/ksb/OSSupport.pm
          modules/ksb/PhaseList.pm
 +        modules/ksb/PromiseChain.pm
          modules/ksb/RecursiveFH.pm
 +        modules/ksb/StatusMonitor.pm
          modules/ksb/StatusView.pm
          modules/ksb/Updater.pm
          modules/ksb/Util.pm
diff --cc modules/ksb/Application.pm
index 380ae9a,259be35..8fbab25
--- a/modules/ksb/Application.pm
+++ b/modules/ksb/Application.pm
@@@ -19,9 -19,11 +19,10 @@@ use ksb::Module
  use ksb::ModuleResolver 0.20;
  use ksb::ModuleSet 0.20;
  use ksb::ModuleSet::KDEProjects;
+ use ksb::OSSupport;
 +use ksb::PromiseChain;
  use ksb::RecursiveFH;
  use ksb::DependencyResolver 0.20;
 -use ksb::IPC::Pipe 0.20;
 -use ksb::IPC::Null;
  use ksb::Updater::Git;
  use ksb::Version qw(scriptVersion);