From 4f791adcfda92911167c3f924724f1352c8c37fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Glondu?= Date: Wed, 1 Feb 2023 09:23:04 +0100 Subject: Update packaging --- debian/NEWS | 6 ++++++ debian/NEWS.Debian | 6 ------ debian/clean | 3 --- debian/control | 7 ++++++- debian/docs | 3 --- debian/libcalendar-ocaml-dev.docs | 1 + debian/libcalendar-ocaml-dev.install.in | 13 ++++++++----- debian/libcalendar-ocaml-doc.doc-base | 4 ++-- debian/libcalendar-ocaml-doc.docs | 2 +- debian/rules | 24 ++++++------------------ 10 files changed, 30 insertions(+), 39 deletions(-) create mode 100644 debian/NEWS delete mode 100644 debian/NEWS.Debian delete mode 100644 debian/clean delete mode 100644 debian/docs create mode 100644 debian/libcalendar-ocaml-dev.docs diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 0000000..e14070e --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,6 @@ +calendar (2.01.1-4) unstable; urgency=low + + * Documentation is now in its own package: libcalendar-ocaml-doc + /usr/share/doc/libcalendar-ocaml-doc/doc/index.html + + -- Mehdi Dogguy Sat, 21 Mar 2009 00:33:17 +0100 diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian deleted file mode 100644 index e14070e..0000000 --- a/debian/NEWS.Debian +++ /dev/null @@ -1,6 +0,0 @@ -calendar (2.01.1-4) unstable; urgency=low - - * Documentation is now in its own package: libcalendar-ocaml-doc - /usr/share/doc/libcalendar-ocaml-doc/doc/index.html - - -- Mehdi Dogguy Sat, 21 Mar 2009 00:33:17 +0100 diff --git a/debian/clean b/debian/clean deleted file mode 100644 index 9a04815..0000000 --- a/debian/clean +++ /dev/null @@ -1,3 +0,0 @@ -Makefile -config.log -debian/configure-stamp diff --git a/debian/control b/debian/control index df9a007..4682814 100644 --- a/debian/control +++ b/debian/control @@ -6,10 +6,15 @@ Uploaders: Stéphane Glondu , Mehdi Dogguy Build-Depends: - debhelper-compat (= 12), + debhelper-compat (= 13), + ocaml-dune, ocaml-nox, ocaml-findlib, + ocaml-odoc, + libre-ocaml-dev, + libalcotest-ocaml-dev, dh-ocaml +Rules-Requires-Root: no Standards-Version: 4.6.2 Homepage: https://github.com/ocaml-community/calendar Vcs-Git: https://salsa.debian.org/ocaml-team/calendar.git diff --git a/debian/docs b/debian/docs deleted file mode 100644 index e7a4c07..0000000 --- a/debian/docs +++ /dev/null @@ -1,3 +0,0 @@ -calendarFAQ-2.6.txt -README -TODO diff --git a/debian/libcalendar-ocaml-dev.docs b/debian/libcalendar-ocaml-dev.docs new file mode 100644 index 0000000..07b5a7f --- /dev/null +++ b/debian/libcalendar-ocaml-dev.docs @@ -0,0 +1 @@ +usr/doc/calendar/* diff --git a/debian/libcalendar-ocaml-dev.install.in b/debian/libcalendar-ocaml-dev.install.in index 6553c75..3af3a60 100644 --- a/debian/libcalendar-ocaml-dev.install.in +++ b/debian/libcalendar-ocaml-dev.install.in @@ -1,5 +1,8 @@ -@OCamlStdlibDir@/calendar/*.mli -OPT: @OCamlStdlibDir@/calendar/calendarLib.a -OPT: @OCamlStdlibDir@/calendar/calendarLib.cmx -OPT: @OCamlStdlibDir@/calendar/calendarLib.cmxa -@OCamlStdlibDir@/calendar/calendarLib.cmi +@OCamlStdlibDir@/calendar/*dune* +@OCamlStdlibDir@/calendar/*opam* +@OCamlStdlibDir@/calendar/*.ml* +@OCamlStdlibDir@/calendar/*.cmi +@OCamlStdlibDir@/calendar/*.cmt* +OPT: @OCamlStdlibDir@/calendar/*.a +OPT: @OCamlStdlibDir@/calendar/*.cmx +OPT: @OCamlStdlibDir@/calendar/*.cmxa diff --git a/debian/libcalendar-ocaml-doc.doc-base b/debian/libcalendar-ocaml-doc.doc-base index a288e52..66280c0 100644 --- a/debian/libcalendar-ocaml-doc.doc-base +++ b/debian/libcalendar-ocaml-doc.doc-base @@ -4,5 +4,5 @@ Abstract: API reference manual for libcalendar-ocaml-doc (generated via OCamldoc Section: Programming/OCaml Format: HTML -Index: /usr/share/doc/libcalendar-ocaml/doc/index.html -Files: /usr/share/doc/libcalendar-ocaml/doc/* +Index: /usr/share/doc/libcalendar-ocaml/_html/index.html +Files: /usr/share/doc/libcalendar-ocaml/_html/* diff --git a/debian/libcalendar-ocaml-doc.docs b/debian/libcalendar-ocaml-doc.docs index a2e6bd4..a674f97 100644 --- a/debian/libcalendar-ocaml-doc.docs +++ b/debian/libcalendar-ocaml-doc.docs @@ -1 +1 @@ -doc/ +_build/default/_doc/_html diff --git a/debian/rules b/debian/rules index 8ee447f..3ee3ec1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,30 +1,18 @@ #!/usr/bin/make -f -include /usr/share/dpkg/pkg-info.mk include /usr/share/ocaml/ocamlvars.mk DESTDIR = $(CURDIR)/debian/tmp -export OCAMLFIND_DESTDIR = $(DESTDIR)/$(OCAML_STDLIB_DIR) - -FILES_TO_BACKUP = .depend config.status %: dh $@ --with ocaml -override_dh_auto_configure: - for i in $(FILES_TO_BACKUP); do \ - cp -xa $$i $$i.debian; \ - done - ./configure - override_dh_auto_build: - make BUILD_DATE="$(shell date -u -R -d @$(SOURCE_DATE_EPOCH))" + dune build -p calendar + dune build @doc -p calendar override_dh_auto_install: - mkdir -p $(OCAMLFIND_DESTDIR) - make install + dune install --destdir=$(DESTDIR) --prefix=/usr --libdir=..$(OCAML_STDLIB_DIR) + rm -f $(DESTDIR)/usr/doc/calendar/LICENSE -override_dh_auto_clean: - rm -rf target/ - for i in $(FILES_TO_BACKUP); do \ - [ ! -f $$i.debian ] || mv $$i.debian $$i; \ - done +override_dh_auto_test: + dune runtest -p calendar -- cgit v1.2.3