Update packaging

14 files changed, 73 insertions, 80 deletions

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index e69f8aa..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,5 +0,0 @@
-This package use dpatch for patching the source. 
-
-Please consider reading dpatch manpage to patch the source.
-
- -- Sylvain Le Gall <gildor@debian.org>  Thu, 10 Jul 2008 21:15:09 +0200
diff --git a/debian/TODO b/debian/TODO
deleted file mode 100644
index b2bef9f..0000000
--- a/debian/TODO
+++ /dev/null
@@ -1 +0,0 @@
-* package cil to create cil-tools
diff --git a/debian/changelog b/debian/changelog
index 6a51de0..f139169 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -115,7 +115,7 @@ ocaml-bitstring (1.9.7-2) unstable; urgency=low
   * Switched to quilt for patch management.
   * Versioned ocaml related build-dep.
   * Added build-dep on dh-ocaml.
-  * Fixed git url. 
+  * Fixed git url.
   * Added patch to add missing dynlink dependencies.
   * Fixed missing install directory for ocaml-findlib in debian/rules.
   * Update compat to 7.
diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index 27da8a8..0000000
--- a/debian/clean
+++ /dev/null
@@ -1 +0,0 @@
-cil-tools/Makefile
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7f8f011..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/debian/control b/debian/control
index cb41af5..36da295 100644
--- a/debian/control
+++ b/debian/control
@@ -6,21 +6,25 @@ Uploaders:
  Stéphane Glondu <glondu@debian.org>,
  Mehdi Dogguy <mehdi@debian.org>
 Build-Depends:
- cdbs (>= 0.4.23),
- debhelper (>= 7),
- ocaml-nox (>= 4),
- ocaml-findlib (>= 1.4),
- camlp4-extra,
- dh-ocaml (>= 0.9),
+ debhelper-compat (= 12),
+ ocaml-nox,
+ ocaml-findlib,
+ ocaml-dune,
+ libppx-tools-versioned-ocaml-dev,
+ libmigrate-parsetree-ocaml-dev,
+ libstdlib-shims-ocaml-dev,
+ libounit-ocaml-dev,
+ dh-ocaml,
  time
-Standards-Version: 3.9.2
+Standards-Version: 4.5.0
+Rules-Requires-Root: no
 Vcs-Browser: https://salsa.debian.org/ocaml-team/ocaml-bitstring
 Vcs-Git: https://salsa.debian.org/ocaml-team/ocaml-bitstring.git
 Homepage: https://bitstring.software/
 
 Package: libbitstring-ocaml-dev
 Architecture: any
-Depends: ${ocaml:Depends}, ${misc:Depends}, libbitstring-ocaml (= ${binary:Version})
+Depends: ${ocaml:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Provides: ${ocaml:Provides}
 Suggests: ocaml-findlib
 Description: Erlang-style bitstrings for OCaml (development files)
diff --git a/debian/copyright b/debian/copyright
index 0830b72..4f8781c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,42 +1,36 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-Packaged-By: Sylvain Le Gall <gildor@debian.org> 
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Packaged-By: Sylvain Le Gall <gildor@debian.org>
 Packaged-Date: Thu, 10 Jul 2008 21:54:01 +0200
-Upstream-author: Richard W.M. Jones <rjones@redhat.com>
-Original-Source-Location: http://code.google.com/p/bitstring/
 
 Files: *
 Copyright: © 2007 Richard W.M. Jones, Red Hat Inc.
 License: LGPL-2.1+
+ On Debian GNU/Linux systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
-On Debian GNU/Linux systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
-
-Files: *.ml
-Files: *.mli
+Files: *.ml *.mli
 Copyright: © 2007 Richard W.M. Jones, Red Hat Inc.
-License: LGPL-2.1+ | other
-
-As a special exception to the GNU Library General Public License, you
-may link, statically or dynamically, a "work that uses the Library"
-with a publicly distributed version of the Library to produce an
-executable file containing portions of the Library, and distribute
-that executable file under terms of your choice, without any of the
-additional requirements listed in clause 6 of the GNU Library General
-Public License.  By "a publicly distributed version of the Library",
-we mean either the unmodified Library as distributed by Red Hat, or a
-modified version of the Library that is distributed under the
-conditions defined in clause 2 of the GNU Library General Public
-License.  This exception does not however invalidate any other reasons
-why the executable file might be covered by the GNU Library General
-Public License.
-
-On Debian GNU/Linux systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+License: LGPL-2.1+-exception
+ As a special exception to the GNU Library General Public License, you
+ may link, statically or dynamically, a "work that uses the Library"
+ with a publicly distributed version of the Library to produce an
+ executable file containing portions of the Library, and distribute
+ that executable file under terms of your choice, without any of the
+ additional requirements listed in clause 6 of the GNU Library General
+ Public License.  By "a publicly distributed version of the Library",
+ we mean either the unmodified Library as distributed by Red Hat, or a
+ modified version of the Library that is distributed under the
+ conditions defined in clause 2 of the GNU Library General Public
+ License.  This exception does not however invalidate any other reasons
+ why the executable file might be covered by the GNU Library General
+ Public License.
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
 Files: debian/*
 Copyright: © 2008 Sylvain Le Gall <gildor@debian.org>
+           © 2020 Stéphane Glondu <glondu@debian.org>
 License: GPL-2+
-
-On Debian GNU/Linux systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
+ On Debian GNU/Linux systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/libbitstring-ocaml-dev.dirs.in b/debian/libbitstring-ocaml-dev.dirs.in
deleted file mode 100644
index cc51687..0000000
--- a/debian/libbitstring-ocaml-dev.dirs.in
+++ /dev/null
@@ -1 +0,0 @@
-@OCamlStdlibDir@
diff --git a/debian/libbitstring-ocaml-dev.docs b/debian/libbitstring-ocaml-dev.docs
new file mode 100644
index 0000000..26b7cfa
--- /dev/null
+++ b/debian/libbitstring-ocaml-dev.docs
@@ -0,0 +1 @@
+usr/doc/bitstring/*
diff --git a/debian/libbitstring-ocaml-dev.install.in b/debian/libbitstring-ocaml-dev.install.in
new file mode 100644
index 0000000..0fb2b87
--- /dev/null
+++ b/debian/libbitstring-ocaml-dev.install.in
@@ -0,0 +1,9 @@
+@OCamlStdlibDir@/bitstring/*opam*
+@OCamlStdlibDir@/bitstring/*dune*
+@OCamlStdlibDir@/bitstring/*.ml*
+@OCamlStdlibDir@/bitstring/*.cmi
+@OCamlStdlibDir@/bitstring/*.cmt*
+@OCamlStdlibDir@/bitstring/*.a
+OPT: @OCamlStdlibDir@/bitstring/*.cmx
+OPT: @OCamlStdlibDir@/bitstring/*.cmxa
+@OCamlStdlibDir@/bitstring/ppx
diff --git a/debian/libbitstring-ocaml-dev.ocamldoc b/debian/libbitstring-ocaml-dev.ocamldoc
deleted file mode 100644
index 299f694..0000000
--- a/debian/libbitstring-ocaml-dev.ocamldoc
+++ /dev/null
@@ -1 +0,0 @@
--I +camlp4
diff --git a/debian/libbitstring-ocaml.dirs.in b/debian/libbitstring-ocaml.dirs.in
deleted file mode 100644
index a8131b4..0000000
--- a/debian/libbitstring-ocaml.dirs.in
+++ /dev/null
@@ -1 +0,0 @@
-@OCamlDllDir@
diff --git a/debian/libbitstring-ocaml.install.in b/debian/libbitstring-ocaml.install.in
new file mode 100644
index 0000000..bbc34f7
--- /dev/null
+++ b/debian/libbitstring-ocaml.install.in
@@ -0,0 +1,4 @@
+@OCamlDllDir@
+@OCamlStdlibDir@/bitstring/META
+@OCamlStdlibDir@/bitstring/*.cma
+DYN: @OCamlStdlibDir@/bitstring/*.cmxs
diff --git a/debian/rules b/debian/rules
index 273465f..2ed4200 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,34 +1,26 @@
 #!/usr/bin/make -f
-# debian/rules for ocaml-bitstring package
-# Copyright (C) 2008 Sylvain Le Gall <gildor@debian.org>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-# MA 02110-1301, USA.
+# -*- makefile -*-
 
-include /usr/share/cdbs/1/rules/ocaml.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/ocaml/ocamlvars.mk
+DESTDIR := $(CURDIR)/debian/tmp
 
-DESTDIR_DEV=$(CURDIR)/debian/libbitstring-ocaml-dev
-DESTDIR=$(CURDIR)/debian/libbitstring-ocaml
+%:
+	dh $@ --with ocaml
 
-DEB_MAKE_CLEAN_TARGET    := distclean
-DEB_MAKE_BUILD_TARGET    := all
-DEB_MAKE_INSTALL_TARGET  := install
-DEB_MAKE_INSTALL_TARGET  += OCAMLFIND_DESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)" OCAMLFIND_LDCONF=ignore
+override_dh_auto_clean:
+	dune clean
 
-install/libbitstring-ocaml-dev::
-	mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/bitstring/*.so \
-	  '$(DESTDIR)/$(OCAML_DLL_DIR)'
+override_dh_auto_build:
+	dune build -p bitstring
+
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	dune runtest -p bitstring
+	rm -rf tests/data/*.actual
+endif
+
+override_dh_auto_install:
+	dune install --destdir=$(DESTDIR) --prefix=/usr --libdir=..$(OCAML_STDLIB_DIR)
+
+override_dh_missing:
+	dh_missing --fail-missing