Import obus_1.1.5-6.debian.tar.xz

[dgit import tarball obus 1.1.5-6 obus_1.1.5-6.debian.tar.xz]

17 files changed, 394 insertions, 0 deletions

diff --git a/changelog b/changelog
new file mode 100644
index 0000000..448653f
--- /dev/null
+++ b/changelog
@@ -0,0 +1,102 @@
+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/compat b/compat
new file mode 100644
index 0000000..45a4fb7
--- /dev/null
+++ b/compat
@@ -0,0 +1 @@
+8
diff --git a/control b/control
new file mode 100644
index 0000000..c847926
--- /dev/null
+++ b/control
@@ -0,0 +1,70 @@
+Source: obus
+Priority: optional
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
+Uploaders: Stéphane Glondu <glondu@debian.org>, Nicolas Dandrimont <nicolas.dandrimont@crans.org>
+Build-Depends:
+ debhelper (>= 8),
+ dh-ocaml (>= 0.9),
+ libtype-conv-camlp4-dev (>= 108),
+ libxmlm-ocaml-dev,
+ liblwt-ocaml-dev (>= 2.2.0~),
+ camlp4,
+ ocaml-findlib (>= 1.4),
+ ocamlbuild,
+ ocaml-nox (>= 4)
+Standards-Version: 3.9.4
+Section: ocaml
+Homepage: http://obus.forge.ocamlcore.org/
+Vcs-Browser: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/obus.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/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..c3ebcdf
--- /dev/null
+++ b/copyright
@@ -0,0 +1,58 @@
+Format: http://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: http://obus.forge.ocamlcore.org/
+Upstream-Contact: Jérémie Dimino <jeremie@dimino.org>
+
+Files: *
+Copyright: 2009, Jérémie Dimino <jeremie@dimino.org>
+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.
+
+Files: syntax/pa_monad.ml
+Copyright: 2006-2008, J. Carette, L. E. van Dijk, O. Kiselyov
+License: LGPL-2+
+
+Files: debian/*
+Copyright: 2009-2013, Stéphane Glondu <glondu@debian.org>
+License: LGPL-2+
+
+License: LGPL-2+
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+ .
+ This library 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
+ Library General Public License for more details.
+ .
+ The complete text of the GNU Lesser General Public License can be
+ found in `/usr/share/common-licenses/LGPL-2'.
diff --git a/gbp.conf b/gbp.conf
new file mode 100644
index 0000000..6c7ed3b
--- /dev/null
+++ b/gbp.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+pristine-tar = True
+cleaner = debuild clean && dh_quilt_unpatch && dh_clean
diff --git a/libobus-ocaml-bin.install b/libobus-ocaml-bin.install
new file mode 100644
index 0000000..a65408f
--- /dev/null
+++ b/libobus-ocaml-bin.install
@@ -0,0 +1,2 @@
+usr/bin
+usr/share/man
diff --git a/libobus-ocaml-dev.doc-base b/libobus-ocaml-dev.doc-base
new file mode 100644
index 0000000..176bc7c
--- /dev/null
+++ b/libobus-ocaml-dev.doc-base
@@ -0,0 +1,9 @@
+Document: obus
+Title: OBus API documentation
+Author: Jérémie Dimino
+Abstract: OBus ocamldoc-generated API documentation
+Section: Programming/OCaml
+
+Format: HTML
+Index: /usr/share/doc/libobus-ocaml-dev/api/index.html
+Files: /usr/share/doc/libobus-ocaml-dev/api/*
diff --git a/libobus-ocaml-dev.docs b/libobus-ocaml-dev.docs
new file mode 100644
index 0000000..ba8894c
--- /dev/null
+++ b/libobus-ocaml-dev.docs
@@ -0,0 +1,2 @@
+README
+
diff --git a/libobus-ocaml-dev.install.in b/libobus-ocaml-dev.install.in
new file mode 100644
index 0000000..2d21c32
--- /dev/null
+++ b/libobus-ocaml-dev.install.in
@@ -0,0 +1,6 @@
+usr/share/doc/libobus-ocaml-dev
+@OCamlStdlibDir@/obus/*.cmi
+@OCamlStdlibDir@/obus/*.mli
+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..8e96e4c
--- /dev/null
+++ b/libobus-ocaml.install.in
@@ -0,0 +1,3 @@
+@OCamlStdlibDir@/obus/META
+@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..6f57db4
--- /dev/null
+++ b/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 8f34e8c..78dcacb 100644
+--- a/tests/main.ml
++++ b/tests/main.ml
+@@ -33,7 +33,7 @@ let rec run_tests failures total = function
+       lwt () = title name in
+       begin
+         try_lwt
+-          test ()
++          Lwt_unix.with_timeout 30. test
+         with exn ->
+           lwt () = Lwt_io.printlf "test failed with: %s" (Printexc.to_string exn) in
+           lwt () = Lwt_io.printl (Printexc.get_backtrace ()) in
+@@ -60,8 +60,8 @@ lwt () =
+   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;*)
+   ]
+ 
diff --git a/patches/0002-Fix-compilation-with-react-1.0.0.patch b/patches/0002-Fix-compilation-with-react-1.0.0.patch
new file mode 100644
index 0000000..29b2a8d
--- /dev/null
+++ b/patches/0002-Fix-compilation-with-react-1.0.0.patch
@@ -0,0 +1,21 @@
+From: Stephane Glondu <steph@glondu.net>
+Date: Thu, 5 Nov 2015 10:29:34 +0100
+Subject: Fix compilation with react 1.0.0
+
+---
+ src/oBus_signal.ml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/oBus_signal.ml b/src/oBus_signal.ml
+index 06162a3..ad11d94 100644
+--- a/src/oBus_signal.ml
++++ b/src/oBus_signal.ml
+@@ -229,7 +229,7 @@ let connect ?switch sd =
+     in
+ 
+     let event, send = E.create () in
+-    let node = Lwt_sequence.add_r send senders in
++    let node = Lwt_sequence.add_r (fun x -> send x) senders in
+ 
+     let event =
+       E.filter
diff --git a/patches/ftbfs-ocaml4.04.patch b/patches/ftbfs-ocaml4.04.patch
new file mode 100644
index 0000000..7fa84ef
--- /dev/null
+++ b/patches/ftbfs-ocaml4.04.patch
@@ -0,0 +1,28 @@
+Description: Remove duplicate constructor, to fix FTBFS with ocaml 4.04.
+Author: Dimitri John Ledkov <xnox@ubuntu.com>
+
+--- obus-1.1.5.orig/src/oBus_bus.ml
++++ obus-1.1.5/src/oBus_bus.ml
+@@ -151,9 +151,6 @@ exception Match_rule_not_found of string
+ exception Match_rule_invalid of string
+  with obus("org.freedesktop.DBus.Error.MatchRuleInvalid")
+ 
+-exception Service_unknown of string
+- with obus("org.freedesktop.DBus.Error.ServiceUnknown")
+-
+ exception Name_has_no_owner of string
+  with obus("org.freedesktop.DBus.Error.NameHasNoOwner")
+ 
+--- obus-1.1.5.orig/src/oBus_bus.mli
++++ obus-1.1.5/src/oBus_bus.mli
+@@ -152,10 +152,6 @@ val list_queued_owners : t -> OBus_name.
+   (** Return the connection unique names of applications waiting for a
+       name *)
+ 
+-exception Service_unknown of string
+-  (** Raised when we try to contact a service which is not available
+-      and the bus do not known how to start it *)
+-
+ (** {6 Messages routing} *)
+ 
+ (** Note that you should prefer using {!OBus_match.export} and
diff --git a/patches/series b/patches/series
new file mode 100644
index 0000000..2e7b087
--- /dev/null
+++ b/patches/series
@@ -0,0 +1,3 @@
+0001-Disable-the-tests-that-need-a-working-dbus-daemon.patch
+0002-Fix-compilation-with-react-1.0.0.patch
+ftbfs-ocaml4.04.patch
diff --git a/rules b/rules
new file mode 100755
index 0000000..b14e01f
--- /dev/null
+++ b/rules
@@ -0,0 +1,47 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+include /usr/share/ocaml/ocamlvars.mk
+
+CONFIGURE_OPTS := 
+
+ifneq ($(OCAML_NATDYNLINK),yes)
+	CONFIGURE_OPTS := --override is_native false
+endif
+
+export OCAMLFIND_DESTDIR=$(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
+DESTDIR=$(CURDIR)/debian/tmp
+
+%:
+	dh $@ --with ocaml
+
+.PHONY: override_dh_auto_configure
+override_dh_auto_configure:
+	ocaml setup.ml -configure $(CONFIGURE_OPTS) --prefix /usr --destdir '$(DESTDIR)' --docdir /usr/share/doc/libobus-ocaml-dev
+
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
+	ocaml setup.ml -build
+	ocaml setup.ml -doc
+
+.PHONY: override_dh_auto_test
+override_dh_auto_test:
+	mkdir -p $(CURDIR)/debian/tmp_home
+	HOME=$(CURDIR)/debian/tmp_home ocaml setup.ml -test
+	rm -r $(CURDIR)/debian/tmp_home
+
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
+	mkdir -p '$(OCAMLFIND_DESTDIR)'
+	ocaml setup.ml -install
+
+.PHONY: override_dh_install
+override_dh_install:
+	dh_install --fail-missing
+
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
+	ocaml setup.ml -distclean
+
+.PHONY: override_dh_installchangelogs
+override_dh_installchangelogs:
+	dh_installchangelogs CHANGES.darcs
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..5502c9f
--- /dev/null
+++ b/watch
@@ -0,0 +1,6 @@
+version=3
+opts="uversionmangle=s/rc/~rc/" \
+http://forge.ocamlcore.org/frs/?group_id=26 .*/obus-(.*)\.tar\.gz
+# Upstream darcs repository:
+#   http://forge.ocamlcore.org/anonscm/darcs/obus/obus/
+#   http://darcs.ocamlcore.org/cgi-bin/darcsweb.cgi?r=obus/obus