[Pkg-ocaml-maint-commits] [ocamlbuild] 02/06: Merge tag 'upstream/0.11.0'

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository ocamlbuild.

commit 00f4c1a21ab4d7c0321ce4ececcf259a2f7237b0
Merge: 3e3dd50 0d76abf
Author: Ximin Luo <infinity0 at debian.org>
Date:   Thu Jul 6 22:08:40 2017 +0200

    Merge tag 'upstream/0.11.0'
    
    Upstream version 0.11.0
    
    # gpg: Signature made Thu 06 Jul 2017 22:08:40 CEST
    # gpg:                using RSA key 3667486A326DB2766D255546860DEF3B8F650B79
    # gpg: Good signature from "Ximin Luo <infinity0 at pwned.gg>" [ultimate]
    # gpg:                 aka "Ximin Luo <infinity0 at torproject.org>" [ultimate]
    # gpg:                 aka "Ximin Luo <infinity0 at freenetproject.org>" [ultimate]
    # gpg:                 aka "Ximin Luo <infinity0 at debian.org>" [ultimate]
    # gpg:                 aka "Satoshi Nakamoto (www.bitcoin.org) <satoshin at gmx.com>" [ultimate]

 .gitignore                          |   4 ++
 .mailmap                            |   2 +
 .travis.yml                         |  29 +++++++++
 Changes                             |  74 +++++++++++++----------
 META                                |   2 +-
 Makefile                            |  99 ++++++++++++++++++-------------
 VERSION                             |   2 +-
 examples/01-simple/Makefile         |   4 +-
 examples/01-simple/main.ml          |   2 +-
 examples/02-subdirs/Makefile        |   2 +-
 examples/02-subdirs/src/main.ml     |   2 +-
 examples/03-packages/Makefile       |   6 +-
 examples/03-packages/src/main.ml    |   4 +-
 examples/04-library/Makefile        |   4 +-
 examples/04-library/src/main.ml     |   4 +-
 examples/05-lex-yacc/Makefile       |   2 +-
 examples/05-lex-yacc/src/main.ml    |   2 +-
 examples/05-lex-yacc/src/parser.mly |   4 +-
 examples/06-ocamldoc/Makefile       |   2 +-
 examples/06-ocamldoc/src/main.ml    |   2 +-
 examples/Makefile                   |   2 +-
 howto/release.adoc                  |  12 ++++
 manual/manual.adoc                  |   3 +-
 src/ocaml_compiler.ml               |  13 +++--
 src/ocaml_specific.ml               |  14 +++--
 src/options.ml                      |  74 +++++++++++++++--------
 src/param_tags.mli                  |   2 +-
 src/plugin.ml                       |  11 ++--
 src/rule.ml                         |   6 +-
 src/signatures.mli                  |   3 +
 testsuite/README                    |   2 +-
 testsuite/external.ml               |  24 ++++++++
 testsuite/findlibonly.ml            |  17 ------
 testsuite/internal.ml               |  26 +++++++++
 testsuite/internal_test_header.ml   |   2 -
 testsuite/ocamlbuild_test.ml        | 113 ++++++++++++++++++++++++++----------
 36 files changed, 388 insertions(+), 188 deletions(-)

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