[Pkg-ocaml-maint-commits] [opam] 04/15: Merge tag 'upstream/1.2.2'

[Mehdi Dogguy]

This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository opam.

commit 485bd0af24d00948b601f732232a3512381f2d19
Merge: 0d3cc7c 0f54bd5
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Mon Jul 20 01:40:40 2015 +0000

    Merge tag 'upstream/1.2.2'
    
    Upstream version 1.2.2

 .travis-ci.sh                            |  20 +-
 .travis.yml                              |  11 +-
 CHANGES                                  |  24 ++
 admin-scripts/compilers-to-packages.ml   |   8 +-
 admin-scripts/extract_mini_repository.sh | 143 +++++++++
 admin-scripts/lint.ml                    |  64 +++-
 configure                                |  18 +-
 configure.ac                             |   2 +-
 doc/design/provides.md                   |   4 +-
 doc/dev-manual/dev-manual.tex            |  21 +-
 doc/pages/FAQ.md                         |  56 +++-
 doc/pages/Install.md                     | 104 ++++---
 doc/pages/Manual.md                      | 507 ++++++++++++++++---------------
 doc/pages/Packaging.md                   |   6 +-
 opam                                     |   2 +-
 shell/opam_installer.sh                  |   4 +-
 src/client/opamAction.ml                 |  15 +-
 src/client/opamArg.ml                    | 184 +++++++----
 src/client/opamArg.mli                   |   3 -
 src/client/opamClient.ml                 | 125 +++++---
 src/client/opamClient.mli                |   8 +-
 src/client/opamConfigCommand.ml          |   7 +-
 src/client/opamSolution.ml               |  36 ++-
 src/client/opamState.ml                  |  98 +++++-
 src/client/opamState.mli                 |   2 +
 src/client/opamSwitchCommand.ml          |  68 ++---
 src/client/opamSwitchCommand.mli         |   6 +-
 src/core/opamFile.ml                     | 175 ++++++-----
 src/core/opamFile.mli                    |  17 +-
 src/core/opamFilename.ml                 |   8 +-
 src/core/opamFilename.mli                |   6 +-
 src/core/opamFilter.ml                   |  64 +++-
 src/core/opamFilter.mli                  |   6 +-
 src/core/opamFormat.ml                   |  28 +-
 src/core/opamFormat.mli                  |   2 +
 src/core/opamFormula.ml                  |  76 ++++-
 src/core/opamFormula.mli                 |   4 +
 src/core/opamGlobals.ml                  |  27 +-
 src/core/opamGlobals.mli                 |   7 +-
 src/core/opamMisc.ml                     |   2 +-
 src/core/opamMisc.mli                    |   7 +-
 src/core/opamPackage.ml                  |   2 +-
 src/core/opamParallel.ml                 |  34 ++-
 src/core/opamParallel.mli                |  10 +-
 src/core/opamProcess.ml                  |  35 ++-
 src/core/opamProcess.mli                 |  15 +-
 src/core/opamSystem.ml                   |  23 +-
 src/core/opamSystem.mli                  |   2 +-
 src/core/opamTypes.mli                   |   3 +
 src/core/opamVersion.ml.in               |   2 +-
 src/repositories/opamHTTP.ml             |   2 +-
 src/repositories/opamLocal.ml            |   2 +-
 src/solver/opamCudf.ml                   | 121 +++++---
 src/solver/opamCudf.mli                  |  10 +-
 src/solver/opamSolver.ml                 |  60 +++-
 src/tools/opam_admin_top.ml              |  40 ++-
 src/tools/opam_admin_top.mli             |   4 +
 src/tools/opam_mk_repo.ml                | 119 +++++++-
 58 files changed, 1709 insertions(+), 750 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/opam.git