ocaml-libvirt (0.6.1.4-2) unstable; urgency=medium

  [ Stéphane Glondu ]
  * Team upload

  [ Dimitri John Ledkov ]
  * Cherrypick upstream patch to use C99 int types.

[dgit import unpatched ocaml-libvirt 0.6.1.4-2]

17 files changed, 375 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..a9369fe
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,111 @@
+ocaml-libvirt (0.6.1.4-2) unstable; urgency=medium
+
+  [ Stéphane Glondu ]
+  * Team upload
+
+  [ Dimitri John Ledkov ]
+  * Cherrypick upstream patch to use C99 int types.
+
+ -- Stéphane Glondu <glondu@debian.org>  Wed, 19 Jul 2017 10:18:00 +0200
+
+ocaml-libvirt (0.6.1.4-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release.
+  * Migrations:
+      - debian/copyright to 1.0 format.
+      - debian/rules to (new) reduced format.
+      - DebSrc to 3.0.
+      - DH level to 10.
+      - Using dh-autoreconf now (with CDBS).
+  * debian/clean: removed no longer needed files mlvirsh/mlvirsh_gettext.ml and
+    debian/xml-man/en/mlvirsh.1.
+  * debian/control:
+      - Added ocaml-findlib to Depends field.
+      - Bumped Standards-Version to 3.9.8.
+      - Changed Priority from extra to optional.
+      - Deduplicate short and long descriptions.
+      - Removed deprecated field DM-Upload-Allowed.
+      - Removed MIA co-maintainers.
+      - Removed the unneeded minimal version from relationships for dh-ocaml
+        and ocaml-nox build dependencies, because all current versions in
+        Debian, since old-old-stable, are newer.
+      - Updated the Vcs-* fields.
+  * debian/gbp.conf: removed, considering that 'pristine-tar = True' is default
+    for gbp command and subcommands.
+  * debian/patches/:
+      - 10_disable-Werror.patch: created to disable unnecessary option -Werror
+        to avoid a FTBFS.
+      - 20_improve-GCC-hardening.patch: add CPPFLAGS to improve the hardening.
+  * debian/rules:
+      - Added a line to remove the empty usr/bin directory.
+      - Removed some trash.
+  * debian/watch:
+      - Bumped to version 4.
+      - Improved.
+
+ -- Joao Eriberto Mota Filho <eriberto@debian.org>  Sun, 18 Dec 2016 11:14:24 -0200
+
+ocaml-libvirt (0.6.1.2-1) unstable; urgency=low
+
+  * [e66c65e] Imported Upstream version 0.6.1.2
+  * [730105b] Remove handling of obsolete mlvirsh and gettext support
+  * [1b5674d] Drop redo-patches target from debian/rules
+  * [f0e659c] Add myself as uploader and allow DM upload
+  * [3696ede] Remove unused patch system
+  * [3f9da9c] Bump Standards-Version to 3.9.3
+
+ -- Laurent Léonard <laurent@open-minds.org>  Mon, 16 Apr 2012 02:50:15 +0200
+
+ocaml-libvirt (0.6.1.0-2) unstable; urgency=low
+
+  * Use dh_ocaml 0.9.1 features (dependencies, ocamldoc)
+  * Upgrade Standards-Version to 3.8.3 (no change)
+
+ -- Sylvain Le Gall <gildor@debian.org>  Tue, 08 Dec 2009 23:32:40 +0000
+
+ocaml-libvirt (0.6.1.0-1) unstable; urgency=low
+
+  * New Upstream Version
+  * Add build dependency on libgettext-ocaml-dev
+  * Upgrade standards-version to 3.8.2 (section ocaml)
+  * Tighten build-depends to ease OCaml 3.11.1 transition
+
+ -- Sylvain Le Gall <gildor@debian.org>  Mon, 06 Jul 2009 22:53:40 +0200
+
+ocaml-libvirt (0.4.4.2-1) unstable; urgency=low
+
+  * New Upstream Version
+  * Add debian/gbp.conf
+  * Add dh-ocaml build-dependency (rules/ocaml.mk)
+  * Upgrade debian/compat to 7 (use debian/clean)
+  * Add ${misc:Depends} to dependencies
+
+ -- Sylvain Le Gall <gildor@debian.org>  Sat, 07 Mar 2009 15:50:02 +0100
+
+ocaml-libvirt (0.4.4.1-3) unstable; urgency=low
+
+  * Remove libvirt-bin build dependency which is useless
+
+ -- Sylvain Le Gall <gildor@debian.org>  Sat, 20 Sep 2008 11:05:52 +0200
+
+ocaml-libvirt (0.4.4.1-2) unstable; urgency=low
+
+  * Add dependency to libvirt-dev (Closes: #496333)
+  * Fix removal of manpage in clean target
+
+ -- Sylvain Le Gall <gildor@debian.org>  Sun, 24 Aug 2008 17:51:26 +0200
+
+ocaml-libvirt (0.4.4.1-1) unstable; urgency=low
+
+  [ Guido Guenther ]
+  * Initial release (Closes: #488229)
+
+  [ Sylvain Le Gall ]
+  * Add manpage for mlvirsh
+  * Ship *.mo file
+  * Add a watch file
+  * Update debian/copyright to
+    http://wiki.debian.org/Proposals/CopyrightFormat
+
+ -- Sylvain Le Gall <gildor@debian.org>  Mon, 07 Jul 2008 14:54:44 +0200
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..64dbd67
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,5 @@
+META
+config.h
+config.log
+config.status
+libvirt/libvirt_version.ml
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..f599e28
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..e39ac96
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,48 @@
+Source: ocaml-libvirt
+Section: ocaml
+Priority: optional
+Maintainer: Debian Libvirt Maintainers <pkg-libvirt-maintainers@lists.alioth.debian.org>
+Uploaders: Guido Guenther <agx@debian.org>
+Build-Depends: cdbs,
+               debhelper (>= 10),
+               dh-autoreconf,
+               dh-ocaml,
+               libvirt-dev,
+               ocaml-findlib,
+               ocaml-nox
+Standards-Version: 3.9.8
+Vcs-Browser: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/ocaml-libvirt.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/ocaml-libvirt.git
+Homepage: http://libvirt.org/ocaml/
+
+Package: libvirt-ocaml
+Architecture: any
+Depends: ${misc:Depends}, ${ocaml:Depends}, ${shlibs:Depends}
+Provides: ${ocaml:Provides}
+Description: OCaml bindings for libvirt (runtime)
+ This library provides OCaml bindings for using libvirt.
+ .
+ Libvirt is a toolkit to interact with the virtualization capabilities of
+ recent versions of Linux (and other OSes). The library aims at providing
+ a long term stable C API for different virtualization mechanisms. It
+ currently supports QEMU, KVM, and XEN.
+ .
+ This package contains the shared library.
+
+Package: libvirt-ocaml-dev
+Architecture: any
+Depends: libvirt-dev,
+         libvirt-ocaml (= ${binary:Version}),
+         ocaml-findlib,
+         ${misc:Depends},
+         ${ocaml:Depends}
+Provides: ${ocaml:Provides}
+Description: OCaml bindings for libvirt (development files)
+ This library provides OCaml bindings for using libvirt.
+ .
+ Libvirt is a toolkit to interact with the virtualization capabilities of
+ recent versions of Linux (and other OSes). The library aims at providing
+ a long term stable C API for different virtualization mechanisms. It
+ currently supports QEMU, KVM, and XEN.
+ .
+ This package contains the development files.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..89a0fde
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,95 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ocaml-libvirt
+Upstream-Contact: Richard W.M. Jones <rjones@redhat.com>
+Source: http://libvirt.org/sources/ocaml
+
+Files: *
+Copyright: 2007-2014 Red Hat Inc.
+           2007-2014 Richard W.M. Jones <rjones@redhat.com>
+License: LGPL-2+
+
+Files: examples/*
+Copyright: 2007 Red Hat Inc.
+           2007 Richard W.M. Jones <rjones@redhat.com>
+           2013 Citrix Inc
+License: public-domain
+
+Files: libvirt/*
+Copyright: 2007-2014 Red Hat Inc.
+           2007-2014 Richard W.M. Jones <rjones@redhat.com>
+License: LGPL-2+ with OCaml exception
+
+Files: debian/*
+Copyright: 2008      Guido Guenther <agx@debian.org>
+           2008-2009 Sylvain Le Gall <gildor@debian.org>
+           2012      Laurent Léonard <laurent@open-minds.org>
+           2016      Joao Eriberto Mota Filho <eriberto@debian.org>
+License: GPL-2+
+
+License: LGPL-2+
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ This package 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in "/usr/share/common-licenses/LGPL-2".
+
+License: public-domain
+ This file is under public domain.
+
+License: LGPL-2+ with OCaml exception
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ This package 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
+ Lesser General Public License for more details.
+ .
+ As a special exception to the GNU Library General Public License, you
+ may link, statically or dynamically, a "work that uses the Library"
+ with a publicly distributed version of the Library to produce an
+ executable file containing portions of the Library, and distribute
+ that executable file under terms of your choice, without any of the
+ additional requirements listed in clause 6 of the GNU Library General
+ Public License.  By "a publicly distributed version of the Library",
+ we mean either the unmodified Library as distributed by Red Hat, or a
+ modified version of the Library that is distributed under the
+ conditions defined in clause 2 of the GNU Library General Public
+ License. This exception does not however invalidate any other reasons
+ why the executable file might be covered by the GNU Library General
+ Public License.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in "/usr/share/common-licenses/LGPL-2".
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package 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 General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..b1a676e
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,2 @@
+README
+TODO.libvirt
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..760033d
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,6 @@
+[DEFAULT]
+upstream-branch=upstream/latest
+debian-branch=debian/sid
+
+[pq]
+patch-numbers = False
diff --git a/debian/libvirt-ocaml-dev.dirs.in b/debian/libvirt-ocaml-dev.dirs.in
new file mode 100644
index 0000000..cc51687
--- /dev/null
+++ b/debian/libvirt-ocaml-dev.dirs.in
@@ -0,0 +1 @@
+@OCamlStdlibDir@
diff --git a/debian/libvirt-ocaml-dev.ocamldoc b/debian/libvirt-ocaml-dev.ocamldoc
new file mode 100644
index 0000000..89abbcf
--- /dev/null
+++ b/debian/libvirt-ocaml-dev.ocamldoc
@@ -0,0 +1 @@
+# No flags
diff --git a/debian/libvirt-ocaml.dirs.in b/debian/libvirt-ocaml.dirs.in
new file mode 100644
index 0000000..cdf34bb
--- /dev/null
+++ b/debian/libvirt-ocaml.dirs.in
@@ -0,0 +1,2 @@
+@OCamlDllDir@
+/usr/bin
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@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/10_disable-Werror.patch b/debian/patches/10_disable-Werror.patch
new file mode 100644
index 0000000..e07e837
--- /dev/null
+++ b/debian/patches/10_disable-Werror.patch
@@ -0,0 +1,16 @@
+Description: disable unnecessary option -Werror to avoid a FTBFS.
+Author: Joao Eriberto Mota Filho <eriberto@debian.org>
+Last-Update: 2016-12-18
+Index: ocaml-libvirt-0.6.1.4/configure.ac
+===================================================================
+--- ocaml-libvirt-0.6.1.4.orig/configure.ac
++++ ocaml-libvirt-0.6.1.4/configure.ac
+@@ -33,7 +33,7 @@ dnl Select some C flags based on the hos
+ AC_CANONICAL_HOST
+ 
+ DEBUG="-g"
+-WARNINGS="-Wall -Werror"
++WARNINGS="-Wall"
+ CFLAGS_FPIC="-fPIC"
+ WIN32=no
+ case "$host" in
diff --git a/debian/patches/20_improve-GCC-hardening.patch b/debian/patches/20_improve-GCC-hardening.patch
new file mode 100644
index 0000000..88b4c39
--- /dev/null
+++ b/debian/patches/20_improve-GCC-hardening.patch
@@ -0,0 +1,15 @@
+Description: add CPPFLAGS to improve the hardening.
+Author: Joao Eriberto Mota Filho <eriberto@debian.org>
+Last-Update: 2016-12-18
+Index: ocaml-libvirt-0.6.1.4/libvirt/Makefile.in
+===================================================================
+--- ocaml-libvirt-0.6.1.4.orig/libvirt/Makefile.in
++++ ocaml-libvirt-0.6.1.4/libvirt/Makefile.in
+@@ -23,6 +23,7 @@ CFLAGS		= @CFLAGS@ \
+ 		   @DEBUG@ @WARNINGS@ @CFLAGS_FPIC@
+ LDFLAGS		= @LDFLAGS@
+ #		   -L"$(shell ocamlc -where)"
++CPPFLAGS	= @CPPFLAGS@ -D_FORTIFY_SOURCE=2
+ 
+ OCAMLC		= @OCAMLC@
+ OCAMLOPT	= @OCAMLOPT@
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6f10267
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+10_disable-Werror.patch
+20_improve-GCC-hardening.patch
+0001-Use-C99-standard-int64_t-instead-of-OCaml-defined-an.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..9897d43
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,31 @@
+#!/usr/bin/make -f
+
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+include /usr/share/cdbs/1/rules/autoreconf.mk
+include /usr/share/cdbs/1/rules/ocaml.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
+DESTDIR_DEV=$(CURDIR)/debian/libvirt-ocaml-dev
+DESTDIR=$(CURDIR)/debian/libvirt-ocaml
+
+DEB_MAKE_CLEAN_TARGET    := clean
+DEB_MAKE_BUILD_TARGET    := all
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+DEB_MAKE_BUILD_TARGET    += opt
+DEB_MAKE_INSTALL_TARGET  := install-opt
+else
+DEB_MAKE_INSTALL_TARGET  := install-byte
+endif
+DEB_MAKE_INSTALL_TARGET  += OCAMLFIND_DESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)" prefix="$(DESTDIR)/usr"
+
+clean::
+	-$(RM) '$(CURDIR)/Make.rules'
+	-$(RM) '$(CURDIR)/Makefile'
+	-$(RM) '$(CURDIR)/libvirt/Makefile'
+	-$(RM) '$(CURDIR)/examples/Makefile'
+
+install/libvirt-ocaml-dev::
+	mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/libvirt/*.so $(DESTDIR)/$(OCAML_DLL_DIR)/
+	rm -rf $(CURDIR)/debian/libvirt-ocaml/usr/bin
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..b850ac8
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=4
+http://libvirt.org/sources/ocaml/ocaml-libvirt-(\d\S+)\.tar\.(?:bz2|gz|xz)