This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch master in repository opam.
commit f3d6a8e075fcb71546d9befed0dfc539231bb112 Merge: f52b06e d7d402a Author: Mehdi Dogguy <me...@debian.org> Date: Wed Oct 22 22:39:17 2014 +0200 Merge tag 'upstream/1.2.0_rc4' Upstream version 1.2.0~rc4 .gitignore | 50 +- .ocp-indent | 3 +- .travis-ci.sh | 56 +- .travis.yml | 27 +- AUTHORS | 3 +- CHANGES | 86 + META.in | 13 +- Makefile | 284 +-- Makefile.config.in | 26 +- OCamlMakefile | 1299 ++++++++++++++ README.md | 91 +- admin-scripts/Makefile | 4 + admin-scripts/add-build-deps.ml | 27 + admin-scripts/add-github-dev.ml | 27 + admin-scripts/cudf-debug.ml | 35 + admin-scripts/depopts_to_conflicts.ml | 71 + admin-scripts/lint.ml | 13 + admin-scripts/remove_notequals.ml | 25 + admin-scripts/to_1_1.ml | 51 + appveyor.yml | 26 + configure | 1171 ++++++------ configure.ac | 67 +- depends.ocp.in | 61 - doc/Makefile | 58 +- doc/design/metadata-evolution | 184 ++ doc/dev-manual/Makefile | 4 +- doc/dev-manual/dev-manual.tex | 344 ++-- doc/man-ext/opam-check.md.in | 23 - doc/man/opam-admin-check.1 | 59 - doc/man/opam-admin-make.1 | 41 - doc/man/opam-admin.1 | 32 - doc/man/opam-check.1 | 18 - doc/man/opam-config.1 | 186 -- doc/man/opam-help.1 | 31 - doc/man/opam-info.1 | 68 - doc/man/opam-init.1 | 173 -- doc/man/opam-install.1 | 143 -- doc/man/opam-list.1 | 118 -- doc/man/opam-pin.1 | 123 -- doc/man/opam-reinstall.1 | 132 -- doc/man/opam-remote.1 | 74 - doc/man/opam-remove.1 | 138 -- doc/man/opam-repository.1 | 121 -- doc/man/opam-search.1 | 115 -- doc/man/opam-show.1 | 106 -- doc/man/opam-switch.1 | 177 -- doc/man/opam-uninstall.1 | 104 -- doc/man/opam-update.1 | 114 -- doc/man/opam-upgrade.1 | 132 -- doc/man/opam.1 | 151 -- doc/pages/FAQ.md | 207 +++ doc/pages/Install.md | 129 ++ doc/pages/Packaging.md | 303 ++++ doc/pages/Specifying_Solver_Preferences.md | 91 + doc/pages/Usage.md | 157 ++ doc/pages/index.md | 3 + doc/pages/index.menu | 14 + doc/release/readme.md | 42 +- jenkins/10-opam-prepare.sh | 130 -- jenkins/10-opam-source-install.sh | 19 - jenkins/11-ocaml-install.sh | 10 - jenkins/20-opam-init.sh | 10 - jenkins/30-opam-packages.sh | 30 - jenkins/31-opam-mirage-packages.sh | 17 - opam | 17 + opam-lib.install | 110 ++ opam.install | 28 +- shell/bootstrap-ocaml.sh | 13 +- shell/get-git-id.ml | 16 +- shell/make_opam_binary.sh | 85 - shell/opam_completion.sh | 225 ++- shell/opam_completion_zsh.sh | 212 ++- shell/opam_installer.sh | 138 +- shell/release.sh | 159 ++ src/Makefile | 269 +++ src/client/client.ocp | 2 - src/client/opamAction.ml | 582 +++--- src/client/opamAction.mli | 29 +- src/client/opamArg.ml | 1383 +++++++++----- src/client/opamArg.mli | 10 +- src/client/opamClient.ml | 1662 +++++++++++------ src/client/opamClient.mli | 54 +- src/client/opamConfigCommand.ml | 286 +-- src/client/opamConfigCommand.mli | 15 +- src/client/opamMain.ml | 2 +- src/client/opamPinCommand.ml | 357 ++-- src/client/opamPinCommand.mli | 16 +- src/client/opamRepositoryCommand.ml | 218 ++- src/client/opamRepositoryCommand.mli | 5 + src/client/opamSolution.ml | 531 +++--- src/client/opamSolution.mli | 36 +- src/client/opamState.ml | 1889 +++++++++++++------- src/client/opamState.mli | 101 +- src/client/opamSwitchCommand.ml | 311 ++-- src/client/opamSwitchCommand.mli | 13 +- src/core/core.ocp | 18 +- src/core/opamActionGraph.ml | 46 + .../opamHTTP.mli => core/opamActionGraph.mli} | 14 +- src/core/opamCompiler.ml | 5 +- src/core/opamFile.ml | 1588 +++++++++------- src/core/opamFile.mli | 147 +- src/core/opamFilename.ml | 86 +- src/core/opamFilename.mli | 24 +- src/core/opamFilter.ml | 111 +- src/core/opamFilter.mli | 5 +- src/core/opamFormat.ml | 720 ++++---- src/core/opamFormat.mli | 52 +- src/core/opamFormula.ml | 109 +- src/core/opamFormula.mli | 44 +- .../opam_stats.mli => core/opamGitVersion.mli} | 4 +- src/core/opamGlobals.ml | 229 ++- src/core/opamGlobals.mli | 177 ++ src/core/opamJson.ml | 1430 +-------------- src/core/opamJson.mli | 513 +----- src/{scripts/opam_stats.mli => core/opamLexer.mli} | 2 +- src/core/opamLexer.mll | 20 +- .../opam_stats.mli => core/opamLineLexer.mli} | 2 +- src/core/opamLineLexer.mll | 51 +- src/core/opamMisc.ml | 157 +- src/core/opamMisc.mli | 84 +- src/core/opamPackage.ml | 96 +- src/core/opamPackage.mli | 30 +- src/core/opamParallel.ml | 133 +- src/core/opamParallel.mli | 38 +- src/core/opamParser.mly | 73 +- src/core/opamPath.ml | 18 +- src/core/opamPath.mli | 22 +- src/core/opamProcess.ml | 19 +- src/core/opamProcess.mli | 6 +- src/core/opamRepository.ml | 59 +- src/core/opamRepository.mli | 10 +- .../opam_mk_repo.mli => core/opamScript.mli} | 6 +- src/core/opamSystem.ml | 273 ++- src/core/opamSystem.mli | 51 +- src/core/opamTypes.ml | 583 ------ src/core/opamTypes.mli | 230 +-- src/core/opamTypesBase.ml | 245 +++ src/core/opamTypesBase.mli | 106 ++ src/core/opamVariable.ml | 104 +- src/core/opamVariable.mli | 53 +- src/core/opamVersion.ml.in | 17 +- src/core/opamVersion.mli | 9 + src/opam.ocp | 4 +- src/repositories/opamGit.ml | 78 +- src/repositories/opamHTTP.ml | 156 +- src/repositories/opamHTTP.mli | 2 + src/repositories/opamHg.ml | 4 +- src/repositories/opamLocal.ml | 140 +- src/repositories/opamVCS.ml | 15 +- src/repositories/repositories.ocp | 2 - src/solver/opamCudf.ml | 1075 +++++++---- src/solver/opamCudf.mli | 108 +- src/solver/opamHeuristic.ml | 262 +-- src/solver/opamHeuristic.mli | 18 +- src/solver/opamSolver.ml | 568 +++--- src/solver/opamSolver.mli | 33 +- src/solver/solver.ocp | 2 - src/{scripts => tools}/opam_admin.ml | 15 +- src/tools/opam_admin_top.ml | 179 ++ src/tools/opam_admin_top.mli | 60 + src/{scripts => tools}/opam_check.ml | 1 + src/{scripts => tools}/opam_depexts_change.ml | 10 +- src/tools/opam_findlib.ml | 205 +++ src/{scripts => tools}/opam_installer.ml | 177 +- src/{scripts => tools}/opam_mk_repo.ml | 64 +- src/{scripts => tools}/opam_mk_repo.mli | 0 src/tools/opam_rename.ml | 89 + src/{scripts => tools}/opam_repo_check.ml | 4 +- src/{scripts => tools}/opam_repo_check.mli | 0 src/{scripts => tools}/opam_stats.ml | 0 src/{scripts => tools}/opam_stats.mli | 0 src/tools/opamlfind.ml | 83 + src/{scripts/scripts.ocp => tools/tools.ocp} | 11 +- tests/Makefile | 143 +- tests/packages/P1-1/P1.config.in | 17 +- tests/packages/P1-2/P1.config.in | 17 +- tests/packages/P2/P2.config.in | 12 +- tests/packages/P2/build.sh | 7 +- tests/packages/P2/config.in | 4 +- tests/packages/P3/P3.config.in | 20 +- tests/packages/P3/myocamlbuild.ml | 20 +- tests/packages/P4/P4.install | 4 +- tests/packages/P4/build.sh | 10 +- tests/packages/P5.opam | 2 +- tests/packages/P5/build.sh | 2 +- 185 files changed, 15503 insertions(+), 12360 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/opam.git _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits