[Pkg-ocaml-maint-commits] [ocaml-libvirt] 01/03: Import Debian changes 0.6.1.4-1ubuntu1

[Stéphane Glondu]

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

glondu pushed a commit to branch debian/sid
in repository ocaml-libvirt.

commit 4142b25cf8ec7257fb67c4fcb010195352ab0dea
Author: Dimitri John Ledkov <xnox at ubuntu.com>
Date:   Wed Jun 28 10:53:47 2017 +0100

    Import Debian changes 0.6.1.4-1ubuntu1
    
    ocaml-libvirt (0.6.1.4-1ubuntu1) artful; urgency=medium
    
      * Cherrypick upstream patch to use C99 int types.
    
    ocaml-libvirt (0.6.1.4-1build1) artful; urgency=high
    
      * No change rebuild against ocaml 4.04.
---
 debian/changelog                                   | 12 ++++++++
 debian/control                                     |  3 +-
 debian/gbp.conf                                    |  6 ----
 ...ndard-int64_t-instead-of-OCaml-defined-an.patch | 35 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 5 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4ba385b..c6a3f5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+ocaml-libvirt (0.6.1.4-1ubuntu1) artful; urgency=medium
+
+  * Cherrypick upstream patch to use C99 int types.
+
+ -- Dimitri John Ledkov <xnox at ubuntu.com>  Wed, 28 Jun 2017 10:53:47 +0100
+
+ocaml-libvirt (0.6.1.4-1build1) artful; urgency=high
+
+  * No change rebuild against ocaml 4.04.
+
+ -- Dimitri John Ledkov <xnox at ubuntu.com>  Tue, 27 Jun 2017 13:37:32 +0100
+
 ocaml-libvirt (0.6.1.4-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index e39ac96..13adcf5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: ocaml-libvirt
 Section: ocaml
 Priority: optional
-Maintainer: Debian Libvirt Maintainers <pkg-libvirt-maintainers at lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Libvirt Maintainers <pkg-libvirt-maintainers at lists.alioth.debian.org>
 Uploaders: Guido Guenther <agx at debian.org>
 Build-Depends: cdbs,
                debhelper (>= 10),
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index 760033d..0000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[DEFAULT]
-upstream-branch=upstream/latest
-debian-branch=debian/sid
-
-[pq]
-patch-numbers = False
diff --git a/debian/patches/0001-Use-C99-standard-int64_t-instead-of-OCaml-defined-an.patch b/debian/patches/0001-Use-C99-standard-int64_t-instead-of-OCaml-defined-an.patch
new file mode 100644
index 0000000..1f29677
--- /dev/null
+++ b/debian/patches/0001-Use-C99-standard-int64_t-instead-of-OCaml-defined-an.patch
@@ -0,0 +1,35 @@
+From 21ac993da0a187821e812fe7b5b31a426121a546 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones at redhat.com>
+Date: Sat, 30 Aug 2014 19:10:19 +0100
+Subject: [PATCH] Use C99 standard int64_t instead of OCaml defined (and soon
+ to go) int64.
+
+---
+ libvirt/libvirt_c_oneoffs.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libvirt/libvirt_c_oneoffs.c b/libvirt/libvirt_c_oneoffs.c
+index 3bb572f..06b3852 100644
+--- a/libvirt/libvirt_c_oneoffs.c
++++ b/libvirt/libvirt_c_oneoffs.c
+@@ -140,7 +140,7 @@ ocaml_libvirt_connect_node_get_free_memory (value connv)
+   NONBLOCKING (r = virNodeGetFreeMemory (conn));
+   CHECK_ERROR (r == 0, conn, "virNodeGetFreeMemory");
+ 
+-  rv = caml_copy_int64 ((int64) r);
++  rv = caml_copy_int64 ((int64_t) r);
+   CAMLreturn (rv);
+ }
+ 
+@@ -161,7 +161,7 @@ ocaml_libvirt_connect_node_get_cells_free_memory (value connv,
+ 
+   rv = caml_alloc (r, 0);
+   for (i = 0; i < r; ++i) {
+-    iv = caml_copy_int64 ((int64) freemems[i]);
++    iv = caml_copy_int64 ((int64_t) freemems[i]);
+     Store_field (rv, i, iv);
+   }
+ 
+-- 
+2.7.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 2d15909..6f10267 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 10_disable-Werror.patch
 20_improve-GCC-hardening.patch
+0001-Use-C99-standard-int64_t-instead-of-OCaml-defined-an.patch

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