[Pkg-ocaml-maint-commits] [opam] 02/15: Merge tag 'upstream/1.2.1'

Mehdi Dogguy mehdi at moszumanska.debian.org
Tue Jul 28 21:21:42 UTC 2015


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

mehdi pushed a commit to branch master
in repository opam.

commit 0d3cc7c71fd3bea2688f3fc72d370e3007fe1ca7
Merge: a4b3766 3e7f279
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Mon Jul 20 01:40:34 2015 +0000

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1

 .gitignore                                         |    4 +-
 .travis-ci.sh                                      |   18 +-
 CHANGES                                            |   46 +
 Makefile                                           |   27 +-
 Makefile.config.in                                 |    1 +
 README.md                                          |   52 +-
 admin-scripts/compilers-to-packages.ml             |  149 +++
 admin-scripts/lint.ml                              |    5 +-
 admin-scripts/remove_notequals.ml                  |   25 -
 admin-scripts/to_1_1.ml                            |   84 +-
 configure                                          |   88 +-
 configure.ac                                       |   10 +-
 doc/Makefile                                       |    6 +-
 doc/design/depexts-plugins                         |  115 ++
 .../{metadata-evolution => depopts-and-features}   |   72 +-
 doc/design/provides.md                             |  110 ++
 doc/dev-manual/dev-manual.tex                      |  354 ++++--
 doc/modules                                        |   81 ++
 doc/pages/About.md                                 |   15 +
 doc/pages/FAQ.md                                   |  130 +-
 doc/pages/Install.md                               |  117 +-
 doc/pages/Manual.md                                |  629 ++++++++++
 doc/pages/Packaging.md                             |   94 +-
 doc/pages/Tricks.md                                |   75 ++
 doc/pages/Usage.md                                 |   18 +-
 doc/pages/index.md                                 |    3 -
 doc/pages/index.menu                               |    5 +-
 doc/release/readme.md                              |   11 +-
 opam                                               |   13 +-
 opam-devel.opam                                    |   46 +
 opam-lib.install                                   |  150 ++-
 shell/bootstrap-ocaml.sh                           |    2 +-
 shell/opam_installer.sh                            |    6 +-
 shell/release.sh                                   |    4 +-
 src/Makefile                                       |   39 +-
 src/client/client.ocp                              |    3 +-
 src/client/opamAction.ml                           |  506 ++++----
 src/client/opamAction.mli                          |   25 +-
 src/client/opamArg.ml                              |  481 ++++----
 src/client/opamArg.mli                             |   13 +-
 src/client/opamClient.ml                           |  605 ++++++----
 src/client/opamClient.mli                          |    7 +-
 src/client/opamConfigCommand.ml                    |   53 +-
 src/{core => client}/opamGitVersion.mli            |    0
 src/client/opamPinCommand.ml                       |  257 ++--
 src/client/opamPinCommand.mli                      |    8 +-
 src/client/opamRepositoryCommand.ml                |  101 +-
 src/client/opamRepositoryCommand.mli               |    7 +-
 src/client/opamSolution.ml                         |  584 +++++----
 src/client/opamSolution.mli                        |    6 +-
 src/client/opamState.ml                            | 1260 ++++++++++++--------
 src/client/opamState.mli                           |   93 +-
 src/client/opamSwitchCommand.ml                    |  192 +--
 src/client/opamSwitchCommand.mli                   |    3 +
 src/core/core.ocp                                  |    9 +-
 src/core/opamActionGraph.ml                        |  152 ++-
 src/core/opamActionGraph.mli                       |   27 +-
 .../{opamActionGraph.mli => opamCompat.ml.4.01}    |   26 +-
 .../{opamGitVersion.mli => opamCompat.ml.4.02}     |    5 +-
 .../{opamActionGraph.mli => opamCompat.mli.4.01}   |   26 +-
 .../{opamGitVersion.mli => opamCompat.mli.4.02}    |    5 +-
 src/core/opamCompiler.ml                           |   31 +-
 src/core/opamCompiler.mli                          |   19 +-
 src/core/opamFile.ml                               |  544 ++++++---
 src/core/opamFile.mli                              |   58 +-
 src/core/opamFilename.ml                           |   85 +-
 src/core/opamFilename.mli                          |   15 +-
 src/core/opamFilter.ml                             |  338 ++++--
 src/core/opamFilter.mli                            |   85 +-
 src/core/opamFormat.ml                             |  306 +++--
 src/core/opamFormat.mli                            |   23 +-
 src/core/opamFormula.ml                            |   14 +-
 src/core/opamGlobals.ml                            |  249 ++--
 src/core/opamGlobals.mli                           |   39 +-
 src/core/opamLexer.mll                             |   13 +-
 src/core/opamMisc.ml                               |  228 +++-
 src/core/opamMisc.mli                              |   28 +
 src/core/opamPackage.ml                            |   30 +-
 src/core/opamPackage.mli                           |    2 +-
 src/core/opamParallel.ml                           |  590 ++++-----
 src/core/opamParallel.mli                          |   83 +-
 src/core/opamPath.mli                              |   16 +-
 src/core/opamProcess.ml                            |  459 +++++--
 src/core/opamProcess.mli                           |  140 ++-
 src/core/opamRepository.ml                         |  110 +-
 src/core/opamRepository.mli                        |   38 +-
 src/core/opamSystem.ml                             |  385 +++---
 src/core/opamSystem.mli                            |   36 +-
 src/core/opamTypes.mli                             |   26 +-
 src/core/opamTypesBase.ml                          |   96 +-
 src/core/opamTypesBase.mli                         |   21 +-
 src/core/opamVariable.ml                           |    2 +
 src/core/opamVariable.mli                          |    3 +
 src/core/opamVersion.ml.in                         |   16 +-
 src/core/opamVersion.mli                           |   11 +-
 src/opam.ocp                                       |    4 +-
 src/repositories/opamDarcs.ml                      |   48 +-
 src/repositories/opamGit.ml                        |  131 +-
 src/repositories/opamHTTP.ml                       |  333 +++---
 src/repositories/opamHTTP.mli                      |    2 -
 src/repositories/opamHg.ml                         |   86 +-
 src/repositories/opamLocal.ml                      |  223 ++--
 src/repositories/opamLocal.mli                     |    6 +
 src/repositories/opamVCS.ml                        |  115 +-
 src/repositories/opamVCS.mli                       |   19 +-
 src/solver/opamCudf.ml                             |  285 ++---
 src/solver/opamCudf.mli                            |   24 +-
 src/solver/opamHeuristic.ml                        |   22 +-
 src/solver/opamHeuristic.mli                       |    2 +-
 src/solver/opamSolver.ml                           |  235 ++--
 src/solver/opamSolver.mli                          |   27 +-
 src/tools/opam_installer.ml                        |    1 +
 src/tools/opam_mk_repo.ml                          |   11 +-
 src/tools/opam_stats.ml                            |   22 +-
 tests/compilers/10+a+b.comp                        |    2 +-
 115 files changed, 8374 insertions(+), 4421 deletions(-)

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



More information about the Pkg-ocaml-maint-commits mailing list