summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Puydt <jpuydt@debian.org>2023-07-04 08:57:32 +0200
committerJulien Puydt <jpuydt@debian.org>2023-07-04 08:57:32 +0200
commit22b337f9165ceb95bb1856f8b5ed52b8b906cebd (patch)
treea95a84dc91d2e20da3bf703cf9020512f3107df9
parentcc997a6ac46d5c8be431a622a06ef27487f82024 (diff)
parentc3dc9f203174e2d8ffe43dae94238350a1220bd9 (diff)
obus (1.2.4-2) unstable; urgency=medium
* Team upload. * Bump standards-version to 4.6.2. * Fix compilation with recent dune (Closes: #1040233). [dgit import unpatched obus 1.2.4-2]
-rw-r--r--debian/changelog148
-rw-r--r--debian/control71
-rw-r--r--debian/copyright42
-rw-r--r--debian/gbp.conf2
-rw-r--r--debian/libobus-ocaml-bin.install1
-rw-r--r--debian/libobus-ocaml-bin.manpages1
-rw-r--r--debian/libobus-ocaml-dev.docs2
-rw-r--r--debian/libobus-ocaml-dev.install.in15
-rw-r--r--debian/libobus-ocaml.install.in5
-rw-r--r--debian/patches/0001-Disable-the-tests-that-need-a-working-dbus-daemon.patch32
-rw-r--r--debian/patches/fix_newer_ppxlib.patch15
-rw-r--r--debian/patches/series2
-rwxr-xr-xdebian/rules25
-rw-r--r--debian/source/format1
-rw-r--r--debian/watch3
15 files changed, 365 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..9fa5dda
--- /dev/null
+++ b/debian/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 <jpuydt@debian.org> 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 <jpuydt@debian.org> Fri, 14 Oct 2022 09:02:49 +0200
+
+obus (1.2.3-1) unstable; urgency=medium
+
+ * New upstream release
+
+ -- Stéphane Glondu <glondu@debian.org> 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 <glondu@debian.org> 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 <glondu@debian.org> 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 <glondu@debian.org> 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 <glondu@debian.org> Thu, 05 Nov 2015 10:31:56 +0100
+
+obus (1.1.5-4) unstable; urgency=medium
+
+ * Add camlp4 to Build-Depends
+
+ -- Stéphane Glondu <glondu@debian.org> Fri, 16 Oct 2015 10:29:44 +0200
+
+obus (1.1.5-3) unstable; urgency=low
+
+ * Upload to unstable (Closes: #713365)
+
+ -- Stéphane Glondu <glondu@debian.org> 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 <glondu@debian.org> 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 <glondu@debian.org> 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 <glondu@debian.org> 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 <glondu@debian.org> 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 <glondu@debian.org> 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 <nicolas.dandrimont@crans.org> 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 <nicolas.dandrimont@crans.org> 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 <glondu@debian.org> Thu, 29 Apr 2010 08:28:02 +0200
+
+obus (1.0~rc1-1) experimental; urgency=low
+
+ * Initial release (Closes: #550754)
+
+ -- Stéphane Glondu <glondu@debian.org> Fri, 16 Oct 2009 10:51:54 +0200
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..3abb3f0
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,71 @@
+Source: obus
+Priority: optional
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
+Uploaders: Stéphane Glondu <glondu@debian.org>
+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/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..754006d
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,42 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Packaged-By: Stéphane Glondu <glondu@debian.org>
+Packaged-Date: Mon, 12 Oct 2009 21:34:31 +0200
+Source: https://github.com/ocaml-community/obus
+Upstream-Contact: Jérémie Dimino <jeremie@dimino.org>
+
+Files: *
+Copyright: 2008-2011, Jérémie Dimino <jeremie@dimino.org> and others
+License: BSD-C3
+
+Files: debian/*
+Copyright: 2009-2020, Stéphane Glondu <glondu@debian.org>
+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/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..cec628c
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True
diff --git a/debian/libobus-ocaml-bin.install b/debian/libobus-ocaml-bin.install
new file mode 100644
index 0000000..e772481
--- /dev/null
+++ b/debian/libobus-ocaml-bin.install
@@ -0,0 +1 @@
+usr/bin
diff --git a/debian/libobus-ocaml-bin.manpages b/debian/libobus-ocaml-bin.manpages
new file mode 100644
index 0000000..1cd0b38
--- /dev/null
+++ b/debian/libobus-ocaml-bin.manpages
@@ -0,0 +1 @@
+usr/man/*/*
diff --git a/debian/libobus-ocaml-dev.docs b/debian/libobus-ocaml-dev.docs
new file mode 100644
index 0000000..1f0987a
--- /dev/null
+++ b/debian/libobus-ocaml-dev.docs
@@ -0,0 +1,2 @@
+usr/doc/obus/*
+examples
diff --git a/debian/libobus-ocaml-dev.install.in b/debian/libobus-ocaml-dev.install.in
new file mode 100644
index 0000000..da9d30a
--- /dev/null
+++ b/debian/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/debian/libobus-ocaml.install.in b/debian/libobus-ocaml.install.in
new file mode 100644
index 0000000..2a95287
--- /dev/null
+++ b/debian/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/debian/patches/0001-Disable-the-tests-that-need-a-working-dbus-daemon.patch b/debian/patches/0001-Disable-the-tests-that-need-a-working-dbus-daemon.patch
new file mode 100644
index 0000000..14cc097
--- /dev/null
+++ b/debian/patches/0001-Disable-the-tests-that-need-a-working-dbus-daemon.patch
@@ -0,0 +1,32 @@
+From: Nicolas Dandrimont <Nicolas.Dandrimont@crans.org>
+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/debian/patches/fix_newer_ppxlib.patch b/debian/patches/fix_newer_ppxlib.patch
new file mode 100644
index 0000000..469dff7
--- /dev/null
+++ b/debian/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/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..02118df
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-Disable-the-tests-that-need-a-working-dbus-daemon.patch
+fix_newer_ppxlib.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..f098ac8
--- /dev/null
+++ b/debian/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/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..6f775c3
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts="uversionmangle=s/rc/~rc/" \
+https://github.com/ocaml-community/obus/tags .*/(.*)\.tar\.gz