From c3dc9f203174e2d8ffe43dae94238350a1220bd9 Mon Sep 17 00:00:00 2001 From: Julien Puydt Date: Tue, 4 Jul 2023 08:57:32 +0200 Subject: Import obus_1.2.4-2.debian.tar.xz [dgit import tarball obus 1.2.4-2 obus_1.2.4-2.debian.tar.xz] --- changelog | 148 +++++++++++++++++++++ control | 71 ++++++++++ copyright | 42 ++++++ gbp.conf | 2 + libobus-ocaml-bin.install | 1 + libobus-ocaml-bin.manpages | 1 + libobus-ocaml-dev.docs | 2 + libobus-ocaml-dev.install.in | 15 +++ libobus-ocaml.install.in | 5 + ...the-tests-that-need-a-working-dbus-daemon.patch | 32 +++++ patches/fix_newer_ppxlib.patch | 15 +++ patches/series | 2 + rules | 25 ++++ source/format | 1 + watch | 3 + 15 files changed, 365 insertions(+) create mode 100644 changelog create mode 100644 control create mode 100644 copyright create mode 100644 gbp.conf create mode 100644 libobus-ocaml-bin.install create mode 100644 libobus-ocaml-bin.manpages create mode 100644 libobus-ocaml-dev.docs create mode 100644 libobus-ocaml-dev.install.in create mode 100644 libobus-ocaml.install.in create mode 100644 patches/0001-Disable-the-tests-that-need-a-working-dbus-daemon.patch create mode 100644 patches/fix_newer_ppxlib.patch create mode 100644 patches/series create mode 100755 rules create mode 100644 source/format create mode 100644 watch diff --git a/changelog b/changelog new file mode 100644 index 0000000..9fa5dda --- /dev/null +++ b/changelog @@ -0,0 +1,148 @@ +obus (1.2.4-2) unstable; urgency=medium + + * Team upload. + * Bump standards-version to 4.6.2. + * Fix compilation with recent dune (Closes: #1040233). + + -- Julien Puydt Tue, 04 Jul 2023 08:57:32 +0200 + +obus (1.2.4-1) unstable; urgency=medium + + * Add patch to support newer ppxlib. + * Bump standards-version to 4.6.1. + * Fix d/watch. + * New upstream. + + -- Julien Puydt Fri, 14 Oct 2022 09:02:49 +0200 + +obus (1.2.3-1) unstable; urgency=medium + + * New upstream release + + -- Stéphane Glondu Wed, 26 Aug 2020 11:50:53 +0200 + +obus (1.2.2-1) unstable; urgency=medium + + * New upstream release (Closes: #836118) + * Bump debhelper compat level to 13 + * Bump Standards-Version to 4.5.0 + + -- Stéphane Glondu Wed, 29 Jul 2020 13:34:02 +0200 + +obus (1.2.1-1) unstable; urgency=medium + + [ Stéphane Glondu ] + * New upstream release (Closes: #933992) + * Update Homepage and debian/watch + * Update Vcs-* + * Bump debhelper compat level to 12 + * Bump Standards-Version to 4.4.1 + * Add Rules-Requires-Root: no + + [ Nicolas Dandrimont ] + * d/control: remove myself from Uploaders + + -- Stéphane Glondu Mon, 20 Jan 2020 09:09:35 +0100 + +obus (1.1.5-6) unstable; urgency=medium + + [ Stéphane Glondu ] + * Add ocamlbuild to Build-Depends + * Update Vcs-* + + [ Dimitri John Ledkov ] + * Remove duplicate constructor, to fix FTBFS with ocaml 4.04. + + -- Stéphane Glondu Thu, 27 Jul 2017 07:08:02 +0200 + +obus (1.1.5-5) unstable; urgency=medium + + * Fix compilation with react 1.0.0 + + -- Stéphane Glondu Thu, 05 Nov 2015 10:31:56 +0100 + +obus (1.1.5-4) unstable; urgency=medium + + * Add camlp4 to Build-Depends + + -- Stéphane Glondu Fri, 16 Oct 2015 10:29:44 +0200 + +obus (1.1.5-3) unstable; urgency=low + + * Upload to unstable (Closes: #713365) + + -- Stéphane Glondu Sat, 07 Dec 2013 09:40:44 +0100 + +obus (1.1.5-2) experimental; urgency=low + + * Build-Depend on ocaml-find >= 1.4 to handle new native architectures + + -- Stéphane Glondu Sat, 27 Jul 2013 10:03:52 +0200 + +obus (1.1.5-1) experimental; urgency=low + + * New upstream release + - needs OCaml >= 4 and type-conv >= 108 + * Update Vcs-* + + -- Stéphane Glondu Sat, 27 Jul 2013 09:18:19 +0200 + +obus (1.1.4-2) unstable; urgency=low + + * Do not build natively on !natdynlink (fixes FTBFS) + + -- Stéphane Glondu Fri, 10 May 2013 19:49:57 +0200 + +obus (1.1.4-1) unstable; urgency=low + + * New upstream release + * Use format version 1.0 in debian/copyright + * Bump Standards-Version to 3.9.4 + * Bump debhelper compat level to 8 + + -- Stéphane Glondu Thu, 09 May 2013 23:23:13 +0200 + +obus (1.1.3-1) unstable; urgency=low + + * New upstream release + - patch applied upstream: Fix-for-type-conv-2.3.0 + + -- Stéphane Glondu Sat, 30 Jul 2011 17:19:05 +0200 + +obus (1.1.2-2) unstable; urgency=low + + * Disable all tests needing a working DBus daemon + * Make the tests use a temporary directory as $HOME (Closes: #630322) + * Force compilation as bytecode on architectures without native dynlink + (Closes: #630320) + + -- Nicolas Dandrimont Tue, 28 Jun 2011 21:39:32 +0200 + +obus (1.1.2-1) unstable; urgency=low + + * New upstream release + - Drop patches fixed upstream + - Add patch for compatibility with type-conv >= 2.3.0 + * Bump required OCaml version to 3.12.0, lwt to 2.2.0 + * Bump Standards-Version to 3.9.2 (no changes) + * Upload to unstable + + -- Nicolas Dandrimont Sat, 11 Jun 2011 23:33:06 +0200 + +obus (1.0~rc1-2) experimental; urgency=low + + * Rebuild with OCaml 3.11.2 + * Switch source package format to 3.0 (quilt) + - convert existing changes to + 0001-Fix-build-on-bytecode-architectures.patch + * Add 0002-Fix-build-with-lwt-2.1.0.patch + * Bump Standards-Version to 3.8.4 (no changes) + * Fix debian/watch + + -- Stéphane Glondu Thu, 29 Apr 2010 08:28:02 +0200 + +obus (1.0~rc1-1) experimental; urgency=low + + * Initial release (Closes: #550754) + + -- Stéphane Glondu Fri, 16 Oct 2009 10:51:54 +0200 diff --git a/control b/control new file mode 100644 index 0000000..3abb3f0 --- /dev/null +++ b/control @@ -0,0 +1,71 @@ +Source: obus +Priority: optional +Maintainer: Debian OCaml Maintainers +Uploaders: Stéphane Glondu +Build-Depends: + debhelper-compat (= 13), + dh-ocaml, + libxmlm-ocaml-dev, + liblwt-ocaml-dev (>= 4.3.0), + liblwt-log-ocaml-dev, + libppxlib-ocaml-dev (>= 0.25.0), + ocaml-dune, + menhir, + ocaml-nox +Standards-Version: 4.6.2 +Rules-Requires-Root: no +Section: ocaml +Homepage: https://github.com/ocaml-community/obus +Vcs-Browser: https://salsa.debian.org/ocaml-team/obus +Vcs-Git: https://salsa.debian.org/ocaml-team/obus.git + +Package: libobus-ocaml-dev +Architecture: any +Depends: + ${ocaml:Depends}, + ${shlibs:Depends}, + ${misc:Depends} +Provides: ${ocaml:Provides} +Recommends: + ocaml-findlib, + libobus-ocaml-bin +Description: pure OCaml implementation of D-Bus (development files) + OBus is a pure OCaml implementation of D-Bus. It aims to provide a + clean and easy way for OCaml programmers to access and provide D-Bus + services. + . + D-Bus is a message bus, used for sending messages between + applications. It supports broadcast messages, asynchronous messages + (thus decreasing latency), authentication, and more. It is designed + to be low-overhead. D-Bus also supports a method call mapping for its + messages. + . + This package contains development files of OBus. + +Package: libobus-ocaml +Architecture: any +Depends: + ${ocaml:Depends}, + ${shlibs:Depends}, + ${misc:Depends} +Provides: ${ocaml:Provides} +Description: pure OCaml implementation of D-Bus (runtime) + OBus is a pure OCaml implementation of D-Bus. It aims to provide a + clean and easy way for OCaml programmers to access and provide D-Bus + services. + . + This package contains dynamically loadable plugins of OBus. + +Package: libobus-ocaml-bin +Architecture: any +Depends: + ${ocaml:Depends}, + ${shlibs:Depends}, + ${misc:Depends} +Recommends: libobus-ocaml-dev +Description: pure OCaml implementation of D-Bus (command-line tools) + OBus is a pure OCaml implementation of D-Bus. It aims to provide a + clean and easy way for OCaml programmers to access and provide D-Bus + services. + . + This package contains command-line tools useful for using OBus. diff --git a/copyright b/copyright new file mode 100644 index 0000000..754006d --- /dev/null +++ b/copyright @@ -0,0 +1,42 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Packaged-By: Stéphane Glondu +Packaged-Date: Mon, 12 Oct 2009 21:34:31 +0200 +Source: https://github.com/ocaml-community/obus +Upstream-Contact: Jérémie Dimino + +Files: * +Copyright: 2008-2011, Jérémie Dimino and others +License: BSD-C3 + +Files: debian/* +Copyright: 2009-2020, Stéphane Glondu +License: BSD-C3 + +License: BSD-C3 + All rights reserved. + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * 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. + * Neither the name of Jeremie Dimino nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS AND + 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. diff --git a/gbp.conf b/gbp.conf new file mode 100644 index 0000000..cec628c --- /dev/null +++ b/gbp.conf @@ -0,0 +1,2 @@ +[DEFAULT] +pristine-tar = True diff --git a/libobus-ocaml-bin.install b/libobus-ocaml-bin.install new file mode 100644 index 0000000..e772481 --- /dev/null +++ b/libobus-ocaml-bin.install @@ -0,0 +1 @@ +usr/bin diff --git a/libobus-ocaml-bin.manpages b/libobus-ocaml-bin.manpages new file mode 100644 index 0000000..1cd0b38 --- /dev/null +++ b/libobus-ocaml-bin.manpages @@ -0,0 +1 @@ +usr/man/*/* diff --git a/libobus-ocaml-dev.docs b/libobus-ocaml-dev.docs new file mode 100644 index 0000000..1f0987a --- /dev/null +++ b/libobus-ocaml-dev.docs @@ -0,0 +1,2 @@ +usr/doc/obus/* +examples diff --git a/libobus-ocaml-dev.install.in b/libobus-ocaml-dev.install.in new file mode 100644 index 0000000..da9d30a --- /dev/null +++ b/libobus-ocaml-dev.install.in @@ -0,0 +1,15 @@ +@OCamlStdlibDir@/obus/ppx/ppx.exe +@OCamlStdlibDir@/obus/*opam* +@OCamlStdlibDir@/obus/*dune* +@OCamlStdlibDir@/obus/*.ml* +@OCamlStdlibDir@/obus/*.cmi +@OCamlStdlibDir@/obus/*.cmt* +DYN: @OCamlStdlibDir@/obus/*.cmx +DYN: @OCamlStdlibDir@/obus/*.cmxa +DYN: @OCamlStdlibDir@/obus/*.a +@OCamlStdlibDir@/obus/*/*.ml* +@OCamlStdlibDir@/obus/*/*.cmi +@OCamlStdlibDir@/obus/*/*.cmt* +DYN: @OCamlStdlibDir@/obus/*/*.cmx +DYN: @OCamlStdlibDir@/obus/*/*.cmxa +DYN: @OCamlStdlibDir@/obus/*/*.a diff --git a/libobus-ocaml.install.in b/libobus-ocaml.install.in new file mode 100644 index 0000000..2a95287 --- /dev/null +++ b/libobus-ocaml.install.in @@ -0,0 +1,5 @@ +@OCamlStdlibDir@/obus/META +@OCamlStdlibDir@/obus/*.cma +DYN: @OCamlStdlibDir@/obus/*.cmxs +@OCamlStdlibDir@/obus/*/*.cma +DYN: @OCamlStdlibDir@/obus/*/*.cmxs diff --git a/patches/0001-Disable-the-tests-that-need-a-working-dbus-daemon.patch b/patches/0001-Disable-the-tests-that-need-a-working-dbus-daemon.patch new file mode 100644 index 0000000..14cc097 --- /dev/null +++ b/patches/0001-Disable-the-tests-that-need-a-working-dbus-daemon.patch @@ -0,0 +1,32 @@ +From: Nicolas Dandrimont +Date: Sat, 11 Jun 2011 23:38:24 +0200 +Subject: Disable the tests that need a working dbus daemon + +--- + tests/main.ml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/main.ml b/tests/main.ml +index edd960f..cf85171 100644 +--- a/tests/main.ml ++++ b/tests/main.ml +@@ -33,7 +33,7 @@ let rec run_tests failures total = function + let%lwt () = title name in + begin + try%lwt +- test () ++ Lwt_unix.with_timeout 30. test + with exn -> + let%lwt () = Lwt_io.printlf "test failed with: %s" (Printexc.to_string exn) in + let%lwt () = Lwt_io.printl (Printexc.get_backtrace ()) in +@@ -60,8 +60,8 @@ let () = Lwt_main.run begin + run_tests 0 0 [ + "serialization", Test_serialization.test; + "string validation", Test_validation.test; +- "authentication", Test_auth.test; ++ (*"authentication", Test_auth.test; + (*"communication", Test_communication.test;*) +- "garbage collection", Test_gc.test; ++ "garbage collection", Test_gc.test;*) + ] + end diff --git a/patches/fix_newer_ppxlib.patch b/patches/fix_newer_ppxlib.patch new file mode 100644 index 0000000..469dff7 --- /dev/null +++ b/patches/fix_newer_ppxlib.patch @@ -0,0 +1,15 @@ +Description: compile with a newer ppxlib +Author: Sonja Heinze +Forwarded: upstream 77e1be9f4ec630908a339fd614e416d0dbd77cf5 + +--- obus.orig/src/ppx/ppx_obus.ml ++++ obus/src/ppx/ppx_obus.ml +@@ -42,7 +42,7 @@ + in () + ] in + (match exn.ptyexn_constructor.pext_kind with +- | Pext_decl (Pcstr_tuple [typ], None) -> ++ | Pext_decl (_, Pcstr_tuple [typ], None) -> + Some (registerer typ) + | _ -> + Location.raise_errorf ~loc:pstr_loc diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..02118df --- /dev/null +++ b/patches/series @@ -0,0 +1,2 @@ +0001-Disable-the-tests-that-need-a-working-dbus-daemon.patch +fix_newer_ppxlib.patch diff --git a/rules b/rules new file mode 100755 index 0000000..f098ac8 --- /dev/null +++ b/rules @@ -0,0 +1,25 @@ +#!/usr/bin/make -f +# -*- makefile -*- +include /usr/share/ocaml/ocamlvars.mk + +DESTDIR=$(CURDIR)/debian/tmp + +%: + dh $@ --with ocaml + +override_dh_auto_build: + dune build -p obus + +override_dh_auto_install: + dune install --destdir=$(DESTDIR) --prefix=/usr --libdir=$(OCAML_STDLIB_DIR) + rm -f $(DESTDIR)/usr/doc/obus/LICENSE + +override_dh_auto_test: +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + dune runtest -p obus +endif + +override_dh_auto_clean: + dune clean + +override_dh_dwz: diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/watch b/watch new file mode 100644 index 0000000..6f775c3 --- /dev/null +++ b/watch @@ -0,0 +1,3 @@ +version=3 +opts="uversionmangle=s/rc/~rc/" \ +https://github.com/ocaml-community/obus/tags .*/(.*)\.tar\.gz -- cgit v1.2.3