Stephane Glondu · Stephane Glondu · Stephane Glondu · Stephane Glondu · Stephane Glondu · Stephane Glondu
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
+* @diml
--- a/.gitignore
+++ b/.gitignore
 _build/
-/lambda-term-*.tar.gz
-/setup.data
-/setup.log
-/setup.exe
-/setup-dev.exe
-/man/*.gz
-/src/lTerm_config.h
-*.swp
-*.native
-/lambda-term-api.docdir
-*~
+*.merlin
+*.install
--- a/.merlin
+++ b/.merlin
-S src/
-S src/widget_impl/
-S examples/
-
-B _build/src
-B _build/src/widget_impl/
-B _build/examples
-
-PKG lwt
-PKG lwt.unix
-PKG lwt.react
-PKG zed
-
-EXT lwt
--- a/.travis.yml
+++ b/.travis.yml
+language: c
+sudo: required
+install: wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-opam.sh
+script: bash -ex .travis-opam.sh
+env:
+  - OCAML_VERSION=4.02
+  - OCAML_VERSION=4.03
+  - OCAML_VERSION=4.04
+  - OCAML_VERSION=4.05
+  - OCAML_VERSION=4.06
+  - OCAML_VERSION=4.07
+os:
+  - linux
+  - osx
--- a/CHANGES.md
+++ b/CHANGES.md
+2.0.2 (2019-08-09)
+------------------
+
+LTerm\_history: catch and log `Zed_string.Invalid` exception
+
+2.0.1 (2019-06-17)
+------------------
+
+* fix windows build (@db4, #72)
+* expand zchar before writing to windows console (@kandu, #75)
+
+2.0 (2019-05-17)
+----------------
+
+### Breaking
+
+* LTerm\_draw: type `point` is redefined to use `Zed_char.t` as the essential element to support wide, combined glyph
+* functions and methods: change parameter type from `UChar.t` or `Zed_utf8.t` to `Zed_char.t` or `Zed_string.t`
+* LTerm\_text
+  * function `of_string` is renamed to `of_utf8`
+  * function `of_string_maybe_invalid` is renamed to `of_utf8_maybe_invalid`
+  * the new `of_string` function is of type `Zed_string.t -> t`
+  * the new `of_string_maybe_invalid` function is of type `Zed_string.t -> t`
+
+### General
+
+* depend on zed 2
+* Lterm\_draw, LTerm\_widget, LTerm\_read\_line refactored to support wide, combined glyphs
+* add name to dune-project (Hannes Mehnert, #70)
+* port to dune (Jérémie Dimino, #69)
+* README: Add Travis badge (Kevin Ji, #66)
+* Add travis config (Anurag Soni, #65)
+* opam: update homepage, bug-reports and dev-repo fields (Jérémie Dimino)
+
+1.13 (2018-06-01)
+-----------------
+
+* Make lambda-term compatible with Lwt 4 and Camomile 1 (#63,
+  @ncihnegn)
+
+1.12 (2017-11-05)
+-----------------
+
+* Fix: copy & pasting the terminal output doesn't adds many spaces
+  after the end of lines (#52, Deokhwan Kim, fixes diml/utop#186)
+
+* -safe-string compatibility (#54)
+
+1.11 (2017-04-04)
+-----------------
+
+* Add history-search-prev and history-search-next (#47, Fabian Hemmer)
+* Allow frame widgets to be labeled (#36, Andrew Ray)
+* Add an alignment setting to label widgets (#36, Andrew Ray)
+* Add scrollbar widgets (#33, Andrew Ray)
+* Improve the `lambda-term-inputrc.5` man page (#41, Léon van Velzen)
+* Allow editor widgets to request a specific size and add a "double
+  editor" example (#42, Fabian Bonk)
+* Add `^` to the list of characters recognized in inputrc files (#46,
+  github user zhenya1007)
+* Switch the build to jbuilder
+* Drop compatibility with 4.01
+
 1.10.1 (2016-08-15)
 -------------------


--- a/Makefile
+++ b/Makefile
-# Makefile
-# --------
-# Copyright : (c) 2012, Jeremie Dimino <jeremie@dimino.org>
-# Licence   : BSD3
-#
-# Generic Makefile for oasis project
+INSTALL_ARGS := $(if $(PREFIX),--prefix $(PREFIX),)

-# Set to setup.exe for the release
-SETUP := setup.exe
+.PHONY: all
+all:
+	dune build @install @examples/all

-# Default rule
-default: build
+.PHONY: examples
+examples:
+	dune build @examples/all

-# Setup for the development version
-setup-dev.exe: _oasis setup.ml
-	sed '/^#/D' setup.ml > setup_dev.ml
-	ocamlfind ocamlopt -o $@ -linkpkg -package ocamlbuild,oasis.dynrun setup_dev.ml || \
-	  ocamlfind ocamlc -o $@ -linkpkg -package ocamlbuild,oasis.dynrun setup_dev.ml || true
-	rm -f setup_dev.*
+.PHONY: asciiart
+asciiart:
+	dune build examples/asciiart/asciiart.exe

-# Setup for the release
-setup.exe: setup.ml
-	ocamlopt.opt -o $@ $< || ocamlopt -o $@ $< || ocamlc -o $@ $<
-	rm -f setup.cmx setup.cmi setup.o setup.obj setup.cmo
+.PHONY: install
+install:
+	dune install $(INSTALL_ARGS)

-build: $(SETUP) setup.data
-	./$(SETUP) -build $(BUILDFLAGS)
+.PHONY: uninstall
+uninstall:
+	dune uninstall $(INSTALL_ARGS)

-doc: $(SETUP) setup.data build
-	./$(SETUP) -doc $(DOCFLAGS)
+.PHONY: reinstall
+reinstall:
+	$(MAKE) uninstall
+	$(MAKE) install

-test: $(SETUP) setup.data build
-	./$(SETUP) -test $(TESTFLAGS)
+.PHONY: test
+test:
+	dune runtest

-all: $(SETUP)
-	./$(SETUP) -all $(ALLFLAGS)
+.PHONY: all-supported-ocaml-versions
+all-supported-ocaml-versions:
+	dune build @install @examples/all @runtest --workspace dune-workspace.dev

-install: $(SETUP) setup.data
-	ocamlfind remove lambda-term 2>/dev/null || true
-	./$(SETUP) -install $(INSTALLFLAGS)
-
-uninstall: $(SETUP) setup.data
-	./$(SETUP) -uninstall $(UNINSTALLFLAGS)
-
-reinstall: $(SETUP) setup.data
-	ocamlfind remove lambda-term 2>/dev/null || true
-	./$(SETUP) -reinstall $(REINSTALLFLAGS)
-
-clean: $(SETUP)
-	./$(SETUP) -clean $(CLEANFLAGS)
-
-distclean: $(SETUP)
-	./$(SETUP) -distclean $(DISTCLEANFLAGS)
-
-configure: $(SETUP)
-	./$(SETUP) -configure $(CONFIGUREFLAGS)
-
-setup.data: $(SETUP)
-	./$(SETUP) -configure $(CONFIGUREFLAGS)
-
-.PHONY: default build doc test all install uninstall reinstall clean distclean configure
+.PHONY: clean
+clean:
+	dune clean
--- a/README.md
+++ b/README.md
 Lambda-Term
 ===========

+[![Build Status](https://travis-ci.org/ocaml-community/lambda-term.svg?branch=master)](https://travis-ci.org/ocaml-community/lambda-term)
+
 Lambda-Term is a cross-platform library for manipulating the
 terminal. It provides an abstraction for keys, mouse events, colors,
 as well as a set of widgets to write curses-like applications.
@@ -13,42 +15,49 @@ a C library.
 Lambda-Term integrates with zed to provide text edition facilities in
 console applications.

-Dependencies
------------
-
-* [OCaml](http://caml.inria.fr/ocaml/) (>= 3.12)
-* [findlib](http://projects.camlcity.org/projects/findlib.html)
-* [react](http://erratique.ch/software/react)
-* [lwt](http://ocsigen.org/lwt/) (>= 2.4.0) built with react support
-* [Camomile](http://github.com/yoriyuki/Camomile) (>= 0.8)
-* [zed](http://github.com/diml/zed) (>= 1.2)
-
-For building the development version, you also need to install
-[oasis](http://oasis.forge.ocamlcore.org/) (>= 0.3.0).
-
 Installation
 ------------

 To build and install Lambda-Term:

-    $ ./configure
-    $ make
-    $ make install
+    $ dune build
+    $ dune install

-### Documentation and manual pages _(optional)_
+Note that this will build Lambda-Term using the development build
+profile which has strict compilation flags. If the build fails, try
+passing `--profile=release` to `dune` or alternatively create a
+`dune-workspace` file with the following contents:
+
+    (lang dune 1.1)
+    (profile release)
+
+### HTML API Documentation _(optional)_

 To build the documentation:

-    $ make doc
+    $ dune build @doc

-It will then be installed by `make install`.
+You can then consult it by openning
+`_build/default/_doc/_html/index.html`.

 ### Tests _(optional)_

 To build and execute tests:

-    $ ./configure --enable-tests
-    $ make test
+    $ dune runtest
+
+### Examples _(optional)_
+
+To build the examples:
+
+    $ dune build @examples
+
+Binaries for the examples will be in `_build/default/examples`.
+
+The `asciiart` example is not built by default as it as an additional
+dependency on the `camlimages` library. To build it run:
+
+    $ dune build examples/asciiart/asciiart.exe

 Terminal emulators compatibility
 --------------------------------
@@ -81,6 +90,19 @@ You can then send the result to jeremie@dimino.org, including:
 * the contents of the `TERM` environment variable inside the terminal (`echo $TERM`),
 * the output of `print_sequences.ml` with, for each line, the keystroke.

+Key bindings
+------------
+
+Key bindings can be set in `~/.lambda-term-inputrc`. See
+[lambda-term-inputrc](lambda-term-inputrc). Useful mappings:
+
+```
+# This allows zsh-like searching the history by pressing up/down
+[read-line]
+up: history-search-prev
+down: history-search-next
+```
+
 Main modules
 ------------


--- a/_oasis
+++ b/_oasis
-# +-------------------------------------------------------------------+
-# | Package parameters                                                |
-# +-------------------------------------------------------------------+
-
-OASISFormat: 0.4
-OCamlVersion: >= 3.12
-Name: lambda-term
-Version: 1.10.1
-LicenseFile: LICENSE
-License: BSD-3-CLAUSE
-Authors: Jeremie Dimino
-Maintainers: Jeremie Dimino <jeremie@dimino.org>
-Homepage: http://lambda-term.forge.ocamlcore.org/
-BuildTools: ocamlbuild
-Plugins: DevFiles (0.4), META (0.4)
-XDevFilesEnableMakefile: false
-Synopsis: Terminal manipulation library for OCaml
-Description:
-  Lambda-term is a cross-platform library for manipulating the
-  terminal. It provides an abstraction for keys, mouse events, colors,
-  as well as a set of widgets to write curses-like applications.
-  .
-  The main objective of lambda-term is to provide a higher level
-  functional interface to terminal manipulation than, for example,
-  ncurses, by providing a native OCaml interface instead of bindings to
-  a C library.
-  .
-  Lambda-term integrates with zed to provide text edition facilities in
-  console applications.
-
-FilesAB: src/lTerm_config.h.ab
-
-Flag examples
-  Description: build examples
-  Default: true
-
-# +-------------------------------------------------------------------+
-# | The library                                                       |
-# +-------------------------------------------------------------------+
-
-Library "lambda-term"
-  FindlibName: lambda-term
-  BuildDepends:
-    lwt (>= 2.4.0),
-    lwt.unix,
-    lwt.react,
-    zed (>= 1.2)
-  XMETADescription: Cross-platform library for terminal manipulation
-  Path: src
-  Install: true
-  Modules:
-    LTerm,
-    LTerm_key,
-    LTerm_event,
-    LTerm_unix,
-    LTerm_windows,
-    LTerm_style,
-    LTerm_geom,
-    LTerm_draw,
-    LTerm_mouse,
-    LTerm_widget,
-    LTerm_widget_callbacks,
-    LTerm_edit,
-    LTerm_read_line,
-    LTerm_text,
-    LTerm_ui,
-    LTerm_resources,
-    LTerm_inputrc,
-    LTerm_history
-  InternalModules:
-    LTerm_color_mappings,
-    LTerm_resource_lexer,
-    widget_impl/LTerm_widget_base_impl,
-    widget_impl/LTerm_buttons_impl,
-    widget_impl/LTerm_containers_impl,
-    widget_impl/LTerm_running_impl,
-    widget_impl/LTerm_toplevel_impl
-  CSources:
-    lTerm_config.h,
-    lTerm_term_stubs.c,
-    lTerm_unix_stubs.c,
-    lTerm_windows_stubs.c
-  CCOpt: -I$pkg_lwt
-  if system(openbsd)
-    CCOpt+: -I/usr/local/include
-    CCLib: -L/usr/local/lib -lcharset
-
-# +-------------------------------------------------------------------+
-# | Examples                                                          |
-# +-------------------------------------------------------------------+
-
-Executable events
-  Path: examples
-  Install: false
-  CompiledObject: best
-  MainIs: events.ml
-  BuildDepends: lambda-term
-  Build$: flag(examples)
-
-Executable colors
-  Path: examples
-  Install: false
-  CompiledObject: best
-  MainIs: colors.ml
-  BuildDepends: lambda-term
-  Build$: flag(examples)
-
-Executable colors_256
-  Path: examples
-  Install: false
-  CompiledObject: best
-  MainIs: colors_256.ml
-  BuildDepends: lambda-term
-  Build$: flag(examples)
-
-Executable rgb
-  Path: examples
-  Install: false
-  CompiledObject: best
-  MainIs: rgb.ml
-  BuildDepends: lambda-term
-  Build$: flag(examples)
-
-Executable move
-  Path: examples
-  Install: false
-  CompiledObject: best
-  MainIs: move.ml
-  BuildDepends: lambda-term
-  Build$: flag(examples)
-
-Executable hello
-  Path: examples
-  Install: false
-  CompiledObject: best
-  MainIs: hello.ml
-  BuildDepends: lambda-term
-  Build$: flag(examples)
-
-Executable clock
-  Path: examples
-  Install: false
-  CompiledObject: best
-  MainIs: clock.ml
-  BuildDepends: lambda-term
-  Build$: flag(examples)
-
-Executable buttons
-  Path: examples
-  Install: false
-  CompiledObject: best
-  MainIs: buttons.ml
-  BuildDepends: lambda-term
-  Build$: flag(examples)
-
-Executable focus
-  Path: examples
-  Install: false
-  CompiledObject: best
-  MainIs: focus.ml
-  BuildDepends: lambda-term
-  Build$: flag(examples)
-
-Executable checkbuttons
-  Path: examples
-  Install: false
-  CompiledObject: best
-  MainIs: checkbuttons.ml
-  BuildDepends: lambda-term
-  Build$: flag(examples)
-
-Executable radiobuttons
-  Path: examples
-  Install: false
-  CompiledObject: best
-  MainIs: radiobuttons.ml
-  BuildDepends: lambda-term
-  Build$: flag(examples)
-
-Executable shell
-  Path: examples
-  Install: false
-  CompiledObject: best
-  MainIs: shell.ml
-  BuildDepends: lambda-term, str
-  Build$: flag(examples)
-
-Executable repl
-  Path: examples
-  Install: false
-  CompiledObject: best
-  MainIs: repl.ml
-  BuildDepends: lambda-term
-  Build$: flag(examples)
-
-Executable modal
-  Path: examples
-  Install: false
-  CompiledObject: best
-  MainIs: modal.ml
-  BuildDepends: lambda-term
-  Build$: flag(examples)
-
-Executable "read-password"
-  Path: examples
-  Install: false
-  CompiledObject: best
-  MainIs: read_password.ml
-  BuildDepends: lambda-term
-  Build$: flag(examples)
-
-Executable "read-yes-no"
-  Path: examples
-  Install: false
-  CompiledObject: best
-  MainIs: read_yes_no.ml
-  BuildDepends: lambda-term
-  Build$: flag(examples)
-
-Executable "editor"
-  Path: examples
-  Install: false
-  CompiledObject: best
-  MainIs: editor.ml
-  BuildDepends: lambda-term
-  Build$: flag(examples)
-
-# +-------------------------------------------------------------------+
-# | Utils                                                             |
-# +-------------------------------------------------------------------+
-
-Executable "lambda-term-actions"
-  Path: tools
-  Install: true
-  CompiledObject: best
-  MainIs: lambda_term_actions.ml
-  BuildDepends: lambda-term
-
-# +-------------------------------------------------------------------+
-# | Tests                                                             |
-# +-------------------------------------------------------------------+
-
-Executable "history-stress-test"
-  Path: tests
-  Install: false
-  CompiledObject: best
-  MainIs: history_stress_test.ml
-  BuildDepends: lambda-term
-  Build$: flag(tests)
-
-# +-------------------------------------------------------------------+
-# | Doc                                                               |
-# +-------------------------------------------------------------------+
-
-Document "lambda-term-api"
-  Title: API reference for Lambda-Term
-  Type: ocamlbuild (0.4)
-  Install: true
-  InstallDir: $htmldir/api
-  DataFiles: style.css
-  BuildTools: ocamldoc
-  XOCamlbuildPath: ./
-  XOCamlbuildLibraries: lambda-term
-
-# +-------------------------------------------------------------------+
-# | Manual pages                                                      |
-# +-------------------------------------------------------------------+
-
-Document "lambda-term-actions-man"
-  Type: custom (0.4)
-  Title: Man page for lambda-term-actions
-  Install: true
-  BuildTools: gzip
-  XCustom: $gzip -c man/lambda-term-actions.1 > man/lambda-term-actions.1.gz
-  XCustomClean: $rm man/lambda-term-actions.1.gz
-  DataFiles: man/lambda-term-actions.1.gz
-  InstallDir: $mandir/man1
-
-Document "lambda-term-inputrc-man"
-  Type: custom (0.4)
-  Title: Man page for ~/.lambda-term-inputrc
-  Install: true
-  BuildTools: gzip
-  XCustom: $gzip -c man/lambda-term-inputrc.5 > man/lambda-term-inputrc.5.gz
-  XCustomClean: $rm man/lambda-term-inputrc.5.gz
-  DataFiles: man/lambda-term-inputrc.5.gz
-  InstallDir: $mandir/man5
-
-# +-------------------------------------------------------------------+
-# | Configuration examples                                            |
-# +-------------------------------------------------------------------+
-
-Document "lamda-term-inputrc"
-  Type: custom (0.4)
-  Title: lambda-term-inputrc example
-  XCustom: true
-  Install: true
-  DataFiles: lambda-term-inputrc
-
-Document "lambda-termrc"
-  Type: custom (0.4)
-  Title: lambda-term resource file example
-  XCustom: true
-  Install: true
-  DataFiles: lambda-termrc
-
-# +-------------------------------------------------------------------+
-# | Misc                                                              |
-# +-------------------------------------------------------------------+
-
-SourceRepository head
-  Type: git
-  Location: https://github.com/diml/lambda-term.git
-  Browser: https://github.com/diml/lambda-term
--- a/_tags
+++ b/_tags
-true: bin_annot
-<**/*.ml{,i}>: warn(-40)
-# OASIS_START
-# DO NOT EDIT (digest: f12ba400c7843bbf5596c40bead94720)
-# Ignore VCS directories, you can use the same kind of rule outside
-# OASIS_START/STOP if you want to exclude directories that contains
-# useless stuff for the build process
-true: annot, bin_annot
-<**/.svn>: -traverse
-<**/.svn>: not_hygienic
-".bzr": -traverse
-".bzr": not_hygienic
-".hg": -traverse
-".hg": not_hygienic
-".git": -traverse
-".git": not_hygienic
-"_darcs": -traverse
-"_darcs": not_hygienic
-# Library lambda-term
-"src/lambda-term.cmxs": use_lambda-term
-<src/*.ml{,i,y}>: oasis_library_lambda_term_ccopt
-<src/widget_impl/*.ml{,i,y}>: oasis_library_lambda_term_ccopt
-"src/lTerm_term_stubs.c": oasis_library_lambda_term_ccopt
-"src/lTerm_unix_stubs.c": oasis_library_lambda_term_ccopt
-"src/lTerm_windows_stubs.c": oasis_library_lambda_term_ccopt
-<src/lambda-term.{cma,cmxa}>: oasis_library_lambda_term_cclib
-"src/liblambda-term_stubs.lib": oasis_library_lambda_term_cclib
-"src/dlllambda-term_stubs.dll": oasis_library_lambda_term_cclib
-"src/liblambda-term_stubs.a": oasis_library_lambda_term_cclib
-"src/dlllambda-term_stubs.so": oasis_library_lambda_term_cclib
-<src/lambda-term.{cma,cmxa}>: use_liblambda-term_stubs
-<src/*.ml{,i,y}>: pkg_lwt
-<src/*.ml{,i,y}>: pkg_lwt.react
-<src/*.ml{,i,y}>: pkg_lwt.unix
-<src/*.ml{,i,y}>: pkg_zed
-<src/widget_impl/*.ml{,i,y}>: pkg_lwt
-<src/widget_impl/*.ml{,i,y}>: pkg_lwt.react
-<src/widget_impl/*.ml{,i,y}>: pkg_lwt.unix
-<src/widget_impl/*.ml{,i,y}>: pkg_zed
-"src/lTerm_term_stubs.c": pkg_lwt
-"src/lTerm_term_stubs.c": pkg_lwt.react
-"src/lTerm_term_stubs.c": pkg_lwt.unix
-"src/lTerm_term_stubs.c": pkg_zed
-"src/lTerm_unix_stubs.c": pkg_lwt
-"src/lTerm_unix_stubs.c": pkg_lwt.react
-"src/lTerm_unix_stubs.c": pkg_lwt.unix
-"src/lTerm_unix_stubs.c": pkg_zed
-"src/lTerm_windows_stubs.c": pkg_lwt
-"src/lTerm_windows_stubs.c": pkg_lwt.react
-"src/lTerm_windows_stubs.c": pkg_lwt.unix
-"src/lTerm_windows_stubs.c": pkg_zed
-# Executable events
-<examples/events.{native,byte}>: pkg_lwt
-<examples/events.{native,byte}>: pkg_lwt.react
-<examples/events.{native,byte}>: pkg_lwt.unix
-<examples/events.{native,byte}>: pkg_zed
-<examples/events.{native,byte}>: use_lambda-term
-# Executable colors
-<examples/colors.{native,byte}>: pkg_lwt
-<examples/colors.{native,byte}>: pkg_lwt.react
-<examples/colors.{native,byte}>: pkg_lwt.unix
-<examples/colors.{native,byte}>: pkg_zed
-<examples/colors.{native,byte}>: use_lambda-term
-# Executable colors_256
-<examples/colors_256.{native,byte}>: pkg_lwt
-<examples/colors_256.{native,byte}>: pkg_lwt.react
-<examples/colors_256.{native,byte}>: pkg_lwt.unix
-<examples/colors_256.{native,byte}>: pkg_zed
-<examples/colors_256.{native,byte}>: use_lambda-term
-# Executable rgb
-<examples/rgb.{native,byte}>: pkg_lwt
-<examples/rgb.{native,byte}>: pkg_lwt.react
-<examples/rgb.{native,byte}>: pkg_lwt.unix
-<examples/rgb.{native,byte}>: pkg_zed
-<examples/rgb.{native,byte}>: use_lambda-term
-# Executable move
-<examples/move.{native,byte}>: pkg_lwt
-<examples/move.{native,byte}>: pkg_lwt.react
-<examples/move.{native,byte}>: pkg_lwt.unix
-<examples/move.{native,byte}>: pkg_zed
-<examples/move.{native,byte}>: use_lambda-term
-# Executable hello
-<examples/hello.{native,byte}>: pkg_lwt
-<examples/hello.{native,byte}>: pkg_lwt.react
-<examples/hello.{native,byte}>: pkg_lwt.unix
-<examples/hello.{native,byte}>: pkg_zed
-<examples/hello.{native,byte}>: use_lambda-term
-# Executable clock
-<examples/clock.{native,byte}>: pkg_lwt
-<examples/clock.{native,byte}>: pkg_lwt.react
-<examples/clock.{native,byte}>: pkg_lwt.unix
-<examples/clock.{native,byte}>: pkg_zed
-<examples/clock.{native,byte}>: use_lambda-term
-# Executable buttons
-<examples/buttons.{native,byte}>: pkg_lwt
-<examples/buttons.{native,byte}>: pkg_lwt.react
-<examples/buttons.{native,byte}>: pkg_lwt.unix
-<examples/buttons.{native,byte}>: pkg_zed
-<examples/buttons.{native,byte}>: use_lambda-term
-# Executable focus
-<examples/focus.{native,byte}>: pkg_lwt
-<examples/focus.{native,byte}>: pkg_lwt.react
-<examples/focus.{native,byte}>: pkg_lwt.unix
-<examples/focus.{native,byte}>: pkg_zed
-<examples/focus.{native,byte}>: use_lambda-term
-# Executable checkbuttons
-<examples/checkbuttons.{native,byte}>: pkg_lwt
-<examples/checkbuttons.{native,byte}>: pkg_lwt.react
-<examples/checkbuttons.{native,byte}>: pkg_lwt.unix
-<examples/checkbuttons.{native,byte}>: pkg_zed
-<examples/checkbuttons.{native,byte}>: use_lambda-term
-# Executable radiobuttons
-<examples/radiobuttons.{native,byte}>: pkg_lwt
-<examples/radiobuttons.{native,byte}>: pkg_lwt.react
-<examples/radiobuttons.{native,byte}>: pkg_lwt.unix
-<examples/radiobuttons.{native,byte}>: pkg_zed
-<examples/radiobuttons.{native,byte}>: use_lambda-term
-# Executable shell
-<examples/shell.{native,byte}>: pkg_lwt
-<examples/shell.{native,byte}>: pkg_lwt.react
-<examples/shell.{native,byte}>: pkg_lwt.unix
-<examples/shell.{native,byte}>: pkg_str
-<examples/shell.{native,byte}>: pkg_zed
-<examples/shell.{native,byte}>: use_lambda-term
-<examples/*.ml{,i,y}>: pkg_str
-# Executable repl
-<examples/repl.{native,byte}>: pkg_lwt
-<examples/repl.{native,byte}>: pkg_lwt.react
-<examples/repl.{native,byte}>: pkg_lwt.unix
-<examples/repl.{native,byte}>: pkg_zed
-<examples/repl.{native,byte}>: use_lambda-term
-# Executable modal
-<examples/modal.{native,byte}>: pkg_lwt
-<examples/modal.{native,byte}>: pkg_lwt.react
-<examples/modal.{native,byte}>: pkg_lwt.unix
-<examples/modal.{native,byte}>: pkg_zed
-<examples/modal.{native,byte}>: use_lambda-term
-# Executable read-password
-<examples/read_password.{native,byte}>: pkg_lwt
-<examples/read_password.{native,byte}>: pkg_lwt.react
-<examples/read_password.{native,byte}>: pkg_lwt.unix
-<examples/read_password.{native,byte}>: pkg_zed
-<examples/read_password.{native,byte}>: use_lambda-term
-# Executable read-yes-no
-<examples/read_yes_no.{native,byte}>: pkg_lwt
-<examples/read_yes_no.{native,byte}>: pkg_lwt.react
-<examples/read_yes_no.{native,byte}>: pkg_lwt.unix
-<examples/read_yes_no.{native,byte}>: pkg_zed
-<examples/read_yes_no.{native,byte}>: use_lambda-term
-# Executable editor
-<examples/editor.{native,byte}>: pkg_lwt
-<examples/editor.{native,byte}>: pkg_lwt.react
-<examples/editor.{native,byte}>: pkg_lwt.unix
-<examples/editor.{native,byte}>: pkg_zed
-<examples/editor.{native,byte}>: use_lambda-term
-<examples/*.ml{,i,y}>: pkg_lwt
-<examples/*.ml{,i,y}>: pkg_lwt.react
-<examples/*.ml{,i,y}>: pkg_lwt.unix
-<examples/*.ml{,i,y}>: pkg_zed
-<examples/*.ml{,i,y}>: use_lambda-term
-# Executable lambda-term-actions
-<tools/lambda_term_actions.{native,byte}>: pkg_lwt
-<tools/lambda_term_actions.{native,byte}>: pkg_lwt.react
-<tools/lambda_term_actions.{native,byte}>: pkg_lwt.unix
-<tools/lambda_term_actions.{native,byte}>: pkg_zed
-<tools/lambda_term_actions.{native,byte}>: use_lambda-term
-<tools/*.ml{,i,y}>: pkg_lwt
-<tools/*.ml{,i,y}>: pkg_lwt.react
-<tools/*.ml{,i,y}>: pkg_lwt.unix
-<tools/*.ml{,i,y}>: pkg_zed
-<tools/*.ml{,i,y}>: use_lambda-term
-# Executable history-stress-test
-<tests/history_stress_test.{native,byte}>: pkg_lwt
-<tests/history_stress_test.{native,byte}>: pkg_lwt.react
-<tests/history_stress_test.{native,byte}>: pkg_lwt.unix
-<tests/history_stress_test.{native,byte}>: pkg_zed
-<tests/history_stress_test.{native,byte}>: use_lambda-term
-<tests/*.ml{,i,y}>: pkg_lwt
-<tests/*.ml{,i,y}>: pkg_lwt.react
-<tests/*.ml{,i,y}>: pkg_lwt.unix
-<tests/*.ml{,i,y}>: pkg_zed
-<tests/*.ml{,i,y}>: use_lambda-term
-# OASIS_STOP
--- a/configure
+++ b/configure
-#!/bin/sh
-
-# OASIS_START
-# DO NOT EDIT (digest: dc86c2ad450f91ca10c931b6045d0499)
-set -e
-
-FST=true
-for i in "$@"; do
-  if $FST; then
-    set --
-    FST=false
-  fi
-
-  case $i in
-    --*=*)
-      ARG=${i%%=*}
-      VAL=${i##*=}
-      set -- "$@" "$ARG" "$VAL"
-      ;;
-    *)
-      set -- "$@" "$i"
-      ;;
-  esac
-done
-
-ocaml setup.ml -configure "$@"
-# OASIS_STOP
--- a/debian/changelog
+++ b/debian/changelog
-lambda-term (1.10.1-3) UNRELEASED; urgency=medium
+lambda-term (2.0.2-1) UNRELEASED; urgency=medium

  [ Stéphane Glondu ]
+  * New upstream release
  * Remove Lifeng from Uploaders (Closes: #925114)
  * Update Vcs-*
+  * Bump debhelper compat level to 12

  [ Nicolas Dandrimont ]
  * d/control: remove myself from Uploaders

- -- Stéphane Glondu <glondu@debian.org>  Thu, 08 Aug 2019 10:06:27 +0200
+ -- Stéphane Glondu <glondu@debian.org>  Wed, 11 Sep 2019 13:14:14 +0200

 lambda-term (1.10.1-2) unstable; urgency=medium


--- a/debian/compat
+++ b/debian/compat
-9
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,13 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
 Uploaders:
 Hilko Bengen <bengen@debian.org>
 Build-Depends:
- debhelper (>= 9),
+ debhelper-compat (= 12),
 dh-ocaml (>= 0.9),
- liblwt-ocaml-dev (>= 2.3.0~),
- libzed-ocaml-dev (>= 1.1~),
+ liblwt-ocaml-dev (>= 4),
+ liblwt-log-ocaml-dev,
+ libzed-ocaml-dev (>= 2),
 ocaml-findlib,
- ocamlbuild,
+ ocaml-dune,
 ocaml-nox (>= 3.12.0~)
 Standards-Version: 3.9.8
 Section: ocaml

--- a/debian/copyright
+++ b/debian/copyright
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: lambda-term
 Upstream-Contact: Jérémie Dimino <jeremie@dimino.org>
 Source: https://forge.ocamlcore.org/projects/lambda-term/

--- a/debian/liblambda-term-ocaml-dev.docs
+++ b/debian/liblambda-term-ocaml-dev.docs
+usr/doc/lambda-term/*
--- a/debian/liblambda-term-ocaml-dev.install.in
+++ b/debian/liblambda-term-ocaml-dev.install.in
-usr/share/doc/liblambda-term-ocaml-dev
-@OCamlStdlibDir@/lambda-term/*.annot
+@OCamlStdlibDir@/lambda-term/*opam*
+@OCamlStdlibDir@/lambda-term/*dune*
 @OCamlStdlibDir@/lambda-term/*.cmi
 @OCamlStdlibDir@/lambda-term/*.cmt
 @OCamlStdlibDir@/lambda-term/*.cmti
-@OCamlStdlibDir@/lambda-term/*.mli
+@OCamlStdlibDir@/lambda-term/*.ml*
 @OCamlStdlibDir@/lambda-term/*.a
 OPT: @OCamlStdlibDir@/lambda-term/*.cmx
 OPT: @OCamlStdlibDir@/lambda-term/*.cmxa
--- a/debian/liblambda-term-ocaml.install.in
+++ b/debian/liblambda-term-ocaml.install.in
+@OCamlDllDir@/dll*.so
 @OCamlStdlibDir@/lambda-term/META
 @OCamlStdlibDir@/lambda-term/*.cma
 DYN: @OCamlStdlibDir@/lambda-term/*.cmxs
-@OCamlStdlibDir@/lambda-term/dll*.so @OCamlDllDir@/
 usr/bin/
-usr/share/man/
+usr/share/* usr/share/doc/lambda-term/
--- a/debian/liblambda-term-ocaml.manpages
+++ b/debian/liblambda-term-ocaml.manpages
+usr/man/*/*
--- a/debian/rules
+++ b/debian/rules
@@ -8,39 +8,18 @@ DESTDIR=$(CURDIR)/debian/tmp

 include /usr/share/ocaml/ocamlvars.mk

-export OCAML_DLL_DIR
-export OCAML_HAVE_OCAMLOPT
-export OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
-export OCAMLFIND_LDCONF=ignore
-
 %:
 	dh $@ --with ocaml

-.PHONY: override_dh_auto_configure
-override_dh_auto_configure:
-	ocaml setup.ml -configure --prefix /usr --destdir '$(DESTDIR)' --docdir /usr/share/doc/liblambda-term-ocaml-dev
-
-.PHONY: override_dh_auto_build
 override_dh_auto_build:
-	ocaml setup.ml -build
-	ocaml setup.ml -doc
+	dune build -p lambda-term --verbose
+
+override_dh_auto_install:
+	dune install --destdir=$(DESTDIR) --prefix=/usr --libdir=..$(OCAML_STDLIB_DIR) --verbose
+	rm -f $(DESTDIR)/usr/doc/lambda-term/LICENSE

-.PHONY: override_dh_auto_test
 override_dh_auto_test:
-	ocaml setup.ml -test
+	dune runtest -p lambda-term --verbose

-.PHONY: override_dh_auto_install
-override_dh_auto_install:
-	mkdir -p '$(OCAMLFIND_DESTDIR)'
-	ocaml setup.ml -install
-
-.PHONY: override_dh_install
-override_dh_install:
-ifeq ($(OCAML_NATDYNLINK),no)
-	find $(DESTDIR) -name '*.cmxs' -delete
-endif
-	dh_install --fail-missing
-
-.PHONY: override_dh_auto_clean
-override_dh_auto_clean:
-	ocaml setup.ml -distclean
+override_dh_missing:
+	dh_missing --fail-missing
--- a/dune
+++ b/dune
+(install
+  (section share_root)
+  (files lambda-term-inputrc lambda-termrc))
+
+(alias
+ (name examples)
+ (deps (alias examples/all)))