[Pkg-ocaml-maint-commits] [SCM] ocurl packaging branch, master, updated. debian/0.5.3-1-6-g9ec4a56

Stephane Glondu steph at glondu.net
Mon Apr 18 16:52:15 UTC 2011


The following commit has been merged in the master branch:
commit ac49d9ca53f4365bc55f15765c63fed7d298322c
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Apr 18 18:43:10 2011 +0200

    Ignore CURLE_URL_MALFORMAT_USER (fixes FTBFS)

diff --git a/debian/patches/0003-CURLE_URL_MALFORMAT_USER-is-obsolete.patch b/debian/patches/0003-CURLE_URL_MALFORMAT_USER-is-obsolete.patch
new file mode 100644
index 0000000..1751fed
--- /dev/null
+++ b/debian/patches/0003-CURLE_URL_MALFORMAT_USER-is-obsolete.patch
@@ -0,0 +1,23 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Mon, 18 Apr 2011 18:41:40 +0200
+Subject: CURLE_URL_MALFORMAT_USER is obsolete
+
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ curl-helper.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/curl-helper.c b/curl-helper.c
+index ce99890..0fe7483 100644
+--- a/curl-helper.c
++++ b/curl-helper.c
+@@ -172,7 +172,7 @@ CURLErrorMapping errorMap[] =
+ #else
+     {"CURLE_URL_MALFORMAT", -1},
+ #endif
+-#if HAVE_DECL_CURLE_URL_MALFORMAT_USER
++#if 0
+     {"CURLE_URL_MALFORMAT_USER", CURLE_URL_MALFORMAT_USER},
+ #else
+     {"CURLE_URL_MALFORMAT_USER", -1},
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 714a6f4..52a4e60 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-fixes-makefile-to-use-ocamlfind-and-support-both-byt.patch
 0002-fix-compilation-flags.patch
+0003-CURLE_URL_MALFORMAT_USER-is-obsolete.patch

-- 
ocurl packaging



More information about the Pkg-ocaml-maint-commits mailing list