This is an automated email from the git hooks/post-receive script.
mehdi pushed a commit to branch master
in repository opam.
commit 1070f15c4fee1dfe2b61cfd5e1e98f602f27af88
Merge: c6d93ac 9c68421
Author: Mehdi Dogguy <me...@debian.org>
Date: Sun Feb 2 10:48:15 2014 +0100
Merge tag 'upstream/1.1.1'
Upstream version 1.1.1
.travis-ci.sh | 64 ++++--
.travis.yml | 5 +
CHANGES | 29 +++
CONTRIBUTING | 16 --
CONTRIBUTING.md | 16 ++
Makefile | 5 +-
configure | 22 +--
configure.ac | 4 +-
doc/dev-manual/Makefile | 3 +
doc/dev-manual/dev-manual.tex | 20 +-
doc/man/opam-admin-check.1 | 2 +-
doc/man/opam-admin-make.1 | 5 +-
doc/man/opam-admin.1 | 2 +-
doc/man/opam-check.1 | 6 +-
doc/man/opam-config.1 | 5 +-
doc/man/opam-help.1 | 2 +-
doc/man/opam-info.1 | 66 ++-----
doc/man/opam-init.1 | 2 +-
doc/man/opam-install.1 | 2 +-
doc/man/opam-list.1 | 2 +-
doc/man/opam-pin.1 | 2 +-
doc/man/opam-reinstall.1 | 2 +-
doc/man/opam-remote.1 | 89 ++-------
doc/man/opam-remove.1 | 2 +-
doc/man/opam-repository.1 | 2 +-
doc/man/opam-search.1 | 2 +-
doc/man/{opam-info.1 => opam-show.1} | 6 +-
doc/man/opam-switch.1 | 4 +-
doc/man/{opam-reinstall.1 => opam-uninstall.1} | 132 +++++--------
doc/man/opam-update.1 | 2 +-
doc/man/opam-upgrade.1 | 2 +-
doc/man/opam.1 | 21 +-
src/client/opamAction.ml | 31 ++-
src/client/opamAction.mli | 2 +-
src/client/opamArg.ml | 87 +++++++--
src/client/opamArg.mli | 14 +-
src/client/opamClient.ml | 41 +++-
src/client/opamMain.ml | 12 --
src/client/opamRepositoryCommand.ml | 40 ++--
src/client/opamState.ml | 68 ++++---
src/core/opamCompiler.ml | 13 +-
src/core/opamCompiler.mli | 4 +-
src/core/opamFile.ml | 62 +++---
src/core/opamFormat.ml | 96 ++++-----
src/core/opamFormat.mli | 16 +-
src/core/opamFormula.ml | 19 +-
src/core/opamFormula.mli | 18 +-
src/core/opamGlobals.ml | 2 +-
src/core/opamLineLexer.mll | 30 ++-
src/core/opamPackage.ml | 3 +-
src/core/opamPackage.mli | 3 +
src/core/opamRepository.ml | 21 +-
src/core/opamRepository.mli | 3 +
src/core/opamSystem.ml | 32 ++-
src/core/opamTypes.ml | 2 +-
src/core/opamTypes.mli | 2 +-
src/repositories/opamLocal.ml | 1 +
src/scripts/opam_installer.ml | 260 +++++++++++++++++++++++++
src/scripts/opam_mk_repo.ml | 86 ++++++--
src/scripts/opam_stats.ml | 6 +-
src/scripts/scripts.ocp | 7 +
src/solver/opamCudf.ml | 2 +-
src/solver/opamSolver.ml | 33 ++--
src/solver/opamSolver.mli | 4 +-
64 files changed, 995 insertions(+), 569 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
