[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1%1.16.18-1-89-g6038ece
Hilko Bengen
bengen at debian.org
Mon Jan 7 18:44:51 UTC 2013
The following commit has been merged in the master branch:
commit 91546228e2705419d3beb84a7f55960932a8a1e2
Author: Hilko Bengen <bengen at debian.org>
Date: Thu Jun 28 14:04:40 2012 +0200
Rebased patch queue; added libruby detection fix
diff --git a/debian/patches/0007-ruby-Fix-detection-of-library-in-configure-script.patch b/debian/patches/0007-ruby-Fix-detection-of-library-in-configure-script.patch
new file mode 100644
index 0000000..a6cf3ff
--- /dev/null
+++ b/debian/patches/0007-ruby-Fix-detection-of-library-in-configure-script.patch
@@ -0,0 +1,27 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Fri, 29 Jun 2012 21:22:02 +0200
+Subject: ruby: Fix detection of library in configure script
+
+---
+ configure.ac | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index dfee7b2..79ccabc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1020,11 +1020,12 @@ AC_ARG_ENABLE([ruby],
+ AS_IF([test "x$enable_ruby" != "xno"],[
+ AC_CHECK_PROG([RUBY],[ruby],[ruby],[no])
+ AC_CHECK_PROG([RAKE],[rake],[rake],[no])
+- AC_CHECK_LIB([ruby],[ruby_init],[HAVE_LIBRUBY=1],[HAVE_LIBRUBY=])
++ ruby_soname=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["RUBY_SO_NAME"]]'`
++ AC_CHECK_LIB([$ruby_soname],[ruby_init],[HAVE_LIBRUBY=1],[HAVE_LIBRUBY=])
+ AC_SUBST([RAKE])
+ AS_IF([test -n "$HAVE_LIBRUBY"],[
+ old_LIBS="$LIBS"
+- LIBS="$LIBS -lruby"
++ LIBS="$LIBS -l$ruby_soname"
+ AC_CHECK_FUNCS([rb_hash_lookup])
+ LIBS="$old_LIBS"
+ ])
diff --git a/debian/patches/0007-autoreconf.patch b/debian/patches/0008-autoreconf.patch
similarity index 98%
rename from debian/patches/0007-autoreconf.patch
rename to debian/patches/0008-autoreconf.patch
index aaea031..6129203 100644
--- a/debian/patches/0007-autoreconf.patch
+++ b/debian/patches/0008-autoreconf.patch
@@ -6,19 +6,19 @@ Subject: autoreconf
Makefile.in | 37 ++-
aclocal.m4 | 24 +-
align/Makefile.in | 46 +++-
- appliance/Makefile.in | 56 ++++-
- build-aux/config.guess | 259 ++++++++++---------
+ appliance/Makefile.in | 56 +++-
+ build-aux/config.guess | 259 ++++++++++--------
build-aux/config.sub | 204 ++++++++++-----
cat/Makefile.in | 46 +++-
config.h.in | 14 +-
- configure | 559 +++++++++++++++++++++--------------------
+ configure | 582 +++++++++++++++++++++--------------------
csharp/Makefile.in | 24 +-
daemon/Makefile.in | 33 ++-
df/Makefile.in | 46 +++-
edit/Makefile.in | 46 +++-
erlang/Makefile.in | 34 ++-
erlang/examples/Makefile.in | 41 ++-
- examples/Makefile.in | 58 ++++-
+ examples/Makefile.in | 58 +++-
fish/Makefile.in | 61 ++++-
format/Makefile.in | 46 +++-
fuse/Makefile.in | 46 +++-
@@ -35,7 +35,7 @@ Subject: autoreconf
ocaml/examples/Makefile.in | 41 ++-
perl/Makefile.in | 25 +-
perl/examples/Makefile.in | 41 ++-
- php/Makefile.in | 29 ++-
+ php/Makefile.in | 29 +-
po-docs/Makefile.in | 35 ++-
po-docs/ja/Makefile.in | 24 +-
po-docs/uk/Makefile.in | 24 +-
@@ -65,7 +65,7 @@ Subject: autoreconf
tests/regressions/Makefile.in | 24 +-
tests/xml/Makefile.in | 24 +-
tools/Makefile.in | 46 +++-
- 62 files changed, 2357 insertions(+), 725 deletions(-)
+ 62 files changed, 2370 insertions(+), 735 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index ce2b84a..6425a4d 100644
@@ -1567,7 +1567,7 @@ index 45c869b..81fd788 100644
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
diff --git a/config.h.in b/config.h.in
-index 536e42b..199d299 100644
+index 0e4a7f9..6f9fe0d 100644
--- a/config.h.in
+++ b/config.h.in
@@ -21,12 +21,12 @@
@@ -1586,7 +1586,7 @@ index 536e42b..199d299 100644
#undef C_ALLOCA
/* Define as the bit index in the word where to find bit 0 of the exponent of
-@@ -2112,9 +2112,9 @@
+@@ -2115,9 +2115,9 @@
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
automatically deduced at runtime.
@@ -1599,7 +1599,7 @@ index 536e42b..199d299 100644
#undef STACK_DIRECTION
/* Define if the block counts reported by statfs may be truncated to 2GB and
-@@ -2226,7 +2226,7 @@
+@@ -2229,7 +2229,7 @@
/* Name of wrestool program. */
#undef WRESTOOL
@@ -1609,14 +1609,14 @@ index 536e42b..199d299 100644
# define _DARWIN_USE_64_BIT_INODE 1
#endif
diff --git a/configure b/configure
-index 6f27854..d8ee160 100755
+index 55f4ef2..51c5466 100755
--- a/configure
+++ b/configure
@@ -1,11 +1,9 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.68 for libguestfs 1.18.2.
-+# Generated by GNU Autoconf 2.69 for libguestfs 1.18.2.
+-# Generated by GNU Autoconf 2.68 for libguestfs 1.18.3.
++# Generated by GNU Autoconf 2.69 for libguestfs 1.18.3.
#
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1799,7 +1799,7 @@ index 6f27854..d8ee160 100755
@@ -2644,9 +2662,9 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
- libguestfs configure 1.18.2
+ libguestfs configure 1.18.3
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.69
@@ -1879,7 +1879,7 @@ index 6f27854..d8ee160 100755
@@ -3507,7 +3530,7 @@ This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
- It was created by libguestfs $as_me 1.18.2, which was
+ It was created by libguestfs $as_me 1.18.3, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
@@ -3206,7 +3206,60 @@ index 6f27854..d8ee160 100755
ac_cv_prog_RAKE="rake"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -54730,7 +54763,7 @@ do
+@@ -54470,13 +54503,15 @@ $as_echo "no" >&6; }
+ fi
+
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ruby_init in -lruby" >&5
+-$as_echo_n "checking for ruby_init in -lruby... " >&6; }
+-if ${ac_cv_lib_ruby_ruby_init+:} false; then :
++ ruby_soname=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["RUBY_SO_NAME"]'`
++ as_ac_Lib=`$as_echo "ac_cv_lib_$ruby_soname''_ruby_init" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ruby_init in -l$ruby_soname" >&5
++$as_echo_n "checking for ruby_init in -l$ruby_soname... " >&6; }
++if eval \${$as_ac_Lib+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lruby $LIBS"
++LIBS="-l$ruby_soname $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -54496,17 +54531,18 @@ return ruby_init ();
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_lib_ruby_ruby_init=yes
++ eval "$as_ac_Lib=yes"
+ else
+- ac_cv_lib_ruby_ruby_init=no
++ eval "$as_ac_Lib=no"
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ruby_ruby_init" >&5
+-$as_echo "$ac_cv_lib_ruby_ruby_init" >&6; }
+-if test "x$ac_cv_lib_ruby_ruby_init" = xyes; then :
++eval ac_res=\$$as_ac_Lib
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+ HAVE_LIBRUBY=1
+ else
+ HAVE_LIBRUBY=
+@@ -54516,7 +54552,7 @@ fi
+ if test -n "$HAVE_LIBRUBY"; then :
+
+ old_LIBS="$LIBS"
+- LIBS="$LIBS -lruby"
++ LIBS="$LIBS -l$ruby_soname"
+ for ac_func in rb_hash_lookup
+ do :
+ ac_fn_c_check_func "$LINENO" "rb_hash_lookup" "ac_cv_func_rb_hash_lookup"
+@@ -54748,7 +54784,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3215,7 +3268,7 @@ index 6f27854..d8ee160 100755
ac_cv_prog_GHC="ghc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -54790,7 +54823,7 @@ do
+@@ -54808,7 +54844,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3224,7 +3277,7 @@ index 6f27854..d8ee160 100755
ac_cv_prog_PHP="php"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -54828,7 +54861,7 @@ do
+@@ -54846,7 +54882,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3233,7 +3286,7 @@ index 6f27854..d8ee160 100755
ac_cv_prog_PHPIZE="phpize"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -54897,7 +54930,7 @@ do
+@@ -54915,7 +54951,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3242,7 +3295,7 @@ index 6f27854..d8ee160 100755
ac_cv_path_ERLC="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -54940,7 +54973,7 @@ do
+@@ -54958,7 +54994,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3251,7 +3304,7 @@ index 6f27854..d8ee160 100755
ac_cv_path_ac_pt_ERLC="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -55005,7 +55038,7 @@ do
+@@ -55023,7 +55059,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3260,7 +3313,7 @@ index 6f27854..d8ee160 100755
ac_cv_path_ERL="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -55048,7 +55081,7 @@ do
+@@ -55066,7 +55102,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3269,7 +3322,7 @@ index 6f27854..d8ee160 100755
ac_cv_path_ac_pt_ERL="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -55193,7 +55226,7 @@ do
+@@ -55211,7 +55247,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3278,7 +3331,7 @@ index 6f27854..d8ee160 100755
ac_cv_path_ERLC="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -55236,7 +55269,7 @@ do
+@@ -55254,7 +55290,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3287,7 +3340,7 @@ index 6f27854..d8ee160 100755
ac_cv_path_ac_pt_ERLC="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -55303,7 +55336,7 @@ do
+@@ -55321,7 +55357,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3296,7 +3349,7 @@ index 6f27854..d8ee160 100755
ac_cv_path_ERL="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -55346,7 +55379,7 @@ do
+@@ -55364,7 +55400,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3305,7 +3358,7 @@ index 6f27854..d8ee160 100755
ac_cv_path_ac_pt_ERL="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -55505,6 +55538,7 @@ if test -n "$GOBJECT_CFLAGS"; then
+@@ -55523,6 +55559,7 @@ if test -n "$GOBJECT_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GOBJECT_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0 >= 2.26.0" 2>/dev/null`
@@ -3313,7 +3366,7 @@ index 6f27854..d8ee160 100755
else
pkg_failed=yes
fi
-@@ -55521,6 +55555,7 @@ if test -n "$GOBJECT_LIBS"; then
+@@ -55539,6 +55576,7 @@ if test -n "$GOBJECT_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GOBJECT_LIBS=`$PKG_CONFIG --libs "gobject-2.0 >= 2.26.0" 2>/dev/null`
@@ -3321,7 +3374,7 @@ index 6f27854..d8ee160 100755
else
pkg_failed=yes
fi
-@@ -55540,9 +55575,9 @@ else
+@@ -55558,9 +55596,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -3333,7 +3386,7 @@ index 6f27854..d8ee160 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$GOBJECT_PKG_ERRORS" >&5
-@@ -55585,6 +55620,7 @@ if test -n "$GIO_CFLAGS"; then
+@@ -55603,6 +55641,7 @@ if test -n "$GIO_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= 2.26.0" 2>/dev/null`
@@ -3341,7 +3394,7 @@ index 6f27854..d8ee160 100755
else
pkg_failed=yes
fi
-@@ -55601,6 +55637,7 @@ if test -n "$GIO_LIBS"; then
+@@ -55619,6 +55658,7 @@ if test -n "$GIO_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= 2.26.0" 2>/dev/null`
@@ -3349,7 +3402,7 @@ index 6f27854..d8ee160 100755
else
pkg_failed=yes
fi
-@@ -55620,9 +55657,9 @@ else
+@@ -55638,9 +55678,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -3361,7 +3414,7 @@ index 6f27854..d8ee160 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$GIO_PKG_ERRORS" >&5
-@@ -55677,7 +55714,7 @@ do
+@@ -55695,7 +55735,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3370,7 +3423,7 @@ index 6f27854..d8ee160 100755
ac_cv_prog_GJS="gjs"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -55833,7 +55870,7 @@ do
+@@ -55851,7 +55891,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3379,7 +3432,7 @@ index 6f27854..d8ee160 100755
ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -55875,7 +55912,7 @@ do
+@@ -55893,7 +55933,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3388,7 +3441,7 @@ index 6f27854..d8ee160 100755
ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -55919,7 +55956,7 @@ do
+@@ -55937,7 +55977,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3397,7 +3450,7 @@ index 6f27854..d8ee160 100755
ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -55988,6 +56025,7 @@ if test -n "$GTKDOC_DEPS_CFLAGS"; then
+@@ -56006,6 +56046,7 @@ if test -n "$GTKDOC_DEPS_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null`
@@ -3405,7 +3458,7 @@ index 6f27854..d8ee160 100755
else
pkg_failed=yes
fi
-@@ -56004,6 +56042,7 @@ if test -n "$GTKDOC_DEPS_LIBS"; then
+@@ -56022,6 +56063,7 @@ if test -n "$GTKDOC_DEPS_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null`
@@ -3413,7 +3466,7 @@ index 6f27854..d8ee160 100755
else
pkg_failed=yes
fi
-@@ -56023,9 +56062,9 @@ else
+@@ -56041,9 +56083,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -3425,7 +3478,7 @@ index 6f27854..d8ee160 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$GTKDOC_DEPS_PKG_ERRORS" >&5
-@@ -56040,7 +56079,6 @@ installed software in a non-standard prefix.
+@@ -56058,7 +56100,6 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS
and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -3433,7 +3486,7 @@ index 6f27854..d8ee160 100755
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -56056,7 +56094,6 @@ See the pkg-config man page for more details.
+@@ -56074,7 +56115,6 @@ See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
@@ -3441,7 +3494,7 @@ index 6f27854..d8ee160 100755
else
GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS
GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS
-@@ -56811,16 +56848,16 @@ if (echo >conf$$.file) 2>/dev/null; then
+@@ -56829,16 +56869,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
@@ -3462,7 +3515,7 @@ index 6f27854..d8ee160 100755
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
-@@ -56880,28 +56917,16 @@ else
+@@ -56898,28 +56938,16 @@ else
as_mkdir_p=false
fi
@@ -3501,19 +3554,19 @@ index 6f27854..d8ee160 100755
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -56923,7 +56948,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+@@ -56941,7 +56969,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# values after options handling.
ac_log="
- This file was extended by libguestfs $as_me 1.18.2, which was
+ This file was extended by libguestfs $as_me 1.18.3, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -56993,10 +57018,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+@@ -57011,10 +57039,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
- libguestfs config.status 1.18.2
+ libguestfs config.status 1.18.3
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -3523,7 +3576,7 @@ index 6f27854..d8ee160 100755
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -57087,7 +57112,7 @@ fi
+@@ -57105,7 +57133,7 @@ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
diff --git a/debian/patches/series b/debian/patches/series
index cd037d0..ab4aa18 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,5 @@
0004-out-of-tree-build-fix-building-Perl-bindings.patch
0005-out-of-tree-build-daemon.patch
0006-ruby-install-to-vendor_ruby.patch
-0007-autoreconf.patch
+0007-ruby-Fix-detection-of-library-in-configure-script.patch
+0008-autoreconf.patch
--
Libguestfs Debian packaging
More information about the Pkg-libvirt-commits
mailing list