[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 e91a68ed1728c935855a0dfc43dbf0e149d6ac7b
Author: Hilko Bengen <bengen at debian.org>
Date: Sat Jul 30 12:03:47 2011 +0200
removed warning message introduced with Python build changes
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 6cf263b..b1094a7 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
@@ -3,18 +3,16 @@ Date: Wed, 6 Jul 2011 09:30:04 +0200
Subject: configure.ac: use Python mechanism to determine PYTHON_INSTALLDIR
---
- configure.ac | 19 +++----------------
- 1 files changed, 3 insertions(+), 16 deletions(-)
+ configure.ac | 18 ++----------------
+ 1 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 544b434..6fd12ab 100644
+index 544b434..2a755c3 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -562,23 +562,10 @@ AS_IF([test "x$enable_python" != "xno"],
- AC_MSG_NOTICE([Python install dir $PYTHON_INSTALLDIR])],
+@@ -563,22 +563,8 @@ AS_IF([test "x$enable_python" != "xno"],
[PYTHON_INSTALLDIR=check])
-+ AC_MSG_WARN([XXX PYTHON_INSTALLDIR=$PYTHON_INSTALLDIR])
if test "x$PYTHON_INSTALLDIR" = "xcheck"; then
- PYTHON_INSTALLDIR=
- for d in \
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 6da93bd..f7f39ad 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 6fd12ab..5452f6d 100644
+index 2a755c3..369fa21 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -812,7 +812,6 @@ AC_CONFIG_FILES([Makefile
+@@ -811,7 +811,6 @@ AC_CONFIG_FILES([Makefile
cat/Makefile
caution/Makefile
csharp/Makefile
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 8bb4a1b..cbca116 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 5452f6d..a9ea1a7 100644
+index 369fa21..e6ef0c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -180,46 +180,47 @@ AC_ARG_ENABLE([appliance],
diff --git a/debian/patches/0009-regenerated-auto-related-files.patch b/debian/patches/0009-regenerated-auto-related-files.patch
index 7e2b4b3..3a75e1f 100644
--- a/debian/patches/0009-regenerated-auto-related-files.patch
+++ b/debian/patches/0009-regenerated-auto-related-files.patch
@@ -3,19 +3,19 @@ Date: Thu, 21 Jul 2011 09:06:44 +0200
Subject: regenerated auto*-related files
---
- Makefile.in | 51 ++++++++++++-------------
+ Makefile.in | 51 ++++++++++++--------------
aclocal.m4 | 14 ++++---
cat/Makefile.in | 2 +-
- configure | 104 +++++++++++++++++++++++++--------------------------
- daemon/configure | 10 +----
+ configure | 102 +++++++++++++++++++++++++---------------------------
+ daemon/configure | 10 +-----
df/Makefile.in | 2 +-
images/Makefile.in | 2 +-
- ocaml/Makefile.in | 19 ++++-----
- perl/Makefile.in | 7 ++-
+ ocaml/Makefile.in | 19 +++++-----
+ perl/Makefile.in | 7 +++-
python/Makefile.in | 3 +-
resize/Makefile.in | 2 +-
- tools/Makefile.in | 6 +-
- 12 files changed, 107 insertions(+), 115 deletions(-)
+ tools/Makefile.in | 6 ++--
+ 12 files changed, 105 insertions(+), 115 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 14441ea..f8c1120 100644
@@ -185,7 +185,7 @@ index 67fabff..5cc0364 100644
.SUFFIXES:
diff --git a/configure b/configure
-index d3f1684..1aafee1 100755
+index d3f1684..26bbe39 100755
--- a/configure
+++ b/configure
@@ -32526,8 +32526,7 @@ fi
@@ -434,12 +434,9 @@ index d3f1684..1aafee1 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$FUSE_PKG_ERRORS" >&5
-@@ -37137,26 +37151,11 @@ else
- fi
+@@ -37138,25 +37152,8 @@ fi
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: XXX PYTHON_INSTALLDIR=$PYTHON_INSTALLDIR" >&5
-+$as_echo "$as_me: WARNING: XXX PYTHON_INSTALLDIR=$PYTHON_INSTALLDIR" >&2;}
if test "x$PYTHON_INSTALLDIR" = "xcheck"; then
- PYTHON_INSTALLDIR=
- for d in \
@@ -465,7 +462,7 @@ index d3f1684..1aafee1 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 +37662,7 @@ ac_config_headers="$ac_config_headers config.h"
+@@ -37663,7 +37660,7 @@ ac_config_headers="$ac_config_headers config.h"
ac_config_files="$ac_config_files podwrapper.sh"
@@ -474,7 +471,7 @@ index d3f1684..1aafee1 100755
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -38813,7 +38812,6 @@ do
+@@ -38813,7 +38810,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" ;;
--
Libguestfs Debian packaging
More information about the Pkg-libvirt-commits
mailing list