[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/1.0.2-1

Guido Günther agx at sigxcpu.org
Wed Jan 30 20:44:10 UTC 2013


The following commit has been merged in the master branch:
commit 1156772eeb7c40dd657be66fd4a3cc645fc810ca
Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed Jan 30 21:05:31 2013 +0100

    Drop Don-t-fail-the-build-without-libcurl-and-esx.patch
    
    applied upstream

diff --git a/debian/patches/Don-t-fail-the-build-without-libcurl-and-esx.patch b/debian/patches/Don-t-fail-the-build-without-libcurl-and-esx.patch
deleted file mode 100644
index 8b826eb..0000000
--- a/debian/patches/Don-t-fail-the-build-without-libcurl-and-esx.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Fri, 25 Jan 2013 21:58:48 +0100
-Subject: Don't fail the build without libcurl and esx
-
----
- configure    |    2 +-
- configure.ac |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index 2aeece1..cc1f7c9 100755
---- a/configure
-+++ b/configure
-@@ -64746,7 +64746,7 @@ fi
- 
- 
- if test "$with_curl" != "yes" ; then
--  if test "$with_esx" = "check"; then
-+  if test "$with_esx" != "yes"; then
-     with_esx=no
-   else
-     as_fn_error $? "Curl is required for the ESX driver" "$LINENO" 5
-diff --git a/configure.ac b/configure.ac
-index 89db83e..e3a749a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1810,7 +1810,7 @@ dnl check for (ESX)
- dnl
- 
- if test "$with_curl" != "yes" ; then
--  if test "$with_esx" = "check"; then
-+  if test "$with_esx" != "yes"; then
-     with_esx=no
-   else
-     AC_MSG_ERROR([Curl is required for the ESX driver])
diff --git a/debian/patches/series b/debian/patches/series
index 0bfe25b..6148614 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,4 +10,3 @@ Don-t-fail-if-we-can-t-setup-avahi.patch
 Reduce-udevadm-settle-timeout-to-10-seconds.patch
 debian/Debianize-systemd-service-files.patch
 Allow-xen-toolstack-to-find-it-s-binaries.patch
-Don-t-fail-the-build-without-libcurl-and-esx.patch

-- 
Libvirt Debian packaging



More information about the Pkg-libvirt-commits mailing list