[Pkg-ocaml-maint-commits] [ocaml-batteries] 04/04: Refresh patches

[Stéphane Glondu]

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

glondu pushed a commit to branch master
in repository ocaml-batteries.

commit 1565992f39a6aa3c2b92adbcc635a12eba9fec7b
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Jun 17 10:58:54 2015 +0200

    Refresh patches
---
 debian/patches/0001-Do-not-enforce-sanity-check-rules.patch       | 8 ++++----
 debian/patches/0002-Disable-qtest-based-tests.patch               | 4 ++--
 .../0003-Disable-test-compat-broken-with-OCaml-4.01.0.patch       | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/patches/0001-Do-not-enforce-sanity-check-rules.patch b/debian/patches/0001-Do-not-enforce-sanity-check-rules.patch
index 23f88c1..2b2182d 100644
--- a/debian/patches/0001-Do-not-enforce-sanity-check-rules.patch
+++ b/debian/patches/0001-Do-not-enforce-sanity-check-rules.patch
@@ -7,15 +7,15 @@ Subject: Do not enforce sanity-check rules
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 9d37afc..e88d9f9 100644
+index 8e93a30..e793723 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -86,7 +86,7 @@ batteries.odocl: src/batteries.mllib src/batteriesThread.mllib
+@@ -102,7 +102,7 @@ batteries.odocl: src/batteries.mllib src/batteriesThread.mllib
  	cat $^ > $@
  
  doc: prefilter batteries.odocl
--	$(OCAMLBUILD) batteries.docdir/index.html
-+	$(OCAMLBUILD) -no-hygiene batteries.docdir/index.html
+-	$(OCAMLBUILD) $(OCAMLBUILDFLAGS) batteries.docdir/index.html
++	$(OCAMLBUILD) -no-hygiene $(OCAMLBUILDFLAGS) batteries.docdir/index.html
  
  man: all batteries.odocl
  	-mkdir man
diff --git a/debian/patches/0002-Disable-qtest-based-tests.patch b/debian/patches/0002-Disable-qtest-based-tests.patch
index cae5e8f..5556525 100644
--- a/debian/patches/0002-Disable-qtest-based-tests.patch
+++ b/debian/patches/0002-Disable-qtest-based-tests.patch
@@ -7,10 +7,10 @@ Subject: Disable qtest-based tests
  1 file changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index e88d9f9..3f7fbff 100644
+index e793723..85f9780 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -180,15 +180,13 @@ qtest: prefilter qtest-clean
+@@ -203,15 +203,13 @@ qtest: prefilter qtest-clean
  ### run all unit tests
  ##############################################
  
diff --git a/debian/patches/0003-Disable-test-compat-broken-with-OCaml-4.01.0.patch b/debian/patches/0003-Disable-test-compat-broken-with-OCaml-4.01.0.patch
index 67d4237..1447dd3 100644
--- a/debian/patches/0003-Disable-test-compat-broken-with-OCaml-4.01.0.patch
+++ b/debian/patches/0003-Disable-test-compat-broken-with-OCaml-4.01.0.patch
@@ -7,12 +7,12 @@ Subject: Disable test-compat (broken with OCaml 4.01.0)
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 3f7fbff..d874bf8 100644
+index 85f9780..5de14ad 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -193,7 +193,7 @@ full-test: $(TEST_TARGET)
+@@ -216,7 +216,7 @@ full-test: $(TEST_TARGET)
  test-compat: prefilter src/batteries_compattest.ml
- 	ocamlbuild src/batteries_compattest.byte -no-links
+ 	$(OCAMLBUILD) $(OCAMLBUILDFLAGS) src/batteries_compattest.byte
  
 -test: test-byte test-compat
 +test: test-byte

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