[Pkg-libvirt-commits] [libguestfs] 11/12: Removed upstream patches
Hilko Bengen
bengen at moszumanska.debian.org
Fri Oct 3 14:46:04 UTC 2014
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to annotated tag debian/1%1.27.46-1
in repository libguestfs.
commit 1c86b08100bc59d0cc9cd6d72be2075b657537a2
Author: Hilko Bengen <bengen at debian.org>
Date: Mon Sep 15 22:33:05 2014 +0200
Removed upstream patches
---
debian/patches/0003-Do-not-use-DTB-for-armel.patch | 2 +-
.../0004-Revert-Use-ocamldep-all-option.patch | 124 ---------------------
.../0005-v2v-Add-stringMap.mli-interface.patch | 94 ----------------
debian/patches/series | 2 -
4 files changed, 1 insertion(+), 221 deletions(-)
diff --git a/debian/patches/0003-Do-not-use-DTB-for-armel.patch b/debian/patches/0003-Do-not-use-DTB-for-armel.patch
index 4b5a90b..891cf16 100644
--- a/debian/patches/0003-Do-not-use-DTB-for-armel.patch
+++ b/debian/patches/0003-Do-not-use-DTB-for-armel.patch
@@ -7,7 +7,7 @@ Subject: Do not use DTB for armel
1 file changed, 2 insertions(+)
diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h
-index 648f005..c8b0dcd 100644
+index 69ea2dc..ceae3d7 100644
--- a/src/guestfs-internal.h
+++ b/src/guestfs-internal.h
@@ -145,8 +145,10 @@
diff --git a/debian/patches/0004-Revert-Use-ocamldep-all-option.patch b/debian/patches/0004-Revert-Use-ocamldep-all-option.patch
deleted file mode 100644
index 0b90c8c..0000000
--- a/debian/patches/0004-Revert-Use-ocamldep-all-option.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From: "Richard W.M. Jones" <rjones at redhat.com>
-Date: Sun, 14 Sep 2014 18:46:49 +0100
-Subject: Revert "Use ocamldep -all option."
-
-This reverts commit a3881445efd04d5fe6da29db8b2d62a30088b9d1.
-
-See discussion on the mailing list:
-
-https://www.redhat.com/archives/libguestfs/2014-September/msg00069.html
----
- builder/Makefile.am | 2 +-
- customize/Makefile.am | 2 +-
- mllib/Makefile.am | 2 +-
- ocaml/Makefile.am | 2 +-
- resize/Makefile.am | 2 +-
- sparsify/Makefile.am | 2 +-
- sysprep/Makefile.am | 2 +-
- v2v/Makefile.am | 2 +-
- 8 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/builder/Makefile.am b/builder/Makefile.am
-index 0fb5b39..0ca5db6 100644
---- a/builder/Makefile.am
-+++ b/builder/Makefile.am
-@@ -253,7 +253,7 @@ depend: .depend
-
- .depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml)
- rm -f $@ $@-t
-- $(OCAMLFIND) ocamldep -all -I ../ocaml -I $(abs_srcdir) -I $(abs_top_builddir)/mllib -I $(abs_top_builddir)/customize $^ | \
-+ $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(abs_top_builddir)/mllib -I $(abs_top_builddir)/customize $^ | \
- $(SED) 's/ *$$//' | \
- $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
- $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \
-diff --git a/customize/Makefile.am b/customize/Makefile.am
-index 0ea06d3..90234a0 100644
---- a/customize/Makefile.am
-+++ b/customize/Makefile.am
-@@ -187,7 +187,7 @@ depend: .depend
-
- .depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml)
- rm -f $@ $@-t
-- $(OCAMLFIND) ocamldep -all -I ../ocaml -I $(abs_srcdir) -I $(abs_top_builddir)/mllib $^ | \
-+ $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(abs_top_builddir)/mllib $^ | \
- $(SED) 's/ *$$//' | \
- $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
- $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \
-diff --git a/mllib/Makefile.am b/mllib/Makefile.am
-index c3553db..af0fe85 100644
---- a/mllib/Makefile.am
-+++ b/mllib/Makefile.am
-@@ -167,7 +167,7 @@ depend: .depend
-
- .depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml)
- rm -f $@ $@-t
-- $(OCAMLFIND) ocamldep -all -I ../ocaml -I $(abs_srcdir) $^ | \
-+ $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) $^ | \
- $(SED) 's/ *$$//' | \
- $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
- $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \
-diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
-index 8967f13..8b9dcfa 100644
---- a/ocaml/Makefile.am
-+++ b/ocaml/Makefile.am
-@@ -169,7 +169,7 @@ depend: .depend
-
- .depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml) $(wildcard $(abs_srcdir)/t/*.ml)
- rm -f $@ $@-t
-- $(OCAMLFIND) ocamldep -all -I ../ocaml -I $(abs_srcdir) $^ | \
-+ $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) $^ | \
- $(SED) 's/ *$$//' | \
- $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
- $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \
-diff --git a/resize/Makefile.am b/resize/Makefile.am
-index b71759f..91abeee 100644
---- a/resize/Makefile.am
-+++ b/resize/Makefile.am
-@@ -145,7 +145,7 @@ depend: .depend
-
- .depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml)
- rm -f $@ $@-t
-- $(OCAMLFIND) ocamldep -all -I ../ocaml -I $(abs_srcdir) -I $(abs_top_builddir)/mllib $^ | \
-+ $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(abs_top_builddir)/mllib $^ | \
- $(SED) 's/ *$$//' | \
- $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
- $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \
-diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am
-index 6bbd420..bb3bda0 100644
---- a/sparsify/Makefile.am
-+++ b/sparsify/Makefile.am
-@@ -134,7 +134,7 @@ depend: .depend
-
- .depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml)
- rm -f $@ $@-t
-- $(OCAMLFIND) ocamldep -all -I ../ocaml -I $(abs_srcdir) -I $(abs_top_builddir)/mllib $^ | \
-+ $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(abs_top_builddir)/mllib $^ | \
- $(SED) 's/ *$$//' | \
- $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
- $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \
-diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am
-index 4e654ef..7b88ef5 100644
---- a/sysprep/Makefile.am
-+++ b/sysprep/Makefile.am
-@@ -225,7 +225,7 @@ depend: .depend
-
- .depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml)
- rm -f $@ $@-t
-- $(OCAMLFIND) ocamldep -all -I ../ocaml -I $(abs_srcdir) -I $(abs_top_builddir)/mllib -I $(abs_top_builddir)/customize $^ | \
-+ $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(abs_top_builddir)/mllib -I $(abs_top_builddir)/customize $^ | \
- $(SED) 's/ *$$//' | \
- $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
- $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \
-diff --git a/v2v/Makefile.am b/v2v/Makefile.am
-index 7807735..2a540f1 100644
---- a/v2v/Makefile.am
-+++ b/v2v/Makefile.am
-@@ -266,7 +266,7 @@ depend: .depend
-
- .depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml)
- rm -f $@ $@-t
-- $(OCAMLFIND) ocamldep -all -I ../ocaml -I $(abs_srcdir) -I $(abs_top_builddir)/mllib -I $(abs_top_builddir)/customize $^ | \
-+ $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(abs_top_builddir)/mllib -I $(abs_top_builddir)/customize $^ | \
- $(SED) 's/ *$$//' | \
- $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
- $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \
diff --git a/debian/patches/0005-v2v-Add-stringMap.mli-interface.patch b/debian/patches/0005-v2v-Add-stringMap.mli-interface.patch
deleted file mode 100644
index 2fda76a..0000000
--- a/debian/patches/0005-v2v-Add-stringMap.mli-interface.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From: "Richard W.M. Jones" <rjones at redhat.com>
-Date: Sun, 14 Sep 2014 19:03:28 +0100
-Subject: v2v: Add stringMap.mli (interface).
-
-Hopefully this should fix the incorrect build problem. See discussion
-here:
-
-https://www.redhat.com/archives/libguestfs/2014-September/msg00071.html
-
-The interface was generated using 'ocamlc -i'.
----
- v2v/Makefile.am | 3 ++-
- v2v/stringMap.mli | 46 ++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 48 insertions(+), 1 deletion(-)
- create mode 100644 v2v/stringMap.mli
-
-diff --git a/v2v/Makefile.am b/v2v/Makefile.am
-index 2a540f1..553b93c 100644
---- a/v2v/Makefile.am
-+++ b/v2v/Makefile.am
-@@ -35,6 +35,7 @@ SOURCES_MLI = \
- input_disk.mli \
- input_libvirt.mli \
- input_libvirtxml.mli \
-+ input_ova.mli \
- JSON.mli \
- lib_esx.mli \
- lib_linux.mli \
-@@ -42,12 +43,12 @@ SOURCES_MLI = \
- lib_xen.mli \
- modules_list.mli \
- output_glance.mli \
-- input_ova.mli \
- output_libvirt.mli \
- output_local.mli \
- output_null.mli \
- output_rhev.mli \
- output_vdsm.mli \
-+ stringMap.mli \
- types.mli \
- xml.mli
-
-diff --git a/v2v/stringMap.mli b/v2v/stringMap.mli
-new file mode 100644
-index 0000000..d70af98
---- /dev/null
-+++ b/v2v/stringMap.mli
-@@ -0,0 +1,46 @@
-+(* virt-v2v
-+ * Copyright (C) 2009-2014 Red Hat Inc.
-+ *
-+ * 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 of the License, 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *)
-+
-+type key = String.t
-+type 'a t = 'a Map.Make(String).t
-+
-+val empty : 'a t
-+val is_empty : 'a t -> bool
-+val mem : key -> 'a t -> bool
-+val add : key -> 'a -> 'a t -> 'a t
-+val singleton : key -> 'a -> 'a t
-+val remove : key -> 'a t -> 'a t
-+val merge : (key -> 'a option -> 'b option -> 'c option) -> 'a t -> 'b t -> 'c t
-+val compare : ('a -> 'a -> int) -> 'a t -> 'a t -> int
-+val equal : ('a -> 'a -> bool) -> 'a t -> 'a t -> bool
-+val iter : (key -> 'a -> unit) -> 'a t -> unit
-+val fold : (key -> 'a -> 'b -> 'b) -> 'a t -> 'b -> 'b
-+val for_all : (key -> 'a -> bool) -> 'a t -> bool
-+val exists : (key -> 'a -> bool) -> 'a t -> bool
-+val filter : (key -> 'a -> bool) -> 'a t -> 'a t
-+val partition : (key -> 'a -> bool) -> 'a t -> 'a t * 'a t
-+val cardinal : 'a t -> int
-+val bindings : 'a t -> (key * 'a) list
-+val min_binding : 'a t -> key * 'a
-+val max_binding : 'a t -> key * 'a
-+val choose : 'a t -> key * 'a
-+val split : key -> 'a t -> 'a t * 'a option * 'a t
-+val find : key -> 'a t -> 'a
-+val map : ('a -> 'b) -> 'a t -> 'b t
-+val mapi : (key -> 'a -> 'b) -> 'a t -> 'b t
-+val keys : 'a t -> key list
diff --git a/debian/patches/series b/debian/patches/series
index 3ffe05e..cf66984 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
0001-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
0002-golang-Fix-for-out-of-tree-builds.patch
0003-Do-not-use-DTB-for-armel.patch
-0004-Revert-Use-ocamldep-all-option.patch
-0005-v2v-Add-stringMap.mli-interface.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git
More information about the Pkg-libvirt-commits
mailing list