ocaml-merlin (4.7-413-3) unstable; urgency=medium

  * Rewrite d/copyright.

[dgit import unpatched ocaml-merlin 4.7-413-3]

14 files changed, 336 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..5096a36
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,17 @@
+ocaml-merlin (4.7-413-3) unstable; urgency=medium
+
+  * Rewrite d/copyright.
+
+ -- Julien Puydt <jpuydt@debian.org>  Tue, 08 Aug 2023 10:46:40 +0200
+
+ocaml-merlin (4.7-413-2) unstable; urgency=medium
+
+  * Split the package depending on the editor.
+
+ -- Julien Puydt <jpuydt@debian.org>  Mon, 03 Jul 2023 17:14:14 +0200
+
+ocaml-merlin (4.7-413-1) unstable; urgency=medium
+
+  * Initial release (Closes: #820405).
+
+ -- Julien Puydt <jpuydt@debian.org>  Fri, 30 Jun 2023 12:27:10 +0200
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..052d691
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,55 @@
+Source: ocaml-merlin
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
+Uploaders: Julien Puydt <jpuydt@debian.org>
+Section: ocaml
+Priority: optional
+Standards-Version: 4.6.2
+Rules-Requires-Root: no
+Build-Depends: debhelper-compat (= 13),
+               dh-ocaml, dh-vim-addon,
+               libcsexp-ocaml-dev,
+               libfindlib-ocaml-dev,
+               libmenhir-ocaml-dev,
+               libyojson-ocaml-dev,
+               menhir,
+               ocaml-dune,
+               ocaml-findlib,
+               ocaml-nox
+Vcs-Browser: https://salsa.debian.org/ocaml-team/ocaml-merlin
+Vcs-Git: https://salsa.debian.org/ocaml-team/ocaml-merlin.git
+Homepage: https://ocaml.github.io/merlin
+
+Package: ocaml-merlin
+Architecture: any
+Depends: ${misc:Depends}, ${ocaml:Depends}, ${shlibs:Depends}
+Provides: ${ocaml:Provides}
+Recommends: ocaml-findlib
+Description: editor service to develop in OCaml (common files)
+ This package provides an editor service for advanced
+ integrated development environment (IDE) in the OCaml
+ language both for the vim and emacs editors.
+ .
+ This is the common files, with vim-ocaml-merlin and
+ emacs-ocaml-merlin providing the actual support for your
+ favorite editor.
+
+Package: vim-ocaml-merlin
+Architecture: any
+Depends: ocaml-merlin, vim-python3, ${misc:Depends}, ${vim-addon:Depends}
+Description: editor service to develop in OCaml (vim files)
+ This package provides an editor service for advanced
+ integrated development environment (IDE) in the OCaml
+ language both for the vim and emacs editors.
+ .
+ This is the vim-specific package.
+
+Package: emacs-ocaml-merlin
+Architecture: any
+Depends: ocaml-merlin, ${misc:Depends}
+Description: editor service to develop in OCaml (emacs files)
+ This package provides an editor service for advanced
+ integrated development environment (IDE) in the OCaml
+ language both for the vim and emacs editors.
+ .
+ This is the emacs-specific package.
+
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..7b5917d
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,226 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+
+Files: *
+Copyright: 2013-2023 Frédéric Bour, Thomas Refis and Simon Castellan
+License: expat
+
+Files: src/analysis/ocamldoc.ml
+Copyright: 2013 OCamlPro
+License: LGPL-3
+
+Files: src/ocaml/driver/*
+Copyright: 2002 Institut National de Recherche en Informatique et en Automatique
+License: QPL-1
+
+Files: src/ocaml/parsing/*
+Copyright: 1996-2015 Institut National de Recherche en Informatique et en Automatique
+License: LGPL-2.1
+
+Files: src/ocaml/parsing/fake.ml* src/ocaml/parsing/location_aux.ml*
+Copyright: 2013-2015 Frédéric Bour, Thomas Refis and Simon Castellan
+License: expat
+
+Files: src/ocaml/preprocess/*
+Copyright: 1996-2015 Institut National de Recherche en Informatique et en Automatique
+License: QPL-1
+
+Files: src/ocaml/preprocess/lexer_ident.mli
+Copyright: 2013-2015 Frédéric Bour, Thomas Refis and Simon Castellan
+License: expat
+
+Files: src/ocaml/preprocess/menhirLib.ml* src/ocaml/preprocess/recover/*
+Copyright: 1996 Institut National de Recherche en Informatique et en Automatique
+License: GPL-2
+
+Files: src/ocaml/preprocess/parser_raw.mly
+Copyright: 1996 Institut National de Recherche en Informatique et en Automatique
+License: LGPL-2.1
+
+Files: src/ocaml/typing/*
+Copyright: 1996-2021 Institut National de Recherche en Informatique et en Automatique
+License: LGPL-2.1
+
+Files: src/ocaml/typing/cm?_cache.ml src/ocaml/typing/msupport.ml* 
+Copyright: 2013-2015 Frédéric Bour, Thomas Refis and Simon Castellan
+License: expat
+
+Files: src/ocaml/typing/errortrace.ml*
+Copyright: 2018 Institut National de Recherche en Informatique et en Automatique
+           2021 Jane Street Group LLC
+License: LGPL-2.1
+
+Files: src/ocaml/typing/rec_check.ml
+Copyright: 2017 Jeremy Yallop
+           2018 Alban Reynaud
+	   2018 Institut National de Recherche en Informatique et en Automatique
+License: LGPL-2.1
+
+Files: src/ocaml/typing/rec_check.mli
+Copyright: 2017 Jeremy Yallop
+License: LGPL-2.1
+
+Files: src/ocaml/typing/type_immediacy.ml*
+Copyright: 2019 Jane Street Group LLC
+License: LGPL-2.1
+
+Files: src/ocaml/utils/*
+Copyright: 1996-2020 Institut National de Recherche en Informatique et en Automatique
+License: LGPL-2.1
+
+Files: src/ocaml/utils/identifiable.ml*
+Copyright: 2013-2016 OCamlPro SAS
+           2014-2016 Jane Street Group LLC
+License: LGPL-2.1
+
+Files: src/ocaml/utils/load_path.ml*
+Copyright: 2018 Jane Street Group LLC
+License: LGPL-2.1
+
+Files: src/ocaml/utils/local_store.mli
+Copyright: 2020 Tarides
+License: LGPL-2.1
+
+Files: src/utils/misc.ml*
+Copyright: 1996 Institut National de Recherche en Informatique et en Automatique
+License: LGPL-2.1
+
+Files: debian/*
+Copyright: 2023 Julien Puydt
+License: expat
+
+License: expat
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation files
+ (the "Software"), to deal in the Software without restriction,
+ including without limitation the rights to use, copy, modify, merge,
+ publish, distribute, sublicense, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
+License: GPL-2
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in `/usr/share/common-licenses/GPL-2'
+
+License: LGPL-2
+ On Debian systems, the complete text of the GNU Library General Public
+ License can be found in `/usr/share/common-licenses/LGPL-2'
+ 
+License: LGPL-2.1
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License can be found in `/usr/share/common-licenses/LGPL-2.1'
+
+License: LGPL-3
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License can be found in `/usr/share/common-licenses/LGPL-3'
+ 
+License: QPL-1
+ THE Q PUBLIC LICENSE version 1.0
+ .
+ Copyright (C) 1999-2000 Trolltech AS, Norway.
+ Everyone is permitted to copy and distribute this license document.
+ The intent of this license is to establish freedom to share and change
+ the software regulated by this license under the open source model.
+ .
+ This license applies to any software containing a notice placed by the
+ copyright holder saying that it may be distributed under the terms of the
+ Q Public License version 1.0. Such software is herein referred to as the
+ Software. This license covers modification and distribution of the
+ Software, use of third-party application programs based on the Software,
+ and development of free software which uses the Software.
+ .
+ Granted Rights
+ .
+ 1. You are granted the non-exclusive rights set forth in this license
+ provided you agree to and comply with any and all conditions in this
+ license. Whole or partial distribution of the Software, or software items
+ that link with the Software, in any form signifies acceptance of this
+ license.
+ .
+ 2. You may copy and distribute the Software in unmodified form provided
+ that the entire package, including - but not restricted to - copyright,
+ trademark notices and disclaimers, as released by the initial developer
+ of the Software, is distributed.
+ .
+ 3. You may make modifications to the Software and distribute your
+ modifications, in a form that is separate from the Software, such as
+ patches. The following restrictions apply to modifications:
+ .
+   a. Modifications must not alter or remove any copyright notices in the
+   Software.
+ .
+   b. When modifications to the Software are released under this license,
+   a non-exclusive royalty-free right is granted to the initial developer
+   of the Software to distribute your modification in future versions of
+   the Software provided such versions remain available under these terms
+   in addition to any other license(s) of the initial developer.
+ .
+ 4. You may distribute machine-executable forms of the Software or
+ machine-executable forms of modified versions of the Software, provided
+ that you meet these restrictions:
+ .
+   a. You must include this license document in the distribution.
+ .
+   b. You must ensure that all recipients of the machine-executable forms
+   are also able to receive the complete machine-readable source code to
+   the distributed Software, including all modifications, without any
+   charge beyond the costs of data transfer, and place prominent notices
+   in the distribution explaining this.
+ .
+   c. You must ensure that all modifications included in the
+   machine-executable forms are available under the terms of this license.
+ .
+ 5. You may use the original or modified versions of the Software to
+ compile, link and run application programs legally developed by you or
+ by others.
+ .
+ 6. You may develop application programs, reusable components and other
+ software items that link with the original or modified versions of the
+ Software. These items, when distributed, are subject to the following
+ requirements:
+ .
+   a. You must ensure that all recipients of machine-executable forms of
+   these items are also able to receive and use the complete
+   machine-readable source code to the items without any charge beyond the
+   costs of data transfer.
+ .
+   b. You must explicitly license all recipients of your items to use and
+   re-distribute original and modified versions of the items in both
+   machine-executable and source code forms. The recipients must be able
+   to do so without any charges whatsoever, and they must be able to
+   re-distribute to anyone they choose.
+ .
+   c. If the items are not available to the general public, and the
+   initial developer of the Software requests a copy of the items, then
+   you must supply one.
+ .
+ Limitations of Liability
+ .
+ In no event shall the initial developers or copyright holders be liable
+ for any damages whatsoever, including - but not restricted to - lost
+ revenue or profits or other direct, indirect, special, incidental or
+ consequential damages, even if they have been advised of the possibility
+ of such damages, except to the extent invariable law, if any, provides
+ otherwise.
+ .
+ No Warranty
+ .
+ The Software and this license document are provided AS IS with NO
+ WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE.
+ .
+ Choice of Law
+ .
+ This license is governed by the Laws of Norway. Disputes shall be settled
+ by Oslo City Court.
diff --git a/debian/emacs-ocaml-merlin.install b/debian/emacs-ocaml-merlin.install
new file mode 100644
index 0000000..9032917
--- /dev/null
+++ b/debian/emacs-ocaml-merlin.install
@@ -0,0 +1 @@
+usr/share/emacs/site-lisp/*
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
new file mode 100644
index 0000000..4966982
--- /dev/null
+++ b/debian/lintian-overrides
@@ -0,0 +1,6 @@
+# Those executables aren't really meant for direct user usage
+# https://github.com/ocaml/merlin/issues/1641
+ocaml-merlin: no-manual-page [usr/bin/dot-merlin-reader]
+ocaml-merlin: no-manual-page [usr/bin/ocamlmerlin-server]
+ocaml-merlin: no-manual-page [usr/bin/ocamlmerlin]
+
diff --git a/debian/ocaml-merlin.docs b/debian/ocaml-merlin.docs
new file mode 100644
index 0000000..7153ed3
--- /dev/null
+++ b/debian/ocaml-merlin.docs
@@ -0,0 +1 @@
+usr/doc/merlin/*
diff --git a/debian/ocaml-merlin.install b/debian/ocaml-merlin.install
new file mode 100644
index 0000000..2b73762
--- /dev/null
+++ b/debian/ocaml-merlin.install
@@ -0,0 +1,2 @@
+usr/bin/*
+usr/lib/ocaml/*
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..b2d3446
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+include /usr/share/ocaml/ocamlvars.mk
+
+%:
+	dh $@ --with ocaml,vim_addon
+
+override_dh_auto_build:
+	dune build @all
+
+override_dh_auto_install:
+	dune install --destdir=$(CURDIR)/debian/tmp --prefix=/usr --libdir=$(OCAML_STDLIB_DIR)
+	find $(CURDIR)/debian/tmp -name LICENSE -delete
+	rm -rf $(CURDIR)/debian/tmp/usr/doc/dot-merlin-reader
+
+override_dh_auto_test:
+	# do nothing!
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..25763f2
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,5 @@
+---
+Repository: https://github.com/ocaml/merlin.git
+Repository-Browse: https://github.com/ocaml/merlin
+Bug-Database: https://github.com/ocaml/merlin/issues
+Bug-Submit: https://github.com/ocaml/merlin/issues/new
diff --git a/debian/vim-ocaml-merlin.install b/debian/vim-ocaml-merlin.install
new file mode 100644
index 0000000..265dacd
--- /dev/null
+++ b/debian/vim-ocaml-merlin.install
@@ -0,0 +1 @@
+/usr/share/merlin/vim/*
diff --git a/debian/vim-ocaml-merlin.neovim-addon b/debian/vim-ocaml-merlin.neovim-addon
new file mode 120000
index 0000000..1e0dc4a
--- /dev/null
+++ b/debian/vim-ocaml-merlin.neovim-addon
@@ -0,0 +1 @@
+vim-ocaml-merlin.vim-addon
\ No newline at end of file
diff --git a/debian/vim-ocaml-merlin.vim-addon b/debian/vim-ocaml-merlin.vim-addon
new file mode 100644
index 0000000..c7605b5
--- /dev/null
+++ b/debian/vim-ocaml-merlin.vim-addon
@@ -0,0 +1 @@
+usr/share/merlin/vim merlin
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..d0ae532
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=4
+https://github.com/ocaml/merlin/tags .*/v?([\d\.-]+).tar.gz