diff -Nru obus-1.1.5/debian/changelog obus-1.1.5/debian/changelog --- obus-1.1.5/debian/changelog 2016-09-02 12:16:38.000000000 +0000 +++ obus-1.1.5/debian/changelog 2017-07-11 09:59:51.000000000 +0000 @@ -1,3 +1,15 @@ +obus (1.1.5-5ubuntu1) artful; urgency=medium + + * Remove duplicate constructor, to fix FTBFS with ocaml 4.04. + + -- Dimitri John Ledkov Tue, 11 Jul 2017 10:59:47 +0100 + +obus (1.1.5-5build3) artful; urgency=high + + * No change rebuild against ocaml 4.04. + + -- Dimitri John Ledkov Mon, 03 Jul 2017 14:39:06 +0100 + obus (1.1.5-5build2) yakkety; urgency=medium * No-change rebuild for ocaml ABIs. diff -Nru obus-1.1.5/debian/control obus-1.1.5/debian/control --- obus-1.1.5/debian/control 2015-11-05 09:49:06.000000000 +0000 +++ obus-1.1.5/debian/control 2017-07-03 13:39:06.000000000 +0000 @@ -1,6 +1,7 @@ Source: obus Priority: optional -Maintainer: Debian OCaml Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian OCaml Maintainers Uploaders: Stéphane Glondu , Nicolas Dandrimont Build-Depends: debhelper (>= 8), diff -Nru obus-1.1.5/debian/patches/ftbfs-ocaml4.04.patch obus-1.1.5/debian/patches/ftbfs-ocaml4.04.patch --- obus-1.1.5/debian/patches/ftbfs-ocaml4.04.patch 1970-01-01 00:00:00.000000000 +0000 +++ obus-1.1.5/debian/patches/ftbfs-ocaml4.04.patch 2017-07-11 10:00:19.000000000 +0000 @@ -0,0 +1,28 @@ +Description: Remove duplicate constructor, to fix FTBFS with ocaml 4.04. +Author: Dimitri John Ledkov + +--- 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 -Nru obus-1.1.5/debian/patches/series obus-1.1.5/debian/patches/series --- obus-1.1.5/debian/patches/series 2015-11-05 09:49:06.000000000 +0000 +++ obus-1.1.5/debian/patches/series 2017-07-11 09:56:26.000000000 +0000 @@ -1,2 +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