[Pkg-ocaml-maint-commits] [obus] 04/05: Import Debian changes 1.1.5-5ubuntu1

[Stéphane Glondu]

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository obus.

commit ac9581170699755cd2f6d455e1ed6863d420680f
Author: Dimitri John Ledkov <xnox at ubuntu.com>
Date:   Tue Jul 11 10:59:47 2017 +0100

    Import Debian changes 1.1.5-5ubuntu1
    
    obus (1.1.5-5ubuntu1) artful; urgency=medium
    
      * Remove duplicate constructor, to fix FTBFS with ocaml 4.04.
    
    obus (1.1.5-5build3) artful; urgency=high
    
      * No change rebuild against ocaml 4.04.
    
    obus (1.1.5-5build2) yakkety; urgency=medium
    
      * No-change rebuild for ocaml ABIs.
    
    obus (1.1.5-5build1) xenial; urgency=medium
    
      * Rebuild for new OCaml ABIs.
---
 debian/changelog                     | 24 ++++++++++++++++++++++++
 debian/control                       |  3 ++-
 debian/patches/ftbfs-ocaml4.04.patch | 28 ++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 debian/source/local-options          |  2 --
 5 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 57a26a9..848a056 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+obus (1.1.5-5ubuntu1) artful; urgency=medium
+
+  * Remove duplicate constructor, to fix FTBFS with ocaml 4.04.
+
+ -- Dimitri John Ledkov <xnox at ubuntu.com>  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 <xnox at ubuntu.com>  Mon, 03 Jul 2017 14:39:06 +0100
+
+obus (1.1.5-5build2) yakkety; urgency=medium
+
+  * No-change rebuild for ocaml ABIs.
+
+ -- Matthias Klose <doko at ubuntu.com>  Fri, 02 Sep 2016 12:16:38 +0000
+
+obus (1.1.5-5build1) xenial; urgency=medium
+
+  * Rebuild for new OCaml ABIs.
+
+ -- Colin Watson <cjwatson at ubuntu.com>  Wed, 06 Jan 2016 11:58:00 +0000
+
 obus (1.1.5-5) unstable; urgency=medium
 
   * Fix compilation with react 1.0.0
diff --git a/debian/control b/debian/control
index c7c2ba9..4203479 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
 Source: obus
 Priority: optional
-Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Stéphane Glondu <glondu at debian.org>, Nicolas Dandrimont <nicolas.dandrimont at crans.org>
 Build-Depends:
  debhelper (>= 8),
diff --git a/debian/patches/ftbfs-ocaml4.04.patch b/debian/patches/ftbfs-ocaml4.04.patch
new file mode 100644
index 0000000..7fa84ef
--- /dev/null
+++ b/debian/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 at 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/debian/patches/series b/debian/patches/series
index 7bebbe4..2e7b087 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -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
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 5396d81..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1,2 +0,0 @@
-abort-on-upstream-changes
-unapply-patches
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/obus.git