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

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

commit 3c537c2f14351ca57b07bc21a62bef51cdbb4846
Merge: 2970143 2166326
Author: Joao Eriberto Mota Filho <eribe...@debian.org>
Date:   Sun Dec 18 11:14:24 2016 -0200

    Import Debian patch 0.6.1.4-1

 .gitignore                                         |   1 +
 MANIFEST                                           |   2 +
 Makefile.in                                        |   1 +
 config.h.in                                        | 161 -----
 configure                                          | 442 +++---------
 configure.ac                                       |  67 +-
 ...01-Add-Libvirt.Domain.get_cpu_stats_total.patch | 249 +++++++
 debian/changelog                                   |  42 +-
 debian/compat                                      |   2 +-
 debian/control                                     |  57 +-
 debian/copyright                                   | 124 ++--
 debian/gbp.conf                                    |   2 -
 debian/patches/10_disable-Werror.patch             |  16 +
 debian/patches/20_improve-GCC-hardening.patch      |  15 +
 debian/patches/series                              |   2 +
 debian/rules                                       |  22 +-
 debian/source/format                               |   1 +
 debian/watch                                       |   5 +-
 examples/.depend                                   |  14 +-
 examples/Makefile.in                               |  13 +-
 examples/domain_events.ml                          | 145 ++++
 examples/get_cpu_stats.ml                          |   2 +-
 libvirt/.depend                                    |  12 +-
 libvirt/generator.pl                               | 226 ++----
 libvirt/libvirt.ml                                 | 775 ++++++++++++++++++++-
 libvirt/libvirt.mli                                | 390 ++++++++++-
 libvirt/libvirt_c.c                                | 617 +---------------
 libvirt/libvirt_c_epilogue.c                       |  20 -
 libvirt/libvirt_c_oneoffs.c                        | 625 ++++++++++++-----
 libvirt/libvirt_c_prologue.c                       |  42 --
 30 files changed, 2376 insertions(+), 1716 deletions(-)

diff --cc debian/changelog
index c29458d,0000000..4ba385b
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,69 -1,0 +1,101 @@@
- ocaml-libvirt (0.6.1.2-2) UNRELEASED; urgency=low
++ocaml-libvirt (0.6.1.4-1) unstable; urgency=medium
 +
-   * Remove Sylvain Le Gall from uploaders
++  * 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.
 +
-  -- Sylvain Le Gall <gil...@debian.org>  Fri, 21 Sep 2012 01:19:50 +0000
++ -- Joao Eriberto Mota Filho <eribe...@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 <laur...@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 <gil...@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 <gil...@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 <gil...@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 <gil...@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 <gil...@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 <gil...@debian.org>  Mon, 07 Jul 2008 14:54:44 +0200
diff --cc debian/compat
index 7f8f011,0000000..f599e28
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 7
++10
diff --cc debian/control
index 0c095bc,0000000..e39ac96
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,45 -1,0 +1,48 @@@
 +Source: ocaml-libvirt
 +Section: ocaml
- Priority: extra
++Priority: optional
 +Maintainer: Debian Libvirt Maintainers 
<pkg-libvirt-maintain...@lists.alioth.debian.org>
- Uploaders: Guido Guenther <a...@sigxcpu.org>, Laurent Léonard 
<laur...@open-minds.org>
- Build-Depends: cdbs, 
-  debhelper (>= 7), 
-  autotools-dev, 
-  ocaml-nox (>= 3.11.1),
-  ocaml-findlib, 
-  libvirt-dev, 
-  dh-ocaml (>= 0.9.1)
- Standards-Version: 3.9.3
- Vcs-Browser: 
http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-libvirt.git
- Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-libvirt.git
++Uploaders: Guido Guenther <a...@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/
- DM-Upload-Allowed: yes
 +
 +Package: libvirt-ocaml
 +Architecture: any
- Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
++Depends: ${misc:Depends}, ${ocaml:Depends}, ${shlibs:Depends}
 +Provides: ${ocaml:Provides}
- Description: OCaml bindings for libvirt
++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.
++ 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
++ This package contains the shared library.
 +
 +Package: libvirt-ocaml-dev
 +Architecture: any
- Depends: ${ocaml:Depends}, libvirt-ocaml (= ${binary:Version}), libvirt-dev, 
${misc:Depends}
++Depends: libvirt-dev,
++         libvirt-ocaml (= ${binary:Version}),
++         ocaml-findlib,
++         ${misc:Depends},
++         ${ocaml:Depends}
 +Provides: ${ocaml:Provides}
- Description: OCaml bindings for libvirt
++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.
++ 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
++ This package contains the development files.
diff --cc debian/copyright
index 166a3fe,0000000..89a0fde
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,49 -1,0 +1,95 @@@
- Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
- Packaged-By: Guido Guenther <a...@sigxcpu.org> 
- Packaged-Date: Thu, 26 Jun 2008 09:42:18 +0200
- Upstream-author: Richard W.M. Jones <rjo...@redhat.com>
- Original-Source-Location: http://libvirt.org/sources/ocaml/
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Upstream-Name: ocaml-libvirt
++Upstream-Contact: Richard W.M. Jones <rjo...@redhat.com>
++Source: http://libvirt.org/sources/ocaml
 +
 +Files: *
- Copyright: © 2007 Richard W.M. Jones, Red Hat Inc.
- License: LGPL-2.1+
++Copyright: 2007-2014 Red Hat Inc.
++           2007-2014 Richard W.M. Jones <rjo...@redhat.com>
++License: LGPL-2+
 +
- On Debian GNU/Linux systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
++Files: examples/*
++Copyright: 2007 Red Hat Inc.
++           2007 Richard W.M. Jones <rjo...@redhat.com>
++           2013 Citrix Inc
++License: public-domain
 +
 +Files: libvirt/*
- Copyright: © 2007 Richard W.M. Jones, Red Hat Inc.
- License: LGPL-2.1+ | other
- 
- 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.
- 
- On Debian GNU/Linux systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
- 
- Files: mlvirsh/*
- Copyright: © 2007 Richard W.M. Jones, Red Hat Inc.
++Copyright: 2007-2014 Red Hat Inc.
++           2007-2014 Richard W.M. Jones <rjo...@redhat.com>
++License: LGPL-2+ with OCaml exception
++
++Files: debian/*
++Copyright: 2008      Guido Guenther <a...@debian.org>
++           2008-2009 Sylvain Le Gall <gil...@debian.org>
++           2012      Laurent Léonard <laur...@open-minds.org>
++           2016      Joao Eriberto Mota Filho <eribe...@debian.org>
 +License: GPL-2+
 +
- On Debian GNU/Linux systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/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".
 +
- Files: debian/*
- Copyright: © 2008 Guido Guenther <a...@sigxcpu.org>
-            © 2008 Sylvain Le Gall <gil...@debian.org>
- License: GPL
++License: public-domain
++ This file is under public domain.
 +
- On Debian GNU/Linux systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/GPL'.
++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 --cc debian/patches/10_disable-Werror.patch
index 0000000,0000000..e07e837
new file mode 100644
--- /dev/null
+++ b/debian/patches/10_disable-Werror.patch
@@@ -1,0 -1,0 +1,16 @@@
++Description: disable unnecessary option -Werror to avoid a FTBFS.
++Author: Joao Eriberto Mota Filho <eribe...@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 --cc debian/patches/20_improve-GCC-hardening.patch
index 0000000,0000000..88b4c39
new file mode 100644
--- /dev/null
+++ b/debian/patches/20_improve-GCC-hardening.patch
@@@ -1,0 -1,0 +1,15 @@@
++Description: add CPPFLAGS to improve the hardening.
++Author: Joao Eriberto Mota Filho <eribe...@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 --cc debian/patches/series
index 0000000,0000000..2d15909
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,2 @@@
++10_disable-Werror.patch
++20_improve-GCC-hardening.patch
diff --cc debian/rules
index f42ba50,0000000..9897d43
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,45 -1,0 +1,31 @@@
 +#!/usr/bin/make -f
- # debian/rules for ocaml-libvirt package
- # Copyright (C) 2008 Guido Günther <a...@sigxcpu.org>
- # Copyright (C) 2008 Sylvain Le Gall <gil...@debian.org>
- #
- # This program 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, or (at
- # your option) any later version.
- #
- # This program 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, write to the Free Software
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- # MA 02110-1301, USA.
 +
++#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 --cc debian/source/format
index 0000000,0000000..163aaf8
new file mode 100644
--- /dev/null
+++ b/debian/source/format
@@@ -1,0 -1,0 +1,1 @@@
++3.0 (quilt)
diff --cc debian/watch
index 4914a6b,0000000..b850ac8
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,0 +1,2 @@@
- version=3
- 
- http://libvirt.org/sources/ocaml/ocaml-libvirt-([0-9\.]*)\.tar\.gz
++version=4
++http://libvirt.org/sources/ocaml/ocaml-libvirt-(\d\S+)\.tar\.(?:bz2|gz|xz)

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

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to