[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1.10.5-1-6-g7c279af
Hilko Bengen
bengen at debian.org
Mon Aug 1 13:21:45 UTC 2011
The following commit has been merged in the master branch:
commit f39a6ee8c693d5ff80d2241493a9c274b6ee6c81
Author: Hilko Bengen <bengen at debian.org>
Date: Sat Jul 30 13:34:39 2011 +0200
Updated patches, fixed what seemed to be a misspelling
diff --git a/debian/patches/0001-Disable-fuser-tests-if-dev-fuse-doesn-t-exist.patch b/debian/patches/0001-Disable-fuse-tests-if-dev-fuse-doesn-t-exist.patch
similarity index 82%
rename from debian/patches/0001-Disable-fuser-tests-if-dev-fuse-doesn-t-exist.patch
rename to debian/patches/0001-Disable-fuse-tests-if-dev-fuse-doesn-t-exist.patch
index 3001ebf..a0b1569 100644
--- a/debian/patches/0001-Disable-fuser-tests-if-dev-fuse-doesn-t-exist.patch
+++ b/debian/patches/0001-Disable-fuse-tests-if-dev-fuse-doesn-t-exist.patch
@@ -1,6 +1,6 @@
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
Date: Sun, 21 Feb 2010 19:29:30 +0100
-Subject: Disable fuser tests if /dev/fuse doesn't exist
+Subject: Disable fuse tests if /dev/fuse doesn't exist
e.g. when running in a chroot.
---
@@ -8,14 +8,14 @@ e.g. when running in a chroot.
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/fuse/test-fuse.sh b/fuse/test-fuse.sh
-index 0a429f7..5a7a63d 100755
+index 0a429f7..b292677 100755
--- a/fuse/test-fuse.sh
+++ b/fuse/test-fuse.sh
@@ -45,6 +45,11 @@ if [ ! -x "$guestfish" -o ! -x "$guestmount" ]; then
exit 1
fi
-+if [ ! -c /dev/fuser ]; then
++if [ ! -c /dev/fuse ]; then
+ echo "/dev/fuse does not exist skipping tests."
+ exit 0
+fi
diff --git a/debian/patches/0005-configure.ac-use-Python-mechanism-to-determine-PYTHO.patch b/debian/patches/0005-configure.ac-use-Python-mechanism-to-determine-PYTHO.patch
index b1094a7..c1bffc7 100644
--- a/debian/patches/0005-configure.ac-use-Python-mechanism-to-determine-PYTHO.patch
+++ b/debian/patches/0005-configure.ac-use-Python-mechanism-to-determine-PYTHO.patch
@@ -7,10 +7,10 @@ Subject: configure.ac: use Python mechanism to determine PYTHON_INSTALLDIR
1 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 544b434..2a755c3 100644
+index 28561a6..b521578 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -563,22 +563,8 @@ AS_IF([test "x$enable_python" != "xno"],
+@@ -576,22 +576,8 @@ AS_IF([test "x$enable_python" != "xno"],
[PYTHON_INSTALLDIR=check])
if test "x$PYTHON_INSTALLDIR" = "xcheck"; then
diff --git a/debian/patches/0006-configure.ac-do-not-generate-debian-changelog.patch b/debian/patches/0006-configure.ac-do-not-generate-debian-changelog.patch
index f7f39ad..262c42f 100644
--- a/debian/patches/0006-configure.ac-do-not-generate-debian-changelog.patch
+++ b/debian/patches/0006-configure.ac-do-not-generate-debian-changelog.patch
@@ -7,10 +7,10 @@ Subject: configure.ac: do not generate debian/changelog
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 2a755c3..369fa21 100644
+index b521578..bcadc56 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -811,7 +811,6 @@ AC_CONFIG_FILES([Makefile
+@@ -824,7 +824,6 @@ AC_CONFIG_FILES([Makefile
cat/Makefile
caution/Makefile
csharp/Makefile
diff --git a/debian/patches/0007-Do-not-run-appliance-related-checks-if-not-building-.patch b/debian/patches/0007-Do-not-run-appliance-related-checks-if-not-building-.patch
index 27537ef..1eaa4de 100644
--- a/debian/patches/0007-Do-not-run-appliance-related-checks-if-not-building-.patch
+++ b/debian/patches/0007-Do-not-run-appliance-related-checks-if-not-building-.patch
@@ -15,7 +15,7 @@ Subject: Do not run appliance-related checks if not building appliance
9 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index b2d1f74..3ebf6ba 100644
+index 7a1afbc..4ac3f86 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,10 @@ SUBDIRS += appliance
diff --git a/debian/patches/0008-check-for-febootstrap-etc.-even-if-not-building-appl.patch b/debian/patches/0008-check-for-febootstrap-etc.-even-if-not-building-appl.patch
index cbca116..f4b8056 100644
--- a/debian/patches/0008-check-for-febootstrap-etc.-even-if-not-building-appl.patch
+++ b/debian/patches/0008-check-for-febootstrap-etc.-even-if-not-building-appl.patch
@@ -7,7 +7,7 @@ Subject: check for febootstrap etc. even if not building appliance
1 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 369fa21..e6ef0c8 100644
+index bcadc56..fa1e625 100644
--- a/configure.ac
+++ b/configure.ac
@@ -180,46 +180,47 @@ AC_ARG_ENABLE([appliance],
@@ -35,7 +35,7 @@ index 369fa21..e6ef0c8 100644
test "x$FEBOOTSTRAP" = "xno" &&
AC_MSG_ERROR([febootstrap must be installed])
dnl febootstrap 2.x did not support the --version parameter
- $FEBOOTSTRAP --version >/dev/null 2>&1 ||
+ $FEBOOTSTRAP --version >&AS_MESSAGE_LOG_FD 2>&1 ||
AC_MSG_ERROR([febootstrap >= 3.0 must be installed, your version is too old])
+fi
@@ -59,7 +59,7 @@ index 369fa21..e6ef0c8 100644
- DISTRO=REDHAT
- if test -f /etc/debian_version; then
- DISTRO=DEBIAN
-- if grep -q 'DISTRIB_ID=Ubuntu' /etc/lsb-release 2>/dev/null; then
+- if grep -q 'DISTRIB_ID=Ubuntu' /etc/lsb-release 2>&AS_MESSAGE_LOG_FD; then
- DISTRO=UBUNTU
- fi
- fi
@@ -75,7 +75,7 @@ index 369fa21..e6ef0c8 100644
+DISTRO=REDHAT
+if test -f /etc/debian_version; then
+ DISTRO=DEBIAN
-+ if grep -q 'DISTRIB_ID=Ubuntu' /etc/lsb-release 2>/dev/null; then
++ if grep -q 'DISTRIB_ID=Ubuntu' /etc/lsb-release 2>&AS_MESSAGE_LOG_FD; then
+ DISTRO=UBUNTU
fi
- AC_MSG_RESULT([$DISTRO])
diff --git a/debian/patches/0009-regenerated-auto-related-files.patch b/debian/patches/0009-regenerated-auto-related-files.patch
index 3a75e1f..3a1441e 100644
--- a/debian/patches/0009-regenerated-auto-related-files.patch
+++ b/debian/patches/0009-regenerated-auto-related-files.patch
@@ -18,7 +18,7 @@ Subject: regenerated auto*-related files
12 files changed, 105 insertions(+), 115 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index 14441ea..f8c1120 100644
+index de73f39..59048f0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -71,33 +71,33 @@ host_triplet = @host@
@@ -185,7 +185,7 @@ index 67fabff..5cc0364 100644
.SUFFIXES:
diff --git a/configure b/configure
-index d3f1684..26bbe39 100755
+index 87cfd33..7e24d81 100755
--- a/configure
+++ b/configure
@@ -32526,8 +32526,7 @@ fi
@@ -204,7 +204,7 @@ index d3f1684..26bbe39 100755
- test "x$FEBOOTSTRAP" = "xno" &&
- as_fn_error $? "febootstrap must be installed" "$LINENO" 5
-- $FEBOOTSTRAP --version >/dev/null 2>&1 ||
+- $FEBOOTSTRAP --version >&5 2>&1 ||
- as_fn_error $? "febootstrap >= 3.0 must be installed, your version is too old" "$LINENO" 5
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if user requested febootstrap --yum-config option" >&5
@@ -225,7 +225,7 @@ index d3f1684..26bbe39 100755
+if test "x$enable_appliance" = "xyes"; then
+ test "x$FEBOOTSTRAP" = "xno" &&
+ as_fn_error $? "febootstrap must be installed" "$LINENO" 5
-+ $FEBOOTSTRAP --version >/dev/null 2>&1 ||
++ $FEBOOTSTRAP --version >&5 2>&1 ||
+ as_fn_error $? "febootstrap >= 3.0 must be installed, your version is too old" "$LINENO" 5
+fi
+
@@ -234,7 +234,7 @@ index d3f1684..26bbe39 100755
- DISTRO=REDHAT
- if test -f /etc/debian_version; then
- DISTRO=DEBIAN
-- if grep -q 'DISTRIB_ID=Ubuntu' /etc/lsb-release 2>/dev/null; then
+- if grep -q 'DISTRIB_ID=Ubuntu' /etc/lsb-release 2>&5; then
- DISTRO=UBUNTU
- fi
- fi
@@ -243,7 +243,7 @@ index d3f1684..26bbe39 100755
+DISTRO=REDHAT
+if test -f /etc/debian_version; then
+ DISTRO=DEBIAN
-+ if grep -q 'DISTRIB_ID=Ubuntu' /etc/lsb-release 2>/dev/null; then
++ if grep -q 'DISTRIB_ID=Ubuntu' /etc/lsb-release 2>&5; then
+ DISTRO=UBUNTU
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DISTRO" >&5
@@ -258,7 +258,7 @@ index d3f1684..26bbe39 100755
# Extract the first word of "rpcgen", so it can be a program name with args.
set dummy rpcgen; ac_word=$2
-@@ -35286,6 +35287,7 @@ fi
+@@ -35304,6 +35305,7 @@ fi
@@ -266,7 +266,7 @@ index d3f1684..26bbe39 100755
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-@@ -35414,6 +35416,7 @@ if test -n "$PCRE_CFLAGS"; then
+@@ -35432,6 +35434,7 @@ if test -n "$PCRE_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_PCRE_CFLAGS=`$PKG_CONFIG --cflags "libpcre" 2>/dev/null`
@@ -274,7 +274,7 @@ index d3f1684..26bbe39 100755
else
pkg_failed=yes
fi
-@@ -35430,6 +35433,7 @@ if test -n "$PCRE_LIBS"; then
+@@ -35448,6 +35451,7 @@ if test -n "$PCRE_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_PCRE_LIBS=`$PKG_CONFIG --libs "libpcre" 2>/dev/null`
@@ -282,7 +282,7 @@ index d3f1684..26bbe39 100755
else
pkg_failed=yes
fi
-@@ -35449,9 +35453,9 @@ else
+@@ -35467,9 +35471,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -294,7 +294,7 @@ index d3f1684..26bbe39 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$PCRE_PKG_ERRORS" >&5
-@@ -35491,6 +35495,7 @@ if test -n "$LIBVIRT_CFLAGS"; then
+@@ -35509,6 +35513,7 @@ if test -n "$LIBVIRT_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBVIRT_CFLAGS=`$PKG_CONFIG --cflags "libvirt" 2>/dev/null`
@@ -302,7 +302,7 @@ index d3f1684..26bbe39 100755
else
pkg_failed=yes
fi
-@@ -35507,6 +35512,7 @@ if test -n "$LIBVIRT_LIBS"; then
+@@ -35525,6 +35530,7 @@ if test -n "$LIBVIRT_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBVIRT_LIBS=`$PKG_CONFIG --libs "libvirt" 2>/dev/null`
@@ -310,7 +310,7 @@ index d3f1684..26bbe39 100755
else
pkg_failed=yes
fi
-@@ -35526,9 +35532,9 @@ else
+@@ -35544,9 +35550,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -322,7 +322,7 @@ index d3f1684..26bbe39 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBVIRT_PKG_ERRORS" >&5
-@@ -35576,6 +35582,7 @@ if test -n "$LIBXML2_CFLAGS"; then
+@@ -35594,6 +35600,7 @@ if test -n "$LIBXML2_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null`
@@ -330,7 +330,7 @@ index d3f1684..26bbe39 100755
else
pkg_failed=yes
fi
-@@ -35592,6 +35599,7 @@ if test -n "$LIBXML2_LIBS"; then
+@@ -35610,6 +35617,7 @@ if test -n "$LIBXML2_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
@@ -338,7 +338,7 @@ index d3f1684..26bbe39 100755
else
pkg_failed=yes
fi
-@@ -35611,9 +35619,9 @@ else
+@@ -35629,9 +35637,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -350,7 +350,7 @@ index d3f1684..26bbe39 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBXML2_PKG_ERRORS" >&5
-@@ -35661,6 +35669,7 @@ if test -n "$LIBCONFIG_CFLAGS"; then
+@@ -35679,6 +35687,7 @@ if test -n "$LIBCONFIG_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBCONFIG_CFLAGS=`$PKG_CONFIG --cflags "libconfig" 2>/dev/null`
@@ -358,7 +358,7 @@ index d3f1684..26bbe39 100755
else
pkg_failed=yes
fi
-@@ -35677,6 +35686,7 @@ if test -n "$LIBCONFIG_LIBS"; then
+@@ -35695,6 +35704,7 @@ if test -n "$LIBCONFIG_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBCONFIG_LIBS=`$PKG_CONFIG --libs "libconfig" 2>/dev/null`
@@ -366,7 +366,7 @@ index d3f1684..26bbe39 100755
else
pkg_failed=yes
fi
-@@ -35696,9 +35706,9 @@ else
+@@ -35714,9 +35724,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -378,7 +378,7 @@ index d3f1684..26bbe39 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBCONFIG_PKG_ERRORS" >&5
-@@ -35746,6 +35756,7 @@ if test -n "$HIVEX_CFLAGS"; then
+@@ -35764,6 +35774,7 @@ if test -n "$HIVEX_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_HIVEX_CFLAGS=`$PKG_CONFIG --cflags "hivex" 2>/dev/null`
@@ -386,7 +386,7 @@ index d3f1684..26bbe39 100755
else
pkg_failed=yes
fi
-@@ -35762,6 +35773,7 @@ if test -n "$HIVEX_LIBS"; then
+@@ -35780,6 +35791,7 @@ if test -n "$HIVEX_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_HIVEX_LIBS=`$PKG_CONFIG --libs "hivex" 2>/dev/null`
@@ -394,7 +394,7 @@ index d3f1684..26bbe39 100755
else
pkg_failed=yes
fi
-@@ -35781,9 +35793,9 @@ else
+@@ -35799,9 +35811,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -406,7 +406,7 @@ index d3f1684..26bbe39 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$HIVEX_PKG_ERRORS" >&5
-@@ -35839,6 +35851,7 @@ if test -n "$FUSE_CFLAGS"; then
+@@ -35857,6 +35869,7 @@ if test -n "$FUSE_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_FUSE_CFLAGS=`$PKG_CONFIG --cflags "fuse" 2>/dev/null`
@@ -414,7 +414,7 @@ index d3f1684..26bbe39 100755
else
pkg_failed=yes
fi
-@@ -35855,6 +35868,7 @@ if test -n "$FUSE_LIBS"; then
+@@ -35873,6 +35886,7 @@ if test -n "$FUSE_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_FUSE_LIBS=`$PKG_CONFIG --libs "fuse" 2>/dev/null`
@@ -422,7 +422,7 @@ index d3f1684..26bbe39 100755
else
pkg_failed=yes
fi
-@@ -35874,9 +35888,9 @@ else
+@@ -35892,9 +35906,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -434,7 +434,7 @@ index d3f1684..26bbe39 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$FUSE_PKG_ERRORS" >&5
-@@ -37138,25 +37152,8 @@ fi
+@@ -37156,25 +37170,8 @@ fi
if test "x$PYTHON_INSTALLDIR" = "xcheck"; then
@@ -462,7 +462,7 @@ index d3f1684..26bbe39 100755
if test "x$PYTHON_INSTALLDIR" = "x"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Python site-packages directory not found" >&5
$as_echo "$as_me: WARNING: Python site-packages directory not found" >&2;}
-@@ -37663,7 +37660,7 @@ ac_config_headers="$ac_config_headers config.h"
+@@ -37681,7 +37678,7 @@ ac_config_headers="$ac_config_headers config.h"
ac_config_files="$ac_config_files podwrapper.sh"
@@ -471,7 +471,7 @@ index d3f1684..26bbe39 100755
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -38813,7 +38810,6 @@ do
+@@ -38831,7 +38828,6 @@ do
"cat/Makefile") CONFIG_FILES="$CONFIG_FILES cat/Makefile" ;;
"caution/Makefile") CONFIG_FILES="$CONFIG_FILES caution/Makefile" ;;
"csharp/Makefile") CONFIG_FILES="$CONFIG_FILES csharp/Makefile" ;;
diff --git a/debian/patches/series b/debian/patches/series
index 4ae5648..83b2153 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-0001-Disable-fuser-tests-if-dev-fuse-doesn-t-exist.patch
+0001-Disable-fuse-tests-if-dev-fuse-doesn-t-exist.patch
0002-Mount-run-as-tmpfs-inside-appliance-workaround-for-f.patch
0003-update-gnulib-code-and-test-readlink.patch
0004-disable-apparently-broken-getlogin_r-test-from-gnuli.patch
--
Libguestfs Debian packaging
More information about the Pkg-libvirt-commits
mailing list