This is an automated email from the git hooks/post-receive script.
josch-guest pushed a change to branch master
in repository ocp-indent.
from 35522ff do not bump to -3... that'd be useless
new 3818059 Imported Upstream version 1.4.2
new 4cd02f7 Merge tag 'upstream/1.4.2'
new ca92ea1 package new upstream version
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
Makefile | 11 +-
Makefile.simple | 10 +-
configure | 22 ++--
configure.ac | 4 +-
debian/changelog | 17 +++
debian/libocp-indent-lib-ocaml-dev.install.in | 8 +-
debian/libocp-indent-lib-ocaml.install.in | 2 +-
debian/patches/Makefile.simple.patch | 30 -----
debian/patches/fix-Makefile.simple-syntax-error | 16 +++
...let-Makefile.simple-respect-OCAML_HAVE_OCAMLOPT | 60 ++++++++++
.../remove-approx_common-from-Makefile.simple | 33 ++++++
debian/patches/series | 4 +-
debian/rules | 17 ++-
doc/ocp-indent.md | 6 +-
ocp-indent.install | 2 +-
opam | 17 ++-
src/approx_common.mli | 25 ----
src/approx_lexer.mll | 77 +++++-------
src/approx_tokens.ml | 31 ++---
src/indentArgs.ml | 36 ++++--
src/indentArgs.mli | 6 +-
src/indentBlock.ml | 110 +++++++++++++++--
src/indentBlock.mli | 5 +-
src/indentConfig.ml | 68 ++++++++---
src/indentConfig.mli | 10 +-
src/indentExtend.ml | 58 +++++++++
src/indentExtend.mli | 31 +++++
src/indentLoader.ml | 60 ++++++++++
src/indentLoader.mli | 15 +++
src/indentMain.ml | 28 +++--
src/indentPrinter.ml | 5 +-
src/indentPrinter.mli | 5 +-
src/nstream.ml | 17 ++-
src/nstream.mli | 7 +-
src/ocp-indent.ocp | 20 +++-
src/pos.ml | 5 +-
src/pos.mli | 5 +-
src/util.ml | 5 +-
tests/failing-output/js-record.ml | 2 +-
tests/failing-output/js-try.ml | 5 +
tests/failing-output/js-upon.ml | 13 +++
tests/failing-output/lwt.ml | 24 ++++
tests/failing.html | 66 ++++++++++-
tests/failing/js-try.ml | 5 +
tests/failing/{js-args.ml.opts => js-try.ml.opts} | 0
tests/failing/js-upon.ml | 13 +++
tests/failing/{js-args.ml.opts => js-upon.ml.opts} | 0
tests/failing/lwt.ml | 24 ++++
tests/{passing => failing}/lwt.ml.opts | 0
tests/passing/embedded-match.ml | 17 +++
tests/passing/lwt.ml | 12 --
tests/passing/ppx_expr_ext.ml | 130 +++++++++++++++++++++
tests/passing/ppx_stritem_ext.ml | 96 +++++++++++++++
tests/test.sh | 13 +++
tools/ocp-indent.el | 52 +++++++--
tools/ocp-indent.vim | 16 ++-
tools/tuareg-indent | 12 ++
57 files changed, 1120 insertions(+), 268 deletions(-)
delete mode 100644 debian/patches/Makefile.simple.patch
create mode 100644 debian/patches/fix-Makefile.simple-syntax-error
create mode 100644
debian/patches/let-Makefile.simple-respect-OCAML_HAVE_OCAMLOPT
create mode 100644 debian/patches/remove-approx_common-from-Makefile.simple
delete mode 100644 src/approx_common.mli
create mode 100644 src/indentExtend.ml
create mode 100644 src/indentExtend.mli
create mode 100644 src/indentLoader.ml
create mode 100644 src/indentLoader.mli
create mode 100644 tests/failing-output/js-try.ml
create mode 100644 tests/failing-output/js-upon.ml
create mode 100644 tests/failing-output/lwt.ml
create mode 100644 tests/failing/js-try.ml
copy tests/failing/{js-args.ml.opts => js-try.ml.opts} (100%)
create mode 100644 tests/failing/js-upon.ml
copy tests/failing/{js-args.ml.opts => js-upon.ml.opts} (100%)
create mode 100644 tests/failing/lwt.ml
rename tests/{passing => failing}/lwt.ml.opts (100%)
delete mode 100644 tests/passing/lwt.ml
create mode 100644 tests/passing/ppx_expr_ext.ml
create mode 100644 tests/passing/ppx_stritem_ext.ml
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocp-indent.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
