[Pkg-ocaml-maint-commits] [ocurl] 07/07: Refresh patches

[Mehdi Dogguy]

This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository ocurl.

commit bbd89f1a31330cc8955ffcc86ffefdb295d60a2c
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Fri Aug 11 15:07:53 2017 -0400

    Refresh patches
---
 debian/patches/0002-Disable-Internet-using-tests.patch      |  8 +++-----
 .../patches/0003-CURLE_URL_MALFORMAT_USER-is-obsolete.patch |  4 +---
 ...03-Fix-installation-on-bytecode-only-architectures.patch | 13 +++++++------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/debian/patches/0002-Disable-Internet-using-tests.patch b/debian/patches/0002-Disable-Internet-using-tests.patch
index 3edd80d..e04acbd 100644
--- a/debian/patches/0002-Disable-Internet-using-tests.patch
+++ b/debian/patches/0002-Disable-Internet-using-tests.patch
@@ -7,21 +7,19 @@ Signed-off-by: Stephane Glondu <steph at glondu.net>
  Makefile.in | 2 --
  1 file changed, 2 deletions(-)
 
-diff --git a/Makefile.in b/Makefile.in
-index 3f93a2f..0b7ee58 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -54,13 +54,11 @@ all:
+@@ -63,13 +63,11 @@
  build: all
  
  test: examples
 -	examples/test_cb_exn
  	examples/test_memory_leaks
- ifneq (@OCAML_PKG_lwt@,no)
+ ifneq (@OCAML_PKG_lwt_unix@,no)
  	examples/test_lwt_unit
  endif
  ifeq (@OCAMLBEST@,opt)
 -	examples/test_cb_exn.opt
  	examples/test_memory_leaks.opt
- ifneq (@OCAML_PKG_lwt@,no)
+ ifneq (@OCAML_PKG_lwt_unix@,no)
  	examples/test_lwt_unit.opt
diff --git a/debian/patches/0003-CURLE_URL_MALFORMAT_USER-is-obsolete.patch b/debian/patches/0003-CURLE_URL_MALFORMAT_USER-is-obsolete.patch
index 24588d0..aaf3ec6 100644
--- a/debian/patches/0003-CURLE_URL_MALFORMAT_USER-is-obsolete.patch
+++ b/debian/patches/0003-CURLE_URL_MALFORMAT_USER-is-obsolete.patch
@@ -7,11 +7,9 @@ Signed-off-by: Stephane Glondu <steph at glondu.net>
  curl-helper.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/curl-helper.c b/curl-helper.c
-index e515b4d..5a0675d 100644
 --- a/curl-helper.c
 +++ b/curl-helper.c
-@@ -218,7 +218,7 @@ CURLErrorMapping errorMap[] =
+@@ -208,7 +208,7 @@
  #else
      {"CURLE_URL_MALFORMAT", -1},
  #endif
diff --git a/debian/patches/0003-Fix-installation-on-bytecode-only-architectures.patch b/debian/patches/0003-Fix-installation-on-bytecode-only-architectures.patch
index 85691bb..119f8bc 100644
--- a/debian/patches/0003-Fix-installation-on-bytecode-only-architectures.patch
+++ b/debian/patches/0003-Fix-installation-on-bytecode-only-architectures.patch
@@ -7,19 +7,20 @@ Signed-off-by: Stephane Glondu <steph at glondu.net>
  Makefile.in | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/Makefile.in b/Makefile.in
-index 0b7ee58..bdcc545 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -42,9 +42,9 @@ TARGETS += curl_lwt.cmx
+@@ -45,12 +45,12 @@
  endif
  endif
  
 -INSTALL_TARGETS = curl$(EXT_LIB) curl.cmi curl.mli $(TARGETS)
 +INSTALL_TARGETS = $(wildcard curl$(EXT_LIB)) curl.cmi curl.mli $(TARGETS)
- ifneq (@OCAML_PKG_lwt@,no)
+ ifeq (@OCAML_HAS_BIN_ANNOT@,yes)
+ INSTALL_TARGETS += curl.cmt curl.cmti
+ endif
+ ifneq (@OCAML_PKG_lwt_unix@,no)
 -INSTALL_TARGETS += curl_lwt.cmi curl_lwt.mli curl_lwt$(EXT_OBJ)
 +INSTALL_TARGETS += curl_lwt.cmi curl_lwt.mli $(wildcard curl_lwt$(EXT_OBJ))
+ ifeq (@OCAML_HAS_BIN_ANNOT@,yes)
+ INSTALL_TARGETS += curl_lwt.cmt curl_lwt.cmti
  endif
- 
- all:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocurl.git