.gitignore

 .hgignore.in
 Makefile.config
-jbuild
 jbuild-ignore
 ocp-build.root*
 _obuild
@@ -14,7 +13,9 @@ autom4te.cache
 aclocal.m4
 man/man1/
 src/.hgignore.in
-src/jbuild
 src/Makefile.extracted-from-jenga
 src/buildable_targets.list
 **/.fe.sexp
+_build
+.merlin
+*.install
\ No newline at end of file

CHANGELOG

+## 1.7.0
+* lots of small fixes
+* better handling of attributes and extension points
+* better handling of GADT definitions
+* fixed a stack-overflow on extremely large files
+* indent the same (1 step) after `let f = fun x ->` and `let f =\n  fun x ->`
+* build using dune
+
 ## 1.6.1
 * fixes related to ppx extensions
 * fixed regression on indentation within record types

META

-package "lib" (
-  version = "1.6.1"
-  directory = "lib"
-  archive(byte) = "ocp-indent.lib.cma"
-  archive(native) = "ocp-indent.lib.cmxa"
-  requires = "ocp-indent.lexer ocp-indent.utils"
-)
-package "utils" (
-  version = "1.6.1"
-  directory = "utils"
-  archive(byte) = "ocp-indent.utils.cma"
-  archive(native) = "ocp-indent.utils.cmxa"
-  requires = "ocp-indent.lexer"
-)
-package "lexer" (
-  version = "1.6.1"
-  directory = "lexer"
-  archive(byte) = "ocp-indent.lexer.cma"
-  archive(native) = "ocp-indent.lexer.cmxa"
-)
-package "dynlink" (
-  version = "1.6.1"
-  directory = "dynlink"
-  archive(byte) = "ocp-indent.dynlink.cma"
-  archive(native) = "ocp-indent.dynlink.cmxa"
-)

Makefile

--include Makefile.config
-
-byte = _obuild/ocp-indent/ocp-indent.byte
-native = _obuild/ocp-indent/ocp-indent.asm
-manpage = man/man1/ocp-indent.1
-
-OCPBUILD_ARGS =
-
-.PHONY: $(native) $(byte)
-
-all: ocp-indent $(manpage)
-	@
-
-ocp-indent: $(native)
-	cp $^ ocp-indent
-
-ALWAYS:
-
-$(byte) byte: ocp-build.root ALWAYS
-	ocp-build $(OCPBUILD_ARGS)
-
-$(native) native asm: ocp-build.root ALWAYS
-	ocp-build $(OCPBUILD_ARGS)
-
-.PHONY: man
-man: $(manpage)
-$(manpage): $(byte)
-	mkdir -p $(@D)
-	$(byte) --help=groff >$@
-
-bootstrap: ocp-indent
-	./ocp-indent -c match_clause=4 --inplace src/*.mli src/*.ml
-
-sanitize:
-	ocp-build -sanitize $(OCPBUILD_ARGS)
-
-.PHONY: clean
-clean:
-	ocp-build clean $(OCPBUILD_ARGS)
-
-.PHONY: distclean
-distclean:
-	ocp-build clean $(OCPBUILD_ARGS)
-	rm -rf _build _obuild
-	rm -f configure Makefile.config config.* ocp-build.root* version.ocp
-
-install.sh: ocp-indent.install
-	opam-installer --prefix '$$1' $^ --script >$@
-	chmod a+x $@
-
-uninstall.sh: ocp-indent.install
-	opam-installer --prefix '$$1' $^ --script --uninstall >$@
-	chmod a+x $@
-
-.PHONY: install
-install: $(manpage) install.sh uninstall.sh
-	./install.sh $(prefix)
-	@echo
-	@echo
-	@echo "=== ocp-indent installed ==="
-	@echo
-	@echo "To setup tuareg-mode to use ocp-indent, please add the following"
-	@echo "to your .emacs :"
-	@echo
-	@if [ "$(prefix)" != "/usr" ]; then \
-	  echo "  (add-to-list 'load-path \"$(datarootdir)/emacs/site-lisp\")"; \
-	fi
-	@echo "  (require 'ocp-indent)"
-	@echo
-	@echo "Vim users are welcome to add the following to their .vimrc :"
-	@echo
-	@echo '  set rtp^="$(prefix)/share/ocp-indent/vim"'
-	@echo
-
-.PHONY: uninstall
-uninstall: uninstall.sh
-	./uninstall.sh $(prefix)
-
-.PHONY: test
-test: ocp-indent
-	./tests/test.sh
-
-configure: configure.ac
-	aclocal -I m4
-	autoconf
-
-version.ocp: configure.ac
-	@echo "version.ocp not up-to-date, please rerun ./configure"
-	@exit 1
-
-ocp-build.root: version.ocp
-	@if (ocp-build -version 2>/dev/null |\
-	     awk -F'.' '{ exit $$1 > 1 || ($$1 == 1 && $$2 >= 99) }'); then \
-	  echo "Error: you need ocp-build >= 1.99." >&2;\
-	  exit 1;\
-	fi
-	ocp-build -init $(OCPBUILD_ARGS)

Makefile.config.in

-datarootdir = @datarootdir@
-prefix=@prefix@
-mandir = $(shell if test -d @mandir@; then echo @mandir@; else echo @prefix@/man; fi)
-version=@PACKAGE_VERSION@

Makefile.simple

-# -*- makefile -*-
-
-GENERATED = src/indentVersion.ml src/compat.ml
-
-NAME = 'ocp-indent'
-VERSION != awk -F'[(,)]' '/AC_INIT/ { print $$3 }' configure.ac
-
-BEST != if ocamlopt 2>/dev/null; then echo native; else echo byte; fi
-OCAML_MAJOR != ocaml -vnum | sed 's/\..*//'
-COMPAT_DIR = src/ocaml_$(OCAML_MAJOR)/
-
-OCAMLBUILD = ocamlbuild -I src -use-ocamlfind
-
-LIB = ocp-indent-lib
-
-PKGS = cmdliner,findlib,dynlink
-
-BINS = ocp-indent.byte
-LIBS = $(LIB).cma
-ifeq ($(BEST),native)
-  LIBS += $(LIB).cmxa $(LIB).a $(LIB).cmxs
-  BINS += ocp-indent.native
-endif
-
-.PHONY: all
-all: $(LIBS) $(BINS) ocp-indent.1
-
-.PHONY: man
-man: ocp-indent.1
-
-ocp-indent.1: ocp-indent.$(BEST)
-	./ocp-indent.$(BEST) --help=groff >$@
-
-ocp-indent.byte:
-	$(OCAMLBUILD) indentMain.byte -pkgs $(PKGS)
-	ln -f _build/src/indentMain.byte $@
-
-ocp-indent.native:
-	$(OCAMLBUILD) indentMain.native -pkgs $(PKGS)
-	ln -f _build/src/indentMain.native $@
-
-src/compat.ml:
-	cp $(COMPAT_DIR)/compat.ml src/
-
-src/indentVersion.ml:
-	echo 'let version = "'$(VERSION)'"' > $@
-
-src/approx_common.ml: src/approx_common.mli
-	cp $< $@
-
-$(LIB).cma $(LIB).cmxa $(LIB).a $(LIB).cmxs: $(GENERATED)
-	$(OCAMLBUILD) -use-ocamlfind $@
-
-.PHONY: clean
-clean:
-	rm -rf $(GENERATED) META _build
-	rm -rf $(BINS) ocp-indent.1
-
-META:
-	mkdir -p _build/src
-	echo 'name = "'$(NAME)'"' >$@
-	echo 'version = "'$(VERSION)'"' >> $@
-	echo 'archive(byte) = "'$(LIB)'.cma"' >> $@
-	echo 'archive(native) = "'$(LIB)'.cmxa"' >> $@
-
-.PHONY: install
-install: META $(LIBS) $(BINS)
-	ocamlfind remove $(NAME) || true
-	ocamlfind install $(NAME) \
-	  $(LIBS:%=_build/src/%) $(BINS) META \
-	  _build/src/*.{mli,cmi,cmt,cmti,annot}

VERSION

+1.7.0
\ No newline at end of file

configure.ac

-AC_INIT(ocp-indent,1.6.1)
-AC_COPYRIGHT(Copyright 2013-2017 OcamlPro SAS)
-
-AC_CONFIG_MACRO_DIR([m4])
-AC_PROG_CC
-
-AC_PROG_OCAML
-if test "$OCAMLC" = "no"; then
-   AC_MSG_ERROR([You must install the OCaml compiler])
-fi
-
-AC_CONFIG_FILES(
-  Makefile.config
-  version.ocp
-)
-AC_OUTPUT
-
-if test "$prefix" = "NONE"; then
-  prefix=$ac_default_prefix
-fi
-
-bindir="`eval echo ${bindir}`"
-bindir="`eval echo ${bindir}`"
-
-echo
-echo Executables will be installed in ${bindir}

debian/changelog

+ocp-indent (1.7.0-1) unstable; urgency=medium
+
+  * New upstream version 1.7.0
+     - upstream changed their build system to dune
+     - build and install with jbuilder instead of Makefile.simple
+     - follow upstream and rename ocp-indent-lib to ocp-indent
+     - remove ocamlbuild from Build-Depends
+     - add appropriate Breaks and Replaces
+     - remove m4/ocaml.m4 and configure from d/copyright (not shipped anymore)
+     - Makefile.simple got removed -> remove all patches
+     - do not export DESTDIR to not confused jbuilder
+  * without ocamlbuild we do not need to pass --no-parallel to dh
+  * use dh_missing --fail-missing instead of dh_install --fail-missing
+  * Fix my name in Uploaders field
+
+ -- Johannes 'josch' Schauer <josch@debian.org>  Sun, 16 Dec 2018 17:57:05 +0100
+
 ocp-indent (1.6.1-1) unstable; urgency=medium
 
   * New upstream version 1.6.1 (closes: #899079)

debian/libocp-indent-lib-ocaml-dev.install.in

-@OCamlStdlibDir@/ocp-indent-lib/*.cmo
-@OCamlStdlibDir@/ocp-indent-lib/*.cmi
-@OCamlStdlibDir@/ocp-indent-lib/*.ml*
-OPT: @OCamlStdlibDir@/ocp-indent-lib/*.o
-OPT: @OCamlStdlibDir@/ocp-indent-lib/*.cmxa
-OPT: @OCamlStdlibDir@/ocp-indent-lib/*.a
-OPT: @OCamlStdlibDir@/ocp-indent-lib/*.cmx

debian/ocp-indent.manpages

-ocp-indent.1