[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1%1.16.18-1-109-g3c336e1
Hilko Bengen
bengen at debian.org
Mon Apr 1 18:12:17 UTC 2013
The following commit has been merged in the master branch:
commit e537e355be674d9d2630530a03579557943f4cc7
Author: Hilko Bengen <bengen at debian.org>
Date: Wed Mar 13 20:22:51 2013 +0100
Dropped patches that have been integrated upstream. The removal of -Werror for Ruby bindings seems no longer necessary.
diff --git a/debian/patches/0007-out-of-tree-build-Fix-Ruby-bindings.patch b/debian/patches/0007-out-of-tree-build-Fix-Ruby-bindings.patch
deleted file mode 100644
index 169062c..0000000
--- a/debian/patches/0007-out-of-tree-build-Fix-Ruby-bindings.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Tue, 19 Feb 2013 00:17:07 +0100
-Subject: out-of-tree build: Fix Ruby bindings
-
-Remove non-template extconf.rb, use source directory
----
- ruby/Makefile.am | 1 -
- ruby/Rakefile.in | 2 +-
- ruby/ext/guestfs/extconf.rb | 37 -------------------------------------
- ruby/ext/guestfs/extconf.rb.in | 3 ++-
- 4 files changed, 3 insertions(+), 40 deletions(-)
- delete mode 100644 ruby/ext/guestfs/extconf.rb
-
-diff --git a/ruby/Makefile.am b/ruby/Makefile.am
-index 3fbc9c9..7fa7971 100644
---- a/ruby/Makefile.am
-+++ b/ruby/Makefile.am
-@@ -29,7 +29,6 @@ EXTRA_DIST = \
- Rakefile.in \
- README.rdoc \
- doc/site/index.html \
-- ext/guestfs/extconf.rb \
- lib/guestfs.rb \
- run-bindtests \
- run-ruby-tests \
-diff --git a/ruby/Rakefile.in b/ruby/Rakefile.in
-index f832abd..a74e191 100644
---- a/ruby/Rakefile.in
-+++ b/ruby/Rakefile.in
-@@ -39,7 +39,7 @@ end
- PKG_NAME='@PACKAGE_NAME@'
- PKG_VERSION='@PACKAGE_VERSION@'
-
--EXT_CONF='@abs_srcdir@/ext/guestfs/extconf.rb'
-+EXT_CONF='@abs_builddir@/ext/guestfs/extconf.rb'
- MAKEFILE='@builddir@/ext/guestfs/Makefile'
- GUESTFS_MODULE='@builddir@/ext/guestfs/_guestfs.so'
- GUESTFS_SRC='@srcdir@/ext/guestfs/_guestfs.c'
-diff --git a/ruby/ext/guestfs/extconf.rb b/ruby/ext/guestfs/extconf.rb
-deleted file mode 100644
-index 12c9f4f..0000000
---- a/ruby/ext/guestfs/extconf.rb
-+++ /dev/null
-@@ -1,37 +0,0 @@
--# libguestfs Ruby bindings -*- ruby -*-
--# ruby/ext/guestfs/extconf.rb. Generated from extconf.rb.in by configure.
--# Copyright (C) 2009-2013 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.
--
--require 'mkmf'
--
--extension_name = '_guestfs'
--
--dir_config(extension_name)
--
--unless have_header("guestfs.h")
-- raise "<guestfs.h> not found"
--end
--unless have_library("guestfs", "guestfs_create", "guestfs.h")
-- raise "libguestfs not found"
--end
--
--$CFLAGS =
-- "#{$CFLAGS} -g -O2 -DGUESTFS_PRIVATE=1 " <<
-- " -W -Wabi -Waddress -Wall -Warray-bounds -Wattributes -Wbad-function-cast -Wbuiltin-macro-redefined -Wcast-align -Wchar-subscripts -Wclobbered -Wcomment -Wcomments -Wcoverage-mismatch -Wcpp -Wdeprecated -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wdouble-promotion -Wempty-body -Wendif-labels -Wenum-compare -Wextra -Wformat-contains-nul -Wformat-extra-args -Wformat-nonliteral -Wformat-security -Wformat-y2k -Wformat-zero-length -Wformat=2 -Wfree-nonheap-object -Wignored-qualifiers -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Winit-self -Wint-to-pointer-cast -Winvalid-memory-model -Winvalid-pch -Wjump-misses-init -Wmain -Wmaybe-uninitialized -Wmissing-braces -Wmissing-declarations -Wmissing-field-initializers -Wmissing-include-dirs -Wmissing-noreturn -Wmissing-parameter-type -Wmissing-prototypes -Wmudflap -Wmultichar -Wnarrowing -Wnested-externs -Wnonnull -Wnormalized=nfc -Wold-style-declaration -Wold-style-definition -Woverflow -Woverlength-strings -Woverride-init -Wpacked-bitfield-compat -Wparentheses -Wpointer-arith -Wpointer-sign -Wpointer-to-int-cast -Wpragmas -Wreturn-type -Wsequence-point -Wstack-protector -Wstrict-aliasing -Wstrict-overflow -Wstrict-prototypes -Wsuggest-attribute=noreturn -Wswitch -Wswitch-default -Wsync-nand -Wtrampolines -Wtrigraphs -Wtype-limits -Wuninitialized -Wunknown-pragmas -Wunreachable-code -Wunused -Wunused-but-set-parameter -Wunused-but-set-variable -Wunused-function -Wunused-label -Wunused-local-typedefs -Wunused-macros -Wunused-parameter -Wunused-result -Wunused-value -Wunused-variable -Wvariadic-macros -Wvector-operation-performance -Wvolatile-register-var -Wwrite-strings -Wno-unused-parameter -Wno-missing-field-initializers -fdiagnostics-show-option -Werror"
--
--create_header
--create_makefile(extension_name)
-diff --git a/ruby/ext/guestfs/extconf.rb.in b/ruby/ext/guestfs/extconf.rb.in
-index e358551..2bb4c9d 100644
---- a/ruby/ext/guestfs/extconf.rb.in
-+++ b/ruby/ext/guestfs/extconf.rb.in
-@@ -34,4 +34,5 @@ $CFLAGS =
- "@WARN_CFLAGS@ @WERROR_CFLAGS@"
-
- create_header
--create_makefile(extension_name)
-+create_makefile(extension_name, "@abs_srcdir@")
-+
diff --git a/debian/patches/0008-ruby-Don-t-compile-with-Werror.patch b/debian/patches/0008-ruby-Don-t-compile-with-Werror.patch
deleted file mode 100644
index 5c02890..0000000
--- a/debian/patches/0008-ruby-Don-t-compile-with-Werror.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Sun, 17 Feb 2013 22:52:59 +0100
-Subject: ruby: Don't compile with -Werror.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Otherwise, _guestfs.c can't be compiled due to many strict-prototype
-warnings turned into errors:
-
-compiling /home/bengen/src/deb/pkg-libvirt/libguestfs/debian/build-default/../..
-/ruby/ext/guestfs/_guestfs.c
-In file included from /usr/include/ruby-1.9.1/ruby.h:32:0,
- from /home/bengen/src/deb/pkg-libvirt/libguestfs/debian/build-d
-efault/../../ruby/ext/guestfs/_guestfs.c:29:
-/usr/include/ruby-1.9.1/ruby/ruby.h:1093:1: error: function declaration isn’t a
-prototype [-Werror=strict-prototypes]
-[...]
----
- ruby/ext/guestfs/extconf.rb.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ruby/ext/guestfs/extconf.rb.in b/ruby/ext/guestfs/extconf.rb.in
-index 2bb4c9d..d03ae64 100644
---- a/ruby/ext/guestfs/extconf.rb.in
-+++ b/ruby/ext/guestfs/extconf.rb.in
-@@ -31,7 +31,7 @@ end
-
- $CFLAGS =
- "#{$CFLAGS} @CFLAGS@ -DGUESTFS_PRIVATE=1 " <<
-- "@WARN_CFLAGS@ @WERROR_CFLAGS@"
-+ "@WARN_CFLAGS@"
-
- create_header
- create_makefile(extension_name, "@abs_srcdir@")
diff --git a/debian/patches/0009-Move-Ruby-related-checks-from-autoconf-to-extconf.rb.patch b/debian/patches/0009-Move-Ruby-related-checks-from-autoconf-to-extconf.rb.patch
deleted file mode 100644
index 218d3b1..0000000
--- a/debian/patches/0009-Move-Ruby-related-checks-from-autoconf-to-extconf.rb.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Thu, 7 Mar 2013 19:59:26 +0100
-Subject: Move Ruby-related checks from autoconf to extconf.rb; add extra
- check for rb_alloc_func_t
-
----
- configure.ac | 8 --------
- generator/ruby.ml | 3 +++
- ruby/ext/guestfs/extconf.rb.in | 4 ++++
- 3 files changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9d73c67..6e9a1c4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1160,14 +1160,6 @@ AS_IF([test "x$enable_ruby" != "xno"],[
- AC_MSG_RESULT([-l$libruby])
- AC_CHECK_LIB([$libruby],[ruby_init],
- [have_libruby=1],[have_libruby=])
--
-- dnl Symbols that we substitute when missing.
-- AS_IF([test -n "$have_libruby"],[
-- old_LIBS="$LIBS"
-- LIBS="$LIBS -l$libruby"
-- AC_CHECK_FUNCS([rb_hash_lookup])
-- LIBS="$old_LIBS"
-- ])
- ],[
- AC_MSG_RESULT([not found])
- ])
-diff --git a/generator/ruby.ml b/generator/ruby.ml
-index db16e2a..6065875 100644
---- a/generator/ruby.ml
-+++ b/generator/ruby.ml
-@@ -688,6 +688,9 @@ Init__guestfs (void)
- e_Error = rb_define_class_under (m_guestfs, \"Error\", rb_eStandardError);
-
- #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
-+#ifndef HAVE_TYPE_RB_ALLOC_FUNC_T
-+#define rb_alloc_func_t void*
-+#endif
- rb_define_alloc_func (c_guestfs, (rb_alloc_func_t) ruby_guestfs_create);
- #endif
-
-diff --git a/ruby/ext/guestfs/extconf.rb.in b/ruby/ext/guestfs/extconf.rb.in
-index d03ae64..d3ea165 100644
---- a/ruby/ext/guestfs/extconf.rb.in
-+++ b/ruby/ext/guestfs/extconf.rb.in
-@@ -29,6 +29,10 @@ unless have_library("guestfs", "guestfs_create", "guestfs.h")
- raise "libguestfs not found"
- end
-
-+have_func("rb_hash_lookup")
-+have_func("rb_define_alloc_func")
-+have_type("rb_alloc_func_t")
-+
- $CFLAGS =
- "#{$CFLAGS} @CFLAGS@ -DGUESTFS_PRIVATE=1 " <<
- "@WARN_CFLAGS@"
diff --git a/debian/patches/0010-out-of-tree-build-Fix-localized-manpages.patch b/debian/patches/0010-out-of-tree-build-Fix-localized-manpages.patch
deleted file mode 100644
index 0d820e7..0000000
--- a/debian/patches/0010-out-of-tree-build-Fix-localized-manpages.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Thu, 7 Mar 2013 00:08:23 +0100
-Subject: out-of-tree build: Fix localized manpages
-
----
- po-docs/Makefile.am | 6 +++---
- po-docs/ja/Makefile.am | 16 ++++++++--------
- po-docs/uk/Makefile.am | 16 ++++++++--------
- 3 files changed, 19 insertions(+), 19 deletions(-)
-
-diff --git a/po-docs/Makefile.am b/po-docs/Makefile.am
-index b532683..1b1da88 100644
---- a/po-docs/Makefile.am
-+++ b/po-docs/Makefile.am
-@@ -51,15 +51,15 @@ libguestfs-docs.pot: po4a.conf
- --msgid-bugs-address libguestfs at redhat.com \
- --copyright-holder "Red Hat Inc." \
- po4a.conf
-- for f in `find $(linguas) -name '*.pod' -o -name '*.pl'`; do \
-+ for f in `cd $(srcdir); find $(linguas) -name '*.pod' -o -name '*.pl'`; do \
- echo '=encoding utf8' > $$f.new; \
-- awk 'FNR >= 14 { print }' < $$f >> $$f.new; \
-+ awk 'FNR >= 14 { print }' < $(srcdir)/$$f >> $$f.new; \
- mv $$f.new $$f; \
- done
-
- po4a.conf: podfiles
- rm -f $@-t
-- echo "[po_directory] ." >> $@-t
-+ echo "[po_directory] $(srcdir)" >> $@-t
- echo >> $@-t
- for f in `cat podfiles`; do \
- b=`basename -- $$f`; \
-diff --git a/po-docs/ja/Makefile.am b/po-docs/ja/Makefile.am
-index d3413ec..f4fb3a8 100644
---- a/po-docs/ja/Makefile.am
-+++ b/po-docs/ja/Makefile.am
-@@ -65,7 +65,7 @@ MANPAGES = \
- virt-tar-out.1 \
- virt-win-reg.1
-
--podfiles := $(shell for f in `cat ../podfiles`; do basename $$f; done)
-+podfiles := $(shell for f in `cat $(top_srcdir)/po-docs/podfiles`; do basename $$f; done)
-
- # Ship the POD files and the translated manpages in the tarball. This
- # just simplifies building from the tarball, at a small cost in extra
-@@ -82,9 +82,9 @@ guestfs.3: guestfs.pod guestfs-actions.pod guestfs-availability.pod guestfs-stru
- --man $@ \
- --section 3 \
- --license LGPLv2+ \
-- --insert $(srcdir)/guestfs-actions.pod:__ACTIONS__ \
-- --insert $(srcdir)/guestfs-availability.pod:__AVAILABILITY__ \
-- --insert $(srcdir)/guestfs-structs.pod:__STRUCTS__ \
-+ --insert $(builddir)/guestfs-actions.pod:__ACTIONS__ \
-+ --insert $(builddir)/guestfs-availability.pod:__AVAILABILITY__ \
-+ --insert $(builddir)/guestfs-structs.pod:__STRUCTS__ \
- $<
-
- guestfish.1: guestfish.pod guestfish-actions.pod guestfish-commands.pod
-@@ -92,8 +92,8 @@ guestfish.1: guestfish.pod guestfish-actions.pod guestfish-commands.pod
- --no-strict-checks \
- --man $@ \
- --license GPLv2+ \
-- --insert $(srcdir)/guestfish-actions.pod:__ACTIONS__ \
-- --insert $(srcdir)/guestfish-commands.pod:__FISH_COMMANDS__ \
-+ --insert $(builddir)/guestfish-actions.pod:__ACTIONS__ \
-+ --insert $(builddir)/guestfish-commands.pod:__FISH_COMMANDS__ \
- $<
-
- virt-sysprep.1: virt-sysprep.pod sysprep-extra-options.pod sysprep-operations.pod
-@@ -101,8 +101,8 @@ virt-sysprep.1: virt-sysprep.pod sysprep-extra-options.pod sysprep-operations.po
- --no-strict-checks \
- --man $@ \
- --license GPLv2+ \
-- --insert sysprep-extra-options.pod:__EXTRA_OPTIONS__ \
-- --insert sysprep-operations.pod:__OPERATIONS__ \
-+ --insert $(builddir)/sysprep-extra-options.pod:__EXTRA_OPTIONS__ \
-+ --insert $(builddir)/sysprep-operations.pod:__OPERATIONS__ \
- $<
-
- %.1: %.pod
-diff --git a/po-docs/uk/Makefile.am b/po-docs/uk/Makefile.am
-index d3413ec..f4fb3a8 100644
---- a/po-docs/uk/Makefile.am
-+++ b/po-docs/uk/Makefile.am
-@@ -65,7 +65,7 @@ MANPAGES = \
- virt-tar-out.1 \
- virt-win-reg.1
-
--podfiles := $(shell for f in `cat ../podfiles`; do basename $$f; done)
-+podfiles := $(shell for f in `cat $(top_srcdir)/po-docs/podfiles`; do basename $$f; done)
-
- # Ship the POD files and the translated manpages in the tarball. This
- # just simplifies building from the tarball, at a small cost in extra
-@@ -82,9 +82,9 @@ guestfs.3: guestfs.pod guestfs-actions.pod guestfs-availability.pod guestfs-stru
- --man $@ \
- --section 3 \
- --license LGPLv2+ \
-- --insert $(srcdir)/guestfs-actions.pod:__ACTIONS__ \
-- --insert $(srcdir)/guestfs-availability.pod:__AVAILABILITY__ \
-- --insert $(srcdir)/guestfs-structs.pod:__STRUCTS__ \
-+ --insert $(builddir)/guestfs-actions.pod:__ACTIONS__ \
-+ --insert $(builddir)/guestfs-availability.pod:__AVAILABILITY__ \
-+ --insert $(builddir)/guestfs-structs.pod:__STRUCTS__ \
- $<
-
- guestfish.1: guestfish.pod guestfish-actions.pod guestfish-commands.pod
-@@ -92,8 +92,8 @@ guestfish.1: guestfish.pod guestfish-actions.pod guestfish-commands.pod
- --no-strict-checks \
- --man $@ \
- --license GPLv2+ \
-- --insert $(srcdir)/guestfish-actions.pod:__ACTIONS__ \
-- --insert $(srcdir)/guestfish-commands.pod:__FISH_COMMANDS__ \
-+ --insert $(builddir)/guestfish-actions.pod:__ACTIONS__ \
-+ --insert $(builddir)/guestfish-commands.pod:__FISH_COMMANDS__ \
- $<
-
- virt-sysprep.1: virt-sysprep.pod sysprep-extra-options.pod sysprep-operations.pod
-@@ -101,8 +101,8 @@ virt-sysprep.1: virt-sysprep.pod sysprep-extra-options.pod sysprep-operations.po
- --no-strict-checks \
- --man $@ \
- --license GPLv2+ \
-- --insert sysprep-extra-options.pod:__EXTRA_OPTIONS__ \
-- --insert sysprep-operations.pod:__OPERATIONS__ \
-+ --insert $(builddir)/sysprep-extra-options.pod:__EXTRA_OPTIONS__ \
-+ --insert $(builddir)/sysprep-operations.pod:__OPERATIONS__ \
- $<
-
- %.1: %.pod
diff --git a/debian/patches/0011-Change-conditional-build-disable-appliance-still-bui.patch b/debian/patches/0011-Change-conditional-build-disable-appliance-still-bui.patch
deleted file mode 100644
index 5bd5f03..0000000
--- a/debian/patches/0011-Change-conditional-build-disable-appliance-still-bui.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Thu, 7 Mar 2013 21:41:51 +0100
-Subject: Change conditional build: --disable-appliance still builds the
- libguestfs-specific parts of the appliance.
-
----
- Makefile.am | 2 --
- appliance/Makefile.am | 14 +++++++++++---
- 2 files changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 842008a..a069223 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -30,9 +30,7 @@ SUBDIRS += tests/data generator src examples po
- if ENABLE_DAEMON
- SUBDIRS += daemon
- endif
--if ENABLE_APPLIANCE
- SUBDIRS += appliance
--endif
-
- # Tests - order is important.
- if ENABLE_APPLIANCE
-diff --git a/appliance/Makefile.am b/appliance/Makefile.am
-index 169ea15..8661bf4 100644
---- a/appliance/Makefile.am
-+++ b/appliance/Makefile.am
-@@ -35,12 +35,20 @@ superminfsdir = $(prefix)/lib/guestfs/supermin.d
-
- fs_DATA =
- superminfs_DATA = \
-- supermin.d/base.img \
-- supermin.d/daemon.img \
- supermin.d/init.img \
-- supermin.d/hostfiles \
- supermin.d/udev-rules.img
-
-+if ENABLE_DAEMON
-+superminfs_DATA += \
-+ supermin.d/daemon.img
-+endif
-+
-+if ENABLE_APPLIANCE
-+superminfs_DATA += \
-+ supermin.d/base.img \
-+ supermin.d/hostfiles
-+endif
-+
- # This used to be a configure-generated file (as is update.sh still).
- # However config.status always touches the destination file, which
- # means the appliance got rebuilt too often.
diff --git a/debian/patches/0012-out-of-tree-build-Fix-link-creation.patch b/debian/patches/0012-out-of-tree-build-Fix-link-creation.patch
deleted file mode 100644
index 7d0d149..0000000
--- a/debian/patches/0012-out-of-tree-build-Fix-link-creation.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Thu, 7 Mar 2013 22:00:16 +0100
-Subject: out-of-tree build: Fix link creation
-
----
- appliance/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/appliance/Makefile.am b/appliance/Makefile.am
-index 8661bf4..7a30b0e 100644
---- a/appliance/Makefile.am
-+++ b/appliance/Makefile.am
-@@ -108,7 +108,7 @@ supermin.d/udev-rules.img: 99-guestfs-serial.rules
- rm -f $@ $@-t
- rm -rf tmp-u
- mkdir -p tmp-u/etc/udev/rules.d
-- for f in $^; do ln $$f tmp-u/etc/udev/rules.d/$$f; done
-+ for f in $^; do ln $$f tmp-u/etc/udev/rules.d/$$(basename $$f); done
- ( cd tmp-u && find | cpio --quiet -o -H newc ) > $@-t
- rm -rf tmp-u
- mv $@-t $@
diff --git a/debian/patches/series b/debian/patches/series
index bd250b2..0a7b7eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,9 +4,3 @@
0004-ruby-install-to-vendor_ruby.patch
0005-Fix-guestfs-supermin-appliance-path.patch
0006-erlang-Install-to-correct-directory.patch
-0007-out-of-tree-build-Fix-Ruby-bindings.patch
-0008-ruby-Don-t-compile-with-Werror.patch
-0009-Move-Ruby-related-checks-from-autoconf-to-extconf.rb.patch
-0010-out-of-tree-build-Fix-localized-manpages.patch
-0011-Change-conditional-build-disable-appliance-still-bui.patch
-0012-out-of-tree-build-Fix-link-creation.patch
--
Libguestfs Debian packaging
More information about the Pkg-libvirt-commits
mailing list