[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:14 UTC 2013
The following commit has been merged in the master branch:
commit 5136bf51c3feff5ecb38af18a11bc81624d184fc
Author: Hilko Bengen <bengen at debian.org>
Date: Tue Mar 5 23:07:04 2013 +0100
Dropped patches that were integrated upstream.
diff --git a/debian/patches/0004-out-of-tree-build-daemon.patch b/debian/patches/0004-out-of-tree-build-daemon.patch
deleted file mode 100644
index 1af0314..0000000
--- a/debian/patches/0004-out-of-tree-build-daemon.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Sat, 16 Feb 2013 12:36:34 +0100
-Subject: out-of-tree build: daemon
-
-- Add include path
-
- CC guestfsd-9p.o
- In file included from ../../../daemon/9p.c:32:0:
- ../../../daemon/daemon.h:33:34: fatal error: guestfs-internal-all.h: No such file or directory
-
-- Fix paths for shared source files so that they are found when building out-of-tree.
----
- daemon/Makefile.am | 13 ++++++-------
- 1 file changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/daemon/Makefile.am b/daemon/Makefile.am
-index 024aa6a..6da6082 100644
---- a/daemon/Makefile.am
-+++ b/daemon/Makefile.am
-@@ -19,8 +19,6 @@ include $(top_srcdir)/subdir-rules.mk
-
- CLEANFILES = stamp-guestfsd.pod
-
--libsrcdir = $(top_builddir)/src
--
- generator_built = \
- actions.h \
- stubs.c \
-@@ -42,7 +40,7 @@ EXTRA_DIST = \
- $(BUILT_SOURCES) \
- guestfsd.pod
-
--$(shared_with_library): %: $(libsrcdir)/%
-+$(shared_with_library): %: $(top_srcdir)/src/%
- rm -f $@
- ln $< $@
-
-@@ -53,10 +51,10 @@ noinst_LIBRARIES = libprotocol.a
- libprotocol_a_SOURCES = guestfs_protocol.c guestfs_protocol.h
- libprotocol_a_CFLAGS = -Wall -Wno-unused -fno-strict-aliasing
-
--$(libsrcdir)/guestfs_protocol.c: force
-- $(MAKE) -C $(libsrcdir) guestfs_protocol.c
--$(libsrcdir)/guestfs_protocol.h: force
-- $(MAKE) -C $(libsrcdir) guestfs_protocol.h
-+$(top_builddir)/src/guestfs_protocol.c: force
-+ $(MAKE) -C $(top_builddir)/src guestfs_protocol.c
-+$(top_builddir)/src/guestfs_protocol.h: force
-+ $(MAKE) -C $(top_builddir)/src guestfs_protocol.h
-
- # Build the errnostring perfect hash code. The generated code has lots
- # of warnings so we must compile it in a separate mini-library.
-@@ -196,6 +194,7 @@ guestfsd_LDADD = \
- guestfsd_CPPFLAGS = \
- -I$(top_srcdir)/gnulib/lib \
- -I$(top_builddir)/gnulib/lib \
-+ -I$(top_srcdir)/src \
- -I$(top_builddir)/src
- guestfsd_CFLAGS = \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
diff --git a/debian/patches/0005-ruby-install-to-vendor_ruby.patch b/debian/patches/0004-ruby-install-to-vendor_ruby.patch
similarity index 100%
rename from debian/patches/0005-ruby-install-to-vendor_ruby.patch
rename to debian/patches/0004-ruby-install-to-vendor_ruby.patch
diff --git a/debian/patches/0006-Fix-guestfs-supermin-appliance-path.patch b/debian/patches/0005-Fix-guestfs-supermin-appliance-path.patch
similarity index 86%
rename from debian/patches/0006-Fix-guestfs-supermin-appliance-path.patch
rename to debian/patches/0005-Fix-guestfs-supermin-appliance-path.patch
index d22df49..723e32d 100644
--- a/debian/patches/0006-Fix-guestfs-supermin-appliance-path.patch
+++ b/debian/patches/0005-Fix-guestfs-supermin-appliance-path.patch
@@ -24,11 +24,11 @@ index 19f01dc..169ea15 100644
fs_DATA =
superminfs_DATA = \
diff --git a/src/Makefile.am b/src/Makefile.am
-index 2c3af05..a5cb8b1 100644
+index 401b076..43ad424 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -196,7 +196,7 @@ noinst_LTLIBRARIES = liberrnostring.la libprotocol.la
- libguestfs_la_LIBADD += liberrnostring.la libprotocol.la
+@@ -116,7 +116,7 @@ libguestfs_la_SOURCES = \
+ libguestfs.syms
libguestfs_la_CPPFLAGS = \
- -DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' \
diff --git a/debian/patches/0007-erlang-Install-to-correct-directory.patch b/debian/patches/0006-erlang-Install-to-correct-directory.patch
similarity index 94%
rename from debian/patches/0007-erlang-Install-to-correct-directory.patch
rename to debian/patches/0006-erlang-Install-to-correct-directory.patch
index 380ca1f..b768a43 100644
--- a/debian/patches/0007-erlang-Install-to-correct-directory.patch
+++ b/debian/patches/0006-erlang-Install-to-correct-directory.patch
@@ -7,7 +7,7 @@ Subject: erlang: Install to correct directory
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/erlang/Makefile.am b/erlang/Makefile.am
-index b036b36..22fe6e5 100644
+index c7a52a9..a2c978f 100644
--- a/erlang/Makefile.am
+++ b/erlang/Makefile.am
@@ -30,7 +30,7 @@ EXTRA_DIST = \
diff --git a/debian/patches/0009-out-of-tree-build-Fix-Ruby-bindings.patch b/debian/patches/0007-out-of-tree-build-Fix-Ruby-bindings.patch
similarity index 100%
rename from debian/patches/0009-out-of-tree-build-Fix-Ruby-bindings.patch
rename to debian/patches/0007-out-of-tree-build-Fix-Ruby-bindings.patch
diff --git a/debian/patches/0008-out-of-tree-build-Fix-test-tool.patch b/debian/patches/0008-out-of-tree-build-Fix-test-tool.patch
deleted file mode 100644
index 71b7acb..0000000
--- a/debian/patches/0008-out-of-tree-build-Fix-test-tool.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Sat, 16 Feb 2013 12:46:30 +0100
-Subject: out-of-tree build: Fix test-tool
-
-(Not entirely sure whether using Gnulib to replace standard functions
-is a good idea at all.)
-
-link with libgnu:
- CCLD libguestfs-test-tool
-libguestfs_test_tool-test-tool.o: In function `main':
-/home/bengen/src/deb/pkg-libvirt/libguestfs/debian/build-default/test-tool/../../../test-tool/test-tool.c:103: undefined reference to `rpl_getopt_long'
-/home/bengen/src/deb/pkg-libvirt/libguestfs/debian/build-default/test-tool/../../../test-tool/test-tool.c:113: undefined reference to `rpl_optarg'
-/home/bengen/src/deb/pkg-libvirt/libguestfs/debian/build-default/test-tool/../../../test-tool/test-tool.c:125: undefined reference to `rpl_optarg'
-/home/bengen/src/deb/pkg-libvirt/libguestfs/debian/build-default/test-tool/../../../test-tool/test-tool.c:126: undefined reference to `rpl_optarg'
-/home/bengen/src/deb/pkg-libvirt/libguestfs/debian/build-default/test-tool/../../../test-tool/test-tool.c:109: undefined reference to `rpl_optarg'
-libguestfs_test_tool-test-tool.o: In function `set_qemu':
-/home/bengen/src/deb/pkg-libvirt/libguestfs/debian/build-default/test-tool/../../../test-tool/test-tool.c:382: undefined reference to `rpl_perror'
-/home/bengen/src/deb/pkg-libvirt/libguestfs/debian/build-default/test-tool/../../../test-tool/test-tool.c:366: undefined reference to `rpl_perror'
-libguestfs_test_tool-test-tool.o: In function `make_files':
-/home/bengen/src/deb/pkg-libvirt/libguestfs/debian/build-default/test-tool/../../../test-tool/test-tool.c:416: undefined reference to `rpl_perror'
-/home/bengen/src/deb/pkg-libvirt/libguestfs/debian/build-default/test-tool/../../../test-tool/test-tool.c:428: undefined reference to `rpl_perror'
----
- test-tool/Makefile.am | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/test-tool/Makefile.am b/test-tool/Makefile.am
-index 200f2cb..bb2e03c 100644
---- a/test-tool/Makefile.am
-+++ b/test-tool/Makefile.am
-@@ -37,7 +37,8 @@ libguestfs_test_tool_CFLAGS = \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
-
- libguestfs_test_tool_LDADD = \
-- $(top_builddir)/src/libguestfs.la
-+ $(top_builddir)/src/libguestfs.la \
-+ $(top_builddir)/gnulib/lib/libgnu.la
-
- libguestfs-test-tool.1 $(top_builddir)/html/libguestfs-test-tool.1.html: stamp-libguestfs-test-tool.pod
-
diff --git a/debian/patches/0010-ruby-Don-t-compile-with-Werror.patch b/debian/patches/0008-ruby-Don-t-compile-with-Werror.patch
similarity index 100%
rename from debian/patches/0010-ruby-Don-t-compile-with-Werror.patch
rename to debian/patches/0008-ruby-Don-t-compile-with-Werror.patch
diff --git a/debian/patches/0011-ruby-Move-checks-for-symbols-from-configure.ac-to-ex.patch b/debian/patches/0009-ruby-Move-checks-for-symbols-from-configure.ac-to-ex.patch
similarity index 94%
rename from debian/patches/0011-ruby-Move-checks-for-symbols-from-configure.ac-to-ex.patch
rename to debian/patches/0009-ruby-Move-checks-for-symbols-from-configure.ac-to-ex.patch
index 5d0933b..9ffb97c 100644
--- a/debian/patches/0011-ruby-Move-checks-for-symbols-from-configure.ac-to-ex.patch
+++ b/debian/patches/0009-ruby-Move-checks-for-symbols-from-configure.ac-to-ex.patch
@@ -11,10 +11,10 @@ Subject: ruby: Move checks for symbols from configure.ac to extconf.rb; add
4 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/configure.ac b/configure.ac
-index ee20911..d60127b 100644
+index 9d73c67..6e9a1c4 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1143,14 +1143,6 @@ AS_IF([test "x$enable_ruby" != "xno"],[
+@@ -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=])
@@ -53,7 +53,7 @@ index db16e2a..ba02fd1 100644
#endif
diff --git a/ruby/ext/guestfs/_guestfs.c b/ruby/ext/guestfs/_guestfs.c
-index c0d6ced..d4282f5 100644
+index 29e9feb..ad7e74e 100644
--- a/ruby/ext/guestfs/_guestfs.c
+++ b/ruby/ext/guestfs/_guestfs.c
@@ -20,8 +20,6 @@
@@ -65,7 +65,7 @@ index c0d6ced..d4282f5 100644
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
-@@ -23467,6 +23465,9 @@ Init__guestfs (void)
+@@ -23466,6 +23464,9 @@ Init__guestfs (void)
e_Error = rb_define_class_under (m_guestfs, "Error", rb_eStandardError);
#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
diff --git a/debian/patches/0012-build-Only-add-serial-tests-for-automake-1.12.patch b/debian/patches/0012-build-Only-add-serial-tests-for-automake-1.12.patch
deleted file mode 100644
index 60a50b1..0000000
--- a/debian/patches/0012-build-Only-add-serial-tests-for-automake-1.12.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: "Richard W.M. Jones" <rjones at redhat.com>
-Date: Tue, 19 Feb 2013 15:38:27 +0000
-Subject: build: Only add 'serial-tests' for automake >= 1.12.
-
-Earlier versions of automake complain if they get a configuration
-parameter which they don't understand. The error is:
-
-configure.ac:27: error: option 'serial-tests' not recognized
-
-Use some m4 hackery to work around this.
----
- configure.ac | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index d60127b..c6420e6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -24,7 +24,21 @@ m4_define([libguestfs_release], [2])
-
- AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
- AC_CONFIG_AUX_DIR([build-aux])
--AM_INIT_AUTOMAKE([foreign serial-tests])
-+
-+dnl Initialize automake. automake < 1.12 didn't have serial-tests and
-+dnl gives an error if it sees this, but for automake >= 1.13
-+dnl serial-tests is required so we have to include it. Solution is to
-+dnl test for the version of automake (by running an external command)
-+dnl and provide it if necessary. Note we have to do this entirely using
-+dnl m4 macros since automake queries this macro by running
-+dnl 'autoconf --trace ...'.
-+m4_define([serial_tests], [
-+ m4_esyscmd([automake --version |
-+ head -1 |
-+ awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { print "serial-tests" }}'
-+ ])
-+])
-+AM_INIT_AUTOMAKE(foreign serial_tests) dnl NB: Do not [quote] this parameter.
-
- m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
- AM_SILENT_RULES([yes]) # make --enable-silent-rules the default.
diff --git a/debian/patches/series b/debian/patches/series
index ce48e72..c9686fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,9 @@
0001-Mount-run-as-tmpfs-inside-appliance-workaround-for-f.patch
0002-Fix-for-systemd-based-Debian-systems.patch
0003-out-of-tree-build-fix-building-Perl-bindings.patch
-0004-out-of-tree-build-daemon.patch
-0005-ruby-install-to-vendor_ruby.patch
-0006-Fix-guestfs-supermin-appliance-path.patch
-0007-erlang-Install-to-correct-directory.patch
-0008-out-of-tree-build-Fix-test-tool.patch
-0009-out-of-tree-build-Fix-Ruby-bindings.patch
-0010-ruby-Don-t-compile-with-Werror.patch
-0011-ruby-Move-checks-for-symbols-from-configure.ac-to-ex.patch
-0012-build-Only-add-serial-tests-for-automake-1.12.patch
+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-ruby-Move-checks-for-symbols-from-configure.ac-to-ex.patch
--
Libguestfs Debian packaging
More information about the Pkg-libvirt-commits
mailing list