[Pkg-libvirt-commits] [libguestfs] 56/61: 1:1.25.49-1

[Hilko Bengen]

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

bengen pushed a commit to branch experimental
in repository libguestfs.

commit 8ef442351da0fbbc036b639b4f0851ebcfde8485
Author: Hilko Bengen <bengen at debian.org>
Date:   Thu Mar 27 15:07:39 2014 +0100

    1:1.25.49-1
---
 debian/changelog                                   |  6 +++
 .../0003-ocaml-Enable-parallel-builds.patch        | 50 ----------------------
 debian/patches/series                              |  2 -
 3 files changed, 6 insertions(+), 52 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c6f5d0c..133f2ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libguestfs (1:1.25.49-1) experimental; urgency=medium
+
+  * New upstream development version
+
+ -- Hilko Bengen <bengen at debian.org>  Thu, 27 Mar 2014 15:07:14 +0100
+
 libguestfs (1:1.25.46-3) experimental; urgency=medium
 
   * Added patch to relax grub dependency
diff --git a/debian/patches/0003-ocaml-Enable-parallel-builds.patch b/debian/patches/0003-ocaml-Enable-parallel-builds.patch
deleted file mode 100644
index eb703a8..0000000
--- a/debian/patches/0003-ocaml-Enable-parallel-builds.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: "Richard W.M. Jones" <rjones at redhat.com>
-Date: Sun, 23 Mar 2014 16:31:10 +0000
-Subject: ocaml: Enable parallel builds.
-
-This reintroduces commit dce94f3e266ed3f1fc634a1ef6953f2db1510963.
----
- ocaml/Makefile.am | 20 +++++++++++++-------
- 1 file changed, 13 insertions(+), 7 deletions(-)
-
-diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
-index 7c8e515..ee5a241 100644
---- a/ocaml/Makefile.am
-+++ b/ocaml/Makefile.am
-@@ -54,15 +54,25 @@ noinst_LIBRARIES = libguestfsocaml.a
- # 'libmlguestfs.a' and if run at the same time, they will stomp on or
- # corrupt each others copy.  Hence we have to serialize the calls.
- 
--mlguestfs.cma: libguestfsocaml.a guestfs.cmo
-+CLEANFILES += stamp-mlguestfs
-+
-+mlguestfs.cma mlguestfs.cmxa: stamp-mlguestfs
-+
-+guestfs_cmm = guestfs.cmo
-+if HAVE_OCAMLOPT
-+guestfs_cmm += guestfs.cmx
-+endif
-+
-+stamp-mlguestfs: libguestfsocaml.a $(guestfs_cmm)
- 	$(OCAMLMKLIB) -o mlguestfs \
- 	  $(libguestfsocaml_a_OBJECTS) guestfs.cmo \
- 	  -L$(top_builddir)/src/.libs -lguestfs
--
--mlguestfs.cmxa: libguestfsocaml.a guestfs.cmx
-+if HAVE_OCAMLOPT
- 	$(OCAMLMKLIB) -o mlguestfs \
- 	  $(libguestfsocaml_a_OBJECTS) guestfs.cmx \
- 	  -L$(top_builddir)/src/.libs -lguestfs
-+endif
-+	touch $@
- 
- libguestfsocaml_a_CPPFLAGS = \
- 	-DGUESTFS_PRIVATE=1 \
-@@ -189,7 +199,3 @@ install-data-hook:
- CLEANFILES += $(noinst_DATA)
- 
- endif
--
--# Tell version 3.79 and up of GNU make to not build goals in this
--# directory in parallel.
--.NOTPARALLEL:
diff --git a/debian/patches/series b/debian/patches/series
index f675fe9..4574a17 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 0001-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
 0002-golang-Fix-for-out-of-tree-builds.patch
-0003-ocaml-Enable-parallel-builds.patch
-0004-Only-grub-install-is-needed.patch

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