[Pkg-ocaml-maint-commits] [opam] 02/04: Merge tag 'upstream/1.1.0'

Mehdi Dogguy mehdi at moszumanska.debian.org
Sat Nov 23 14:55:41 UTC 2013


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

mehdi pushed a commit to branch master
in repository opam.

commit 8d48ab742323a17e7d92e08751a0fb352c7c0089
Merge: 325e850 ab3855b
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sat Nov 23 11:10:47 2013 +0100

    Merge tag 'upstream/1.1.0'
    
    Upstream version 1.1.0

 ._LICENSE                                       |  Bin 204 -> 0 bytes
 .gitignore                                      |   16 +
 .ocp-indent                                     |    1 +
 .travis-ci.sh                                   |   26 +
 .travis.yml                                     |    2 +
 AUTHORS                                         |    5 +-
 CHANGES                                         |   76 +-
 CONTRIBUTORS => CONTRIBUTING                    |    0
 LICENSE                                         |  185 +
 META.in                                         |    4 +-
 Makefile                                        |   41 +-
 README.md                                       |   21 +-
 configure                                       | 4185 ++++++++++++-----------
 configure.ac                                    |   36 +-
 depends.ocp.in                                  |   12 +
 doc/Makefile                                    |   33 +-
 doc/dev-manual/Makefile                         |    6 +-
 doc/dev-manual/dev-manual.css                   |  109 +
 doc/dev-manual/dev-manual.tex                   |  924 ++---
 doc/dev-manual/htmlmacros.hva                   |    1 +
 doc/dev-manual/pdfswitch.sty                    |  140 +
 doc/man-ext/{opam-check.md => opam-check.md.in} |    4 +-
 doc/man-ext/opam-mk-repo.md                     |   22 -
 doc/man/{opam-update.1 => opam-admin-check.1}   |   65 +-
 doc/man/opam-admin-make.1                       |   38 +
 doc/man/opam-admin.1                            |   32 +
 doc/man/opam-check.1                            |    5 +-
 doc/man/opam-config.1                           |   58 +-
 doc/man/opam-help.1                             |    2 +-
 doc/man/opam-info.1                             |   40 +-
 doc/man/opam-init.1                             |   67 +-
 doc/man/opam-install.1                          |   61 +-
 doc/man/opam-list.1                             |   50 +-
 doc/man/opam-mk-repo.1                          |   15 -
 doc/man/opam-pin.1                              |   48 +-
 doc/man/opam-reinstall.1                        |   52 +-
 doc/man/opam-remote.1                           |   42 +-
 doc/man/opam-remove.1                           |   57 +-
 doc/man/opam-repository.1                       |   42 +-
 doc/man/opam-search.1                           |   40 +-
 doc/man/opam-switch.1                           |   64 +-
 doc/man/opam-update.1                           |   58 +-
 doc/man/opam-upgrade.1                          |   50 +-
 doc/man/opam-upload.1                           |   80 -
 doc/man/opam.1                                  |   45 +-
 doc/release/readme.md                           |   19 +
 jenkins/10-opam-prepare.sh                      |   10 +
 opam.install                                    |    2 +-
 shell/bootstrap-ocaml.sh                        |   11 +
 shell/get-git-id.ml                             |   44 +
 shell/get-git-id.sh                             |   11 -
 shell/install.sh                                |    9 -
 shell/make_opam_binary.sh                       |   85 +
 shell/md5check.ml                               |   20 +
 shell/opam_completion.sh                        |    4 +-
 shell/opam_completion_zsh.sh                    |    6 +-
 shell/{opam_install.sh => opam_installer.sh}    |   17 +-
 src/client/client.ocp                           |    3 +-
 src/client/opamAction.ml                        |  534 +--
 src/client/opamAction.mli                       |   33 +-
 src/client/{opamMain.ml => opamArg.ml}          |  724 ++--
 src/client/opamArg.mli                          |  174 +
 src/client/opamClient.ml                        | 1275 +++----
 src/client/opamClient.mli                       |   61 +-
 src/client/opamConfigCommand.ml                 |   98 +-
 src/client/opamConfigCommand.mli                |   31 +-
 src/client/opamMain.ml                          | 1167 +------
 src/client/opamPinCommand.ml                    |  138 +-
 src/client/opamPinCommand.mli                   |   29 +-
 src/client/opamRepositoryCommand.ml             |  545 ++-
 src/client/opamRepositoryCommand.mli            |   51 +-
 src/client/opamSolution.ml                      |  320 +-
 src/client/opamSolution.mli                     |   38 +-
 src/client/opamState.ml                         | 2219 +++++++-----
 src/client/opamState.mli                        |  389 ++-
 src/client/opamSwitchCommand.ml                 |  296 +-
 src/client/opamSwitchCommand.mli                |   35 +-
 src/core/core.ocp                               |    3 +
 src/core/opamCompiler.ml                        |  129 +-
 src/core/opamCompiler.mli                       |   45 +-
 src/core/opamFile.ml                            | 2785 ++++++++-------
 src/core/opamFile.mli                           |  171 +-
 src/core/opamFilename.ml                        |  279 +-
 src/core/opamFilename.mli                       |  101 +-
 src/core/opamFilter.ml                          |  160 +
 src/core/opamFilter.mli                         |   50 +
 src/core/opamFormat.ml                          |  292 +-
 src/core/opamFormat.mli                         |   50 +-
 src/core/opamFormula.ml                         |   29 +-
 src/core/opamFormula.mli                        |   29 +-
 src/core/opamGlobals.ml                         |  244 +-
 src/core/opamJson.ml                            | 1526 +++++++++
 src/core/opamJson.mli                           |  546 +++
 src/core/opamLexer.mll                          |   48 +-
 src/core/opamLineLexer.mll                      |   33 +-
 src/core/opamMisc.ml                            |  201 +-
 src/core/opamMisc.mli                           |   67 +-
 src/core/opamPackage.ml                         |  207 +-
 src/core/opamPackage.mli                        |   76 +-
 src/core/opamParallel.ml                        |  217 +-
 src/core/opamParallel.mli                       |   59 +-
 src/core/opamParser.mly                         |   33 +-
 src/core/opamPath.ml                            |  178 +-
 src/core/opamPath.mli                           |  273 +-
 src/core/opamProcess.ml                         |  119 +-
 src/core/opamProcess.mli                        |   41 +-
 src/core/opamRepository.ml                      |  676 ++--
 src/core/opamRepository.mli                     |  175 +-
 src/core/opamRepositoryName.ml                  |   29 +-
 src/core/opamRepositoryName.mli                 |   29 +-
 src/core/opamSwitch.ml                          |   34 +-
 src/core/opamSwitch.mli                         |   32 +-
 src/core/opamSystem.ml                          |  375 +-
 src/core/opamSystem.mli                         |   72 +-
 src/core/opamTypes.ml                           |  206 +-
 src/core/opamTypes.mli                          |  123 +-
 src/core/opamVariable.ml                        |   49 +-
 src/core/opamVariable.mli                       |   29 +-
 src/core/opamVersion.ml.in                      |   48 +-
 src/core/opamVersion.mli                        |   35 +-
 src/debug.ocp                                   |    2 +
 src/opam.ocp                                    |    2 +
 src/repositories/opamDarcs.ml                   |  222 +-
 src/repositories/opamDarcs.mli                  |   29 +-
 src/repositories/opamGit.ml                     |  237 +-
 src/repositories/opamGit.mli                    |   29 +-
 src/repositories/opamHTTP.ml                    |  283 +-
 src/repositories/opamHTTP.mli                   |   31 +-
 src/repositories/opamHg.ml                      |   95 +
 src/repositories/opamHg.mli                     |   19 +
 src/repositories/opamLocal.ml                   |  230 +-
 src/repositories/opamLocal.mli                  |   29 +-
 src/repositories/opamVCS.ml                     |   98 +
 src/repositories/opamVCS.mli                    |   49 +
 src/repositories/repositories.ocp               |    2 +
 src/scripts/opam_admin.ml                       |   53 +
 src/scripts/opam_check.ml                       |   46 +-
 src/scripts/opam_depexts_change.ml              |   67 +
 src/scripts/opam_mk_repo.ml                     |  285 +-
 src/scripts/opam_mk_repo.mli                    |   19 +
 src/scripts/opam_repo_check.ml                  |  135 +-
 src/scripts/opam_repo_check.mli                 |   19 +
 src/scripts/opam_stats.ml                       |  171 +
 src/scripts/opam_stats.mli                      |   17 +
 src/scripts/scripts.ocp                         |   15 +-
 src/solver/opamCudf.ml                          |  308 +-
 src/solver/opamCudf.mli                         |   61 +-
 src/solver/opamHeuristic.ml                     |  706 ++--
 src/solver/opamHeuristic.mli                    |  155 +-
 src/solver/opamSolver.ml                        |  206 +-
 src/solver/opamSolver.mli                       |   34 +-
 tests/Makefile                                  |   91 +-
 tests/compilers/{10.comp => 10+a+b.comp}        |    2 +-
 tests/compilers/20.comp                         |    2 +-
 tests/packages/P1-1.opam                        |   19 +-
 tests/packages/P1-1/P1.install                  |    5 +-
 tests/packages/P3/myocamlbuild.ml               |    4 +-
 tests/packages/P5.opam                          |    6 +-
 158 files changed, 18014 insertions(+), 10930 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