[Pkg-libvirt-commits] [SCM] VirtManager Debian packaging branch, experimental, updated. debian/0.8.5-1-5-g1f554ec
Laurent Léonard
laurent at open-minds.org
Tue Dec 7 12:35:47 UTC 2010
The following commit has been merged in the experimental branch:
commit 3c3b8398fc26abe3dad608fec3d7b6eb9eaf7647
Author: Laurent Léonard <laurent at open-minds.org>
Date: Tue Dec 7 13:24:03 2010 +0100
New patch 0005-Use-IPy-from-python-ipy.patch
Closes: #605967
diff --git a/debian/patches/0003-l10n-Updates-to-French-fr-translation.patch b/debian/patches/0003-l10n-Updates-to-French-fr-translation.patch
index 5a35de0..2e073bc 100644
--- a/debian/patches/0003-l10n-Updates-to-French-fr-translation.patch
+++ b/debian/patches/0003-l10n-Updates-to-French-fr-translation.patch
@@ -1,6 +1,6 @@
From: trash <trash at fedoraproject.org>
Date: Sun, 5 Sep 2010 19:02:37 +0000
-Subject: [PATCH] [PATCH] l10n: Updates to French (fr) translation
+Subject: [PATCH] l10n: Updates to French (fr) translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/debian/patches/0004-Add-AM_MAINTAINER_MODE-and-drop-m4-include.patch b/debian/patches/0004-Add-AM_MAINTAINER_MODE-and-drop-m4-include.patch
index 76b2e83..e0f50d9 100644
--- a/debian/patches/0004-Add-AM_MAINTAINER_MODE-and-drop-m4-include.patch
+++ b/debian/patches/0004-Add-AM_MAINTAINER_MODE-and-drop-m4-include.patch
@@ -5,8 +5,8 @@ Subject: [PATCH] Add AM_MAINTAINER_MODE and drop m4/ include
---
Makefile.am | 2 -
Makefile.in | 12 +-
- aclocal.m4 | 449 +++--
- configure | 3567 +++++++++++++++--------------
+ aclocal.m4 | 449 +++-
+ configure | 3781 +++++++++++++++--------------
configure.ac | 1 +
man/Makefile.in | 11 +-
pixmaps/Makefile.in | 11 +-
@@ -22,7 +22,7 @@ Subject: [PATCH] Add AM_MAINTAINER_MODE and drop m4/ include
src/Makefile.in | 11 +-
src/virtManager/Makefile.in | 11 +-
tests/Makefile.in | 11 +-
- 19 files changed, 2231 insertions(+), 1954 deletions(-)
+ 19 files changed, 2338 insertions(+), 2061 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index f42ae5f..8be964e 100644
@@ -2057,7 +2057,7 @@ index 1c08c7e..a5d6fac 100755
--disable-nls do not use Native Language Support
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
-@@ -1399,12 +1356,14 @@ Some influential environment variables:
+@@ -1399,90 +1356,325 @@ Some influential environment variables:
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
@@ -2069,25 +2069,80 @@ index 1c08c7e..a5d6fac 100755
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
+-_ACEOF
+-ac_status=$?
+Report bugs to the package provider.
- _ACEOF
- ac_status=$?
- fi
-@@ -1468,21 +1427,254 @@ test -n "$ac_init_help" && exit $ac_status
- if $ac_init_version; then
- cat <<\_ACEOF
- virt-manager configure 0.8.5
--generated by GNU Autoconf 2.63
++_ACEOF
++ac_status=$?
++fi
++
++if test "$ac_init_help" = "recursive"; then
++ # If there are subdirs, report their specific --help.
++ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
++ test -d "$ac_dir" ||
++ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
++ continue
++ ac_builddir=.
++
++case "$ac_dir" in
++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
++*)
++ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
++ # A ".." for each directory in $ac_dir_suffix.
++ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
++ case $ac_top_builddir_sub in
++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
++ esac ;;
++esac
++ac_abs_top_builddir=$ac_pwd
++ac_abs_builddir=$ac_pwd$ac_dir_suffix
++# for backward compatibility:
++ac_top_builddir=$ac_top_build_prefix
++
++case $srcdir in
++ .) # We are building in place.
++ ac_srcdir=.
++ ac_top_srcdir=$ac_top_builddir_sub
++ ac_abs_top_srcdir=$ac_pwd ;;
++ [\\/]* | ?:[\\/]* ) # Absolute name.
++ ac_srcdir=$srcdir$ac_dir_suffix;
++ ac_top_srcdir=$srcdir
++ ac_abs_top_srcdir=$srcdir ;;
++ *) # Relative name.
++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
++ ac_top_srcdir=$ac_top_build_prefix$srcdir
++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
++esac
++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
++
++ cd "$ac_dir" || { ac_status=$?; continue; }
++ # Check for guested configure.
++ if test -f "$ac_srcdir/configure.gnu"; then
++ echo &&
++ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
++ elif test -f "$ac_srcdir/configure"; then
++ echo &&
++ $SHELL "$ac_srcdir/configure" --help=recursive
++ else
++ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
++ fi || ac_status=$?
++ cd "$ac_pwd" || { ac_status=$?; break; }
++ done
++fi
++
++test -n "$ac_init_help" && exit $ac_status
++if $ac_init_version; then
++ cat <<\_ACEOF
++virt-manager configure 0.8.5
+generated by GNU Autoconf 2.67
-
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++
+Copyright (C) 2010 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
- exit
- fi
++This configure script is free software; the Free Software Foundation
++gives unlimited permission to copy, distribute and modify it.
++_ACEOF
++ exit
++fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
@@ -2275,12 +2330,29 @@ index 1c08c7e..a5d6fac 100755
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
-+fi
+ fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
-+
+
+-if test "$ac_init_help" = "recursive"; then
+- # If there are subdirs, report their specific --help.
+- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+- test -d "$ac_dir" ||
+- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+- continue
+- ac_builddir=.
+} # ac_fn_c_try_cpp
-+
+
+-case "$ac_dir" in
+-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+-*)
+- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+- # A ".." for each directory in $ac_dir_suffix.
+- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+- case $ac_top_builddir_sub in
+- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+- esac ;;
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
@@ -2292,7 +2364,25 @@ index 1c08c7e..a5d6fac 100755
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
-+esac
+ esac
+-ac_abs_top_builddir=$ac_pwd
+-ac_abs_builddir=$ac_pwd$ac_dir_suffix
+-# for backward compatibility:
+-ac_top_builddir=$ac_top_build_prefix
+-
+-case $srcdir in
+- .) # We are building in place.
+- ac_srcdir=.
+- ac_top_srcdir=$ac_top_builddir_sub
+- ac_abs_top_srcdir=$ac_pwd ;;
+- [\\/]* | ?:[\\/]* ) # Absolute name.
+- ac_srcdir=$srcdir$ac_dir_suffix;
+- ac_top_srcdir=$srcdir
+- ac_abs_top_srcdir=$srcdir ;;
+- *) # Relative name.
+- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+- ac_top_srcdir=$ac_top_build_prefix$srcdir
+- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
@@ -2302,7 +2392,8 @@ index 1c08c7e..a5d6fac 100755
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
-+esac
+ esac
+-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
@@ -2314,13 +2405,39 @@ index 1c08c7e..a5d6fac 100755
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-+
+
+- cd "$ac_dir" || { ac_status=$?; continue; }
+- # Check for guested configure.
+- if test -f "$ac_srcdir/configure.gnu"; then
+- echo &&
+- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+- elif test -f "$ac_srcdir/configure"; then
+- echo &&
+- $SHELL "$ac_srcdir/configure" --help=recursive
+- else
+- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+- fi || ac_status=$?
+- cd "$ac_pwd" || { ac_status=$?; break; }
+- done
+ ac_retval=$ac_status
-+fi
+ fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
-+
+
+-test -n "$ac_init_help" && exit $ac_status
+-if $ac_init_version; then
+- cat <<\_ACEOF
+-virt-manager configure 0.8.5
+-generated by GNU Autoconf 2.63
+-
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+-This configure script is free software; the Free Software Foundation
+-gives unlimited permission to copy, distribute and modify it.
+-_ACEOF
+- exit
+-fi
+} # ac_fn_c_try_run
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
@@ -4838,7 +4955,7 @@ index 1c08c7e..a5d6fac 100755
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -4647,9 +4544,9 @@ else
+@@ -4647,99 +4544,412 @@ else
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
*GNU* | *'with BFD'*)
@@ -4850,71 +4967,74 @@ index 1c08c7e..a5d6fac 100755
esac
fi
done
-@@ -4661,18 +4558,16 @@ fi
-
- LD="$acl_cv_path_LD"
- if test -n "$LD"; then
-- { $as_echo "$as_me:$LINENO: result: $LD" >&5
+- IFS="$ac_save_ifs"
++ IFS="$ac_save_ifs"
++else
++ acl_cv_path_LD="$LD" # Let the user override the test with a path.
++fi
++fi
++
++LD="$acl_cv_path_LD"
++if test -n "$LD"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
- $as_echo "$LD" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "$LD" >&6; }
++else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
--test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
--$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-- { (exit 1); exit 1; }; }
--{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++$as_echo "no" >&6; }
++fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
- $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
--if test "${acl_cv_prog_gnu_ld+set}" = set; then
++$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if test "${acl_cv_prog_gnu_ld+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-@@ -4683,16 +4578,16 @@ case `$LD -v 2>&1 </dev/null` in
- acl_cv_prog_gnu_ld=no ;;
- esac
- fi
--{ $as_echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
++ $as_echo_n "(cached) " >&6
++else
++ # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++case `$LD -v 2>&1 </dev/null` in
++*GNU* | *'with BFD'*)
++ acl_cv_prog_gnu_ld=yes ;;
++*)
++ acl_cv_prog_gnu_ld=no ;;
++esac
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
- $as_echo "$acl_cv_prog_gnu_ld" >&6; }
- with_gnu_ld=$acl_cv_prog_gnu_ld
-
-
-
-
-- { $as_echo "$as_me:$LINENO: checking for shared library run path origin" >&5
++$as_echo "$acl_cv_prog_gnu_ld" >&6; }
++with_gnu_ld=$acl_cv_prog_gnu_ld
++
++
++
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
- $as_echo_n "checking for shared library run path origin... " >&6; }
--if test "${acl_cv_rpath+set}" = set; then
++$as_echo_n "checking for shared library run path origin... " >&6; }
+if test "${acl_cv_rpath+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-
-@@ -4703,7 +4598,7 @@ else
- acl_cv_rpath=done
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
++ $as_echo_n "(cached) " >&6
++else
++
++ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
++ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
++ . ./conftest.sh
++ rm -f ./conftest.sh
++ acl_cv_rpath=done
++
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
- $as_echo "$acl_cv_rpath" >&6; }
- wl="$acl_cv_wl"
- acl_libext="$acl_cv_libext"
-@@ -4715,31 +4610,346 @@ $as_echo "$acl_cv_rpath" >&6; }
- acl_hardcode_direct="$acl_cv_hardcode_direct"
- acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
- # Check whether --enable-rpath was given.
--if test "${enable_rpath+set}" = set; then
++$as_echo "$acl_cv_rpath" >&6; }
++ wl="$acl_cv_wl"
++ acl_libext="$acl_cv_libext"
++ acl_shlibext="$acl_cv_shlibext"
++ acl_libname_spec="$acl_cv_libname_spec"
++ acl_library_names_spec="$acl_cv_library_names_spec"
++ acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
++ acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
++ acl_hardcode_direct="$acl_cv_hardcode_direct"
++ acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
++ # Check whether --enable-rpath was given.
+if test "${enable_rpath+set}" = set; then :
- enableval=$enable_rpath; :
- else
- enable_rpath=yes
- fi
-
-
++ enableval=$enable_rpath; :
++else
++ enable_rpath=yes
++fi
++
++
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4952,21 +5072,7 @@ index 1c08c7e..a5d6fac 100755
+ Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
-
-- acl_libdirstem=lib
-- searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
-- if test -n "$searchpath"; then
-- acl_save_IFS="${IFS= }"; IFS=":"
-- for searchdir in $searchpath; do
-- if test -d "$searchdir"; then
-- case "$searchdir" in
-- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
-- *) searchdir=`cd "$searchdir" && pwd`
-- case "$searchdir" in
-- */lib64 ) acl_libdirstem=lib64 ;;
-- esac ;;
-- esac
-- fi
++
+else
+ # Broken: fails on valid input.
+continue
@@ -5113,19 +5219,33 @@ index 1c08c7e..a5d6fac 100755
+esac
+
+ $ac_path_GREP_found && break 3
- done
-- IFS="$acl_save_IFS"
++ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_GREP"; then
+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
-+else
++ fi
+ else
+- acl_cv_path_LD="$LD" # Let the user override the test with a path.
+-fi
+ ac_cv_path_GREP=$GREP
-+fi
-+
-+fi
+ fi
+
+-LD="$acl_cv_path_LD"
+-if test -n "$LD"; then
+- { $as_echo "$as_me:$LINENO: result: $LD" >&5
+-$as_echo "$LD" >&6; }
+-else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+ fi
+-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+- { (exit 1); exit 1; }; }
+-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+-if test "${acl_cv_prog_gnu_ld+set}" = set; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
@@ -5134,8 +5254,12 @@ index 1c08c7e..a5d6fac 100755
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
+ $as_echo_n "(cached) " >&6
+ else
+- # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+-case `$LD -v 2>&1 </dev/null` in
+-*GNU* | *'with BFD'*)
+- acl_cv_prog_gnu_ld=yes ;;
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+ then ac_cv_path_EGREP="$GREP -E"
+ else
@@ -5156,7 +5280,8 @@ index 1c08c7e..a5d6fac 100755
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-+*)
+ *)
+- acl_cv_prog_gnu_ld=no ;;
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
@@ -5177,7 +5302,7 @@ index 1c08c7e..a5d6fac 100755
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
+ esac
+
+ $ac_path_EGREP_found && break 3
+ done
@@ -5189,17 +5314,23 @@ index 1c08c7e..a5d6fac 100755
+ fi
+else
+ ac_cv_path_EGREP=$EGREP
-+fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
+-$as_echo "$acl_cv_prog_gnu_ld" >&6; }
+-with_gnu_ld=$acl_cv_prog_gnu_ld
+
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
-+
-+
-+
-+
+
+
+
+
+- { $as_echo "$as_me:$LINENO: checking for shared library run path origin" >&5
+-$as_echo_n "checking for shared library run path origin... " >&6; }
+-if test "${acl_cv_rpath+set}" = set; then
+ acl_libdirstem=lib
+ acl_libdirstem2=
+ case "$host_os" in
@@ -5207,25 +5338,59 @@ index 1c08c7e..a5d6fac 100755
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
+$as_echo_n "checking for 64-bit host... " >&6; }
+if test "${gl_cv_solaris_64bit+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+
+
+- CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+- ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+- . ./conftest.sh
+- rm -f ./conftest.sh
+- acl_cv_rpath=done
+#ifdef _LP64
+sixtyfour bits
+#endif
-+
+
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
+-$as_echo "$acl_cv_rpath" >&6; }
+- wl="$acl_cv_wl"
+- acl_libext="$acl_cv_libext"
+- acl_shlibext="$acl_cv_shlibext"
+- acl_libname_spec="$acl_cv_libname_spec"
+- acl_library_names_spec="$acl_cv_library_names_spec"
+- acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+- acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+- acl_hardcode_direct="$acl_cv_hardcode_direct"
+- acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+- # Check whether --enable-rpath was given.
+-if test "${enable_rpath+set}" = set; then
+- enableval=$enable_rpath; :
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "sixtyfour bits" >/dev/null 2>&1; then :
+ gl_cv_solaris_64bit=yes
-+else
+ else
+- enable_rpath=yes
+ gl_cv_solaris_64bit=no
-+fi
+ fi
+rm -f conftest*
-+
-+
+
+
+-
+- acl_libdirstem=lib
+- searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+- if test -n "$searchpath"; then
+- acl_save_IFS="${IFS= }"; IFS=":"
+- for searchdir in $searchpath; do
+- if test -d "$searchdir"; then
+- case "$searchdir" in
+- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+- *) searchdir=`cd "$searchdir" && pwd`
+- case "$searchdir" in
+- */lib64 ) acl_libdirstem=lib64 ;;
+- esac ;;
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
+$as_echo "$gl_cv_solaris_64bit" >&6; }
@@ -5234,8 +5399,11 @@ index 1c08c7e..a5d6fac 100755
+ case "$host_cpu" in
+ sparc*) acl_libdirstem2=lib/sparcv9 ;;
+ i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
-+ esac
-+ fi
+ esac
+ fi
+- done
+- IFS="$acl_save_IFS"
+- fi
+ ;;
+ *)
+ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
@@ -5916,10 +6084,19 @@ index 1c08c7e..a5d6fac 100755
/* end confdefs.h. */
#include <libintl.h>
$gt_revision_test_code
-@@ -6204,45 +6292,16 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a
- return 0;
- }
- _ACEOF
+@@ -6195,54 +6283,25 @@ extern
+ "C"
+ #endif
+ const char *_nl_expand_alias (const char *);
+-int
+-main ()
+-{
+-bindtextdomain ("", "");
+-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -5941,6 +6118,15 @@ index 1c08c7e..a5d6fac 100755
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
++int
++main ()
++{
++bindtextdomain ("", "");
++return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
++ ;
++ return 0;
++}
++_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
eval "$gt_func_gnugettext_libintl=yes"
else
diff --git a/debian/patches/0005-Use-IPy-from-python-ipy.patch b/debian/patches/0005-Use-IPy-from-python-ipy.patch
new file mode 100644
index 0000000..8af6109
--- /dev/null
+++ b/debian/patches/0005-Use-IPy-from-python-ipy.patch
@@ -0,0 +1,38 @@
+From: =?UTF-8?q?Laurent=20L=C3=A9onard?= <laurent at open-minds.org>
+Date: Tue, 7 Dec 2010 13:22:14 +0100
+Subject: [PATCH] Use IPy from python-ipy
+
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/605967
+---
+ src/virtManager/createnet.py | 2 +-
+ src/virtManager/network.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/virtManager/createnet.py b/src/virtManager/createnet.py
+index 4982fdb..cce5ee3 100644
+--- a/src/virtManager/createnet.py
++++ b/src/virtManager/createnet.py
+@@ -27,7 +27,7 @@ import re
+ import traceback
+
+ import virtManager.util as util
+-from virtManager.IPy import IP
++from IPy import IP
+ from virtManager.network import vmmNetwork
+ from virtManager.error import vmmErrorDialog
+
+diff --git a/src/virtManager/network.py b/src/virtManager/network.py
+index 3c9db4e..cb33309 100644
+--- a/src/virtManager/network.py
++++ b/src/virtManager/network.py
+@@ -21,7 +21,7 @@
+ import gobject
+ import virtinst.util as util
+
+-from virtManager.IPy import IP
++from IPy import IP
+
+ class vmmNetwork(gobject.GObject):
+ __gsignals__ = { }
+--
diff --git a/debian/patches/series b/debian/patches/series
index dafcdcb..ee25a99 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
0002-l10n-Updates-to-French-fr-translation.patch
0003-l10n-Updates-to-French-fr-translation.patch
0004-Add-AM_MAINTAINER_MODE-and-drop-m4-include.patch
+0005-Use-IPy-from-python-ipy.patch
--
VirtManager Debian packaging
More information about the Pkg-libvirt-commits
mailing list