Update packaging

8 files changed, 40 insertions, 74 deletions

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
index 722df47..0636a4c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,15 @@ Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
 Uploaders: Stéphane Glondu <glondu@debian.org>
 Build-Depends:
- debhelper (>= 9),
+ debhelper-compat (= 12),
  dh-ocaml (>= 0.9),
  ocaml-findlib (>= 1.4),
  ocamlbuild,
- opam,
+ libtopkg-ocaml-dev,
+ opam-installer,
  ocaml-nox (>= 4)
-Standards-Version: 3.9.6
+Standards-Version: 4.4.1
+Rules-Requires-Root: no
 Section: ocaml
 Homepage: http://erratique.ch/software/react
 Vcs-Browser: https://salsa.debian.org/ocaml-team/react
diff --git a/debian/copyright b/debian/copyright
index e4ce17a..3d992cc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,39 +1,25 @@
-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-Contact: Daniel C. Bünzli <daniel.buenzli@erratique.ch>
 
 Files: *
-Copyright: 2009-2012, Daniel C. Bünzli
-License: BSD-C3
+Copyright: 2009-2014, Daniel C. Bünzli
+License: ISC
 
 Files: debian/*
-Copyright: 2009-2012, Stéphane Glondu <steph@glondu.net>
-License: BSD-C3
+Copyright: 2009-2020, Stéphane Glondu <steph@glondu.net>
+License: ISC
 
-License: BSD-C3
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
+License: ISC
+ Permission to use, copy, modify, and/or distribute this software for
+ any purpose with or without fee is hereby granted, provided that the
+ above copyright notice and this permission notice appear in all
+ copies.
  .
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- .
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the
-    distribution.
- .
- 3. Neither the name of the Daniel C. Bünzli nor the names of
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.
diff --git a/debian/libreact-ocaml-dev.doc-base b/debian/libreact-ocaml-dev.doc-base
deleted file mode 100644
index 65e55c5..0000000
--- a/debian/libreact-ocaml-dev.doc-base
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: react
-Title: React API documentation
-Author: Daniel C. Bünzli
-Abstract: React ocamldoc-generated API documentation
-Section: Programming/OCaml
-
-Format: HTML
-Index: /usr/share/doc/libreact-ocaml-dev/html/index.html
-Files: /usr/share/doc/libreact-ocaml-dev/html/*
diff --git a/debian/libreact-ocaml-dev.docs b/debian/libreact-ocaml-dev.docs
new file mode 100644
index 0000000..b323880
--- /dev/null
+++ b/debian/libreact-ocaml-dev.docs
@@ -0,0 +1 @@
+doc/react/*
diff --git a/debian/libreact-ocaml-dev.install.in b/debian/libreact-ocaml-dev.install.in
index 8c2fb5a..16e57bd 100644
--- a/debian/libreact-ocaml-dev.install.in
+++ b/debian/libreact-ocaml-dev.install.in
@@ -1,10 +1,8 @@
+     @OCamlStdlibDir@/react/opam
      @OCamlStdlibDir@/react/react.mli
      @OCamlStdlibDir@/react/react.cmi
      @OCamlStdlibDir@/react/react.cmti
 OPT: @OCamlStdlibDir@/react/react.cmx
 OPT: @OCamlStdlibDir@/react/react.cmxa
 OPT: @OCamlStdlibDir@/react/react.a
-     @OCamlStdlibDir@/react/react_top.*
-     doc/*.html      /usr/share/doc/libreact-ocaml-dev/html
-     doc/*.css       /usr/share/doc/libreact-ocaml-dev/html
-     usr/share/doc/react/*  /usr/share/doc/libreact-ocaml-dev
+     @OCamlStdlibDir@/react/react_top*
diff --git a/debian/rules b/debian/rules
index 1e3b94f..593a310 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,37 +2,28 @@
 # -*- makefile -*-
 
 DESTDIR=$(CURDIR)/debian/tmp
-
 include /usr/share/ocaml/ocamlvars.mk
 
-BUILD_ARGS :=
-
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-  BUILD_ARGS += native=true
-else
-  BUILD_ARGS += native=false
-endif
-
-ifeq ($(OCAML_NATDYNLINK),yes)
-  BUILD_ARGS += native-dynlink=true
-else
-  BUILD_ARGS += native-dynlink=false
-endif
-
 %:
 	dh $@ --with ocaml
 
-.PHONY: override_dh_auto_build
+override_dh_auto_clean:
+	ocaml pkg/pkg.ml clean
+
 override_dh_auto_build:
-	ocaml pkg/build.ml $(BUILD_ARGS)
+	ocaml pkg/pkg.ml build --tests true
+
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	ocaml pkg/pkg.ml test
+endif
 
-.PHONY: override_dh_auto_install
 override_dh_auto_install:
-	opam-installer --prefix=debian/tmp --libdir=.$(OCAML_STDLIB_DIR) --docdir=usr/share/doc react.install
+	opam-installer --prefix=$(DESTDIR) --libdir=.$(OCAML_STDLIB_DIR) react.install
+	rm -f $(DESTDIR)/doc/react/LICENSE.md
 
-.PHONY: override_dh_install
-override_dh_install:
-	dh_install --fail-missing
+override_dh_missing:
+	dh_missing --fail-missing
 
 .PHONY: override_dh_compress
 override_dh_compress:
diff --git a/debian/watch b/debian/watch
index c9d9b56..2bc52f5 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,2 @@
 version=3
-http://erratique.ch/software/react/releases/react-(.*)\.tbz
-# Upstream darcs repository:
-#   http://erratique.ch/software/react/repo/
+https://erratique.ch/software/react/releases/react-(.*)\.tbz