From dd887bbb2ef74275421b9e832c6d504df38fd793 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Mon, 7 Aug 2023 16:18:46 +0200 Subject: Update packaging --- debian/changelog | 9 +++++++++ debian/compat | 1 - debian/control | 11 +++++------ debian/copyright | 4 ++-- debian/docs | 2 -- debian/libvirt-ocaml-dev.dirs.in | 1 - debian/libvirt-ocaml-dev.docs | 2 ++ debian/libvirt-ocaml-dev.install.in | 7 +++++++ debian/libvirt-ocaml.dirs.in | 2 -- debian/libvirt-ocaml.install.in | 1 + debian/rules | 30 ++++++++++++------------------ 11 files changed, 38 insertions(+), 32 deletions(-) delete mode 100644 debian/compat delete mode 100644 debian/docs delete mode 100644 debian/libvirt-ocaml-dev.dirs.in create mode 100644 debian/libvirt-ocaml-dev.docs create mode 100644 debian/libvirt-ocaml-dev.install.in delete mode 100644 debian/libvirt-ocaml.dirs.in create mode 100644 debian/libvirt-ocaml.install.in diff --git a/debian/changelog b/debian/changelog index 9f66254..3378198 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +ocaml-libvirt (0.6.1.5-2) unstable; urgency=medium + + * Team upload + * Bump debhelper compat level to 13, and drop dependency on cdbs + * Bump Standards-Version to 4.6.2 + * Add Rules-Requires-Root: no + + -- Stéphane Glondu Mon, 07 Aug 2023 16:18:44 +0200 + ocaml-libvirt (0.6.1.5-1) unstable; urgency=medium * Team upload diff --git a/debian/compat b/debian/compat deleted file mode 100644 index f599e28..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/debian/control b/debian/control index 9a3faf4..6f636d8 100644 --- a/debian/control +++ b/debian/control @@ -3,18 +3,17 @@ Section: ocaml Priority: optional Maintainer: Debian Libvirt Maintainers Uploaders: Guido Guenther -Build-Depends: cdbs, - debhelper (>= 10), - dh-autoreconf, +Build-Depends: debhelper-compat (= 13), pkg-config, dh-ocaml, libvirt-dev, ocaml-findlib, - ocaml-nox -Standards-Version: 3.9.8 + ocaml +Standards-Version: 4.6.2 +Rules-Requires-Root: no Vcs-Browser: https://salsa.debian.org/ocaml-team/ocaml-libvirt Vcs-Git: https://salsa.debian.org/ocaml-team/ocaml-libvirt.git -Homepage: http://libvirt.org/ocaml/ +Homepage: https://libvirt.org/ocaml/ Package: libvirt-ocaml Architecture: any diff --git a/debian/copyright b/debian/copyright index 89a0fde..c617d7a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ -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-Name: ocaml-libvirt Upstream-Contact: Richard W.M. Jones -Source: http://libvirt.org/sources/ocaml +Source: https://libvirt.org/sources/ocaml Files: * Copyright: 2007-2014 Red Hat Inc. diff --git a/debian/docs b/debian/docs deleted file mode 100644 index b1a676e..0000000 --- a/debian/docs +++ /dev/null @@ -1,2 +0,0 @@ -README -TODO.libvirt diff --git a/debian/libvirt-ocaml-dev.dirs.in b/debian/libvirt-ocaml-dev.dirs.in deleted file mode 100644 index cc51687..0000000 --- a/debian/libvirt-ocaml-dev.dirs.in +++ /dev/null @@ -1 +0,0 @@ -@OCamlStdlibDir@ diff --git a/debian/libvirt-ocaml-dev.docs b/debian/libvirt-ocaml-dev.docs new file mode 100644 index 0000000..b1a676e --- /dev/null +++ b/debian/libvirt-ocaml-dev.docs @@ -0,0 +1,2 @@ +README +TODO.libvirt diff --git a/debian/libvirt-ocaml-dev.install.in b/debian/libvirt-ocaml-dev.install.in new file mode 100644 index 0000000..138b18a --- /dev/null +++ b/debian/libvirt-ocaml-dev.install.in @@ -0,0 +1,7 @@ +@OCamlStdlibDir@/libvirt/META +@OCamlStdlibDir@/libvirt/*.ml* +@OCamlStdlibDir@/libvirt/*.cmi +@OCamlStdlibDir@/libvirt/*.cma +@OCamlStdlibDir@/libvirt/*.a +OPT: @OCamlStdlibDir@/libvirt/*.cmx +OPT: @OCamlStdlibDir@/libvirt/*.cmxa diff --git a/debian/libvirt-ocaml.dirs.in b/debian/libvirt-ocaml.dirs.in deleted file mode 100644 index cdf34bb..0000000 --- a/debian/libvirt-ocaml.dirs.in +++ /dev/null @@ -1,2 +0,0 @@ -@OCamlDllDir@ -/usr/bin diff --git a/debian/libvirt-ocaml.install.in b/debian/libvirt-ocaml.install.in new file mode 100644 index 0000000..a8131b4 --- /dev/null +++ b/debian/libvirt-ocaml.install.in @@ -0,0 +1 @@ +@OCamlDllDir@ diff --git a/debian/rules b/debian/rules index 9897d43..bd80887 100755 --- a/debian/rules +++ b/debian/rules @@ -1,16 +1,9 @@ #!/usr/bin/make -f -#export DEB_BUILD_MAINT_OPTIONS = hardening=+all +include /usr/share/ocaml/ocamlvars.mk -include /usr/share/cdbs/1/rules/autoreconf.mk -include /usr/share/cdbs/1/rules/ocaml.mk -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk +DESTDIR := $(CURDIR)/debian/tmp -DESTDIR_DEV=$(CURDIR)/debian/libvirt-ocaml-dev -DESTDIR=$(CURDIR)/debian/libvirt-ocaml - -DEB_MAKE_CLEAN_TARGET := clean DEB_MAKE_BUILD_TARGET := all ifeq ($(OCAML_HAVE_OCAMLOPT),yes) DEB_MAKE_BUILD_TARGET += opt @@ -18,14 +11,15 @@ DEB_MAKE_INSTALL_TARGET := install-opt else DEB_MAKE_INSTALL_TARGET := install-byte endif -DEB_MAKE_INSTALL_TARGET += OCAMLFIND_DESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)" prefix="$(DESTDIR)/usr" +DEB_MAKE_INSTALL_TARGET += OCAMLFIND_DESTDIR="$(DESTDIR)$(OCAML_STDLIB_DIR)" prefix="$(DESTDIR)/usr" + +%: + dh $@ --with ocaml -clean:: - -$(RM) '$(CURDIR)/Make.rules' - -$(RM) '$(CURDIR)/Makefile' - -$(RM) '$(CURDIR)/libvirt/Makefile' - -$(RM) '$(CURDIR)/examples/Makefile' +override_dh_auto_build: + $(MAKE) $(DEB_MAKE_BUILD_TARGET) -install/libvirt-ocaml-dev:: - mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/libvirt/*.so $(DESTDIR)/$(OCAML_DLL_DIR)/ - rm -rf $(CURDIR)/debian/libvirt-ocaml/usr/bin +override_dh_auto_install: + mkdir -p "$(DESTDIR)$(OCAML_STDLIB_DIR)" "$(DESTDIR)$(OCAML_DLL_DIR)" + $(MAKE) $(DEB_MAKE_INSTALL_TARGET) + find $(DESTDIR) -name '*.owner' -delete -- cgit v1.2.3