This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository oasis.
commit 0a85330508c1ba9a69c21cbb90e428b64be65f45 Merge: 16cba25 f435036 Author: Stephane Glondu <st...@glondu.net> Date: Mon May 4 07:33:01 2015 -0300 Merge tag 'upstream/0.4.5' Upstream version 0.4.5 CHANGES.txt | 43 +++++++++- Makefile | 3 + _oasis | 6 +- setup.ml | 29 ++++--- src/ext/plugin-loader/src/META | 4 +- .../plugin-loader/test/data/findlib/plugin1/META | 4 +- .../plugin-loader/test/data/findlib/plugin2/META | 4 +- .../plugin-loader/test/data/findlib/plugin3/META | 4 +- .../test/data/findlib/pluginloaderLib/META | 4 +- src/ext/userconf/src/META | 4 +- src/oasis/META | 12 +-- src/oasis/OASISFeatures.ml | 7 ++ src/oasis/OASISFileTemplate.ml | 15 ++-- src/oasis/OASISFindlib.ml | 14 +-- src/oasis/OASISLibrary.ml | 32 ++++--- src/oasis/OASISString.ml | 9 +- src/plugins/extra/devfiles/DevFilesPlugin.ml | 2 +- src/plugins/internal/InternalInstallPlugin.ml | 99 +++++++++++++--------- src/plugins/ocamlbuild/MyOCamlbuildBase.ml | 13 +-- src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml | 65 ++++++++------ src/plugins/ocamlbuild/OCamlbuildCommon.ml | 5 ++ src/plugins/ocamlbuild/OCamlbuildPlugin.ml | 10 ++- test/TestFull.ml | 47 +++++++--- test/TestFullUtils.ml | 6 ++ test/TestOCamlbuild.ml | 77 +++++++++++++++++ test/data/TestOCamlbuild/env-tags/A.ml | 22 +++++ test/data/TestOCamlbuild/env-tags/_oasis | 13 +++ test/data/TestOCamlbuild/env-tags/myocamlbuild.ml | 36 ++++++++ test/data/TestOCamlbuild/external-c-rebuild/A.ml | 24 ++++++ test/data/TestOCamlbuild/external-c-rebuild/B.ml | 25 ++++++ test/data/TestOCamlbuild/external-c-rebuild/_oasis | 23 +++++ .../TestOCamlbuild/external-c-rebuild/c_source.c | 27 ++++++ .../TestOCamlbuild/external-c-rebuild/header.h | 27 ++++++ 33 files changed, 556 insertions(+), 159 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/oasis.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