[Pkg-ocaml-maint-commits] [ocaml-batteries] 04/05: 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 ocaml-batteries.

commit 49b2a10c64e59e6d435f090df5915cae6f2e5afe
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Dec 23 00:22:48 2015 +0100

    Refresh patches
---
 debian/changelog                                   |  4 ++++
 .../0001-Do-not-enforce-sanity-check-rules.patch   |  6 ++---
 .../patches/0002-Disable-qtest-based-tests.patch   | 26 +++++++++-------------
 ...able-test-compat-broken-with-OCaml-4.01.0.patch | 22 ------------------
 debian/patches/series                              |  1 -
 5 files changed, 17 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2e0b156..2c6dcf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 ocaml-batteries (2.4-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refresh patches
+    - Remove 0002-Disable-qtest-based-tests.patch, fixed upstream.
+    - Remove 0003-Disable-test-compat-broken-with-OCaml-4.01.0.patch, no longer
+      relevant.
 
  -- Mehdi Dogguy <mehdi at debian.org>  Wed, 23 Dec 2015 00:04:53 +0100
 
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 2b2182d..d53fab6 100644
--- a/debian/patches/0001-Do-not-enforce-sanity-check-rules.patch
+++ b/debian/patches/0001-Do-not-enforce-sanity-check-rules.patch
@@ -7,13 +7,13 @@ Subject: Do not enforce sanity-check rules
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 8e93a30..e793723 100644
+index e15d09c..fa51b38 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -102,7 +102,7 @@ batteries.odocl: src/batteries.mllib src/batteriesThread.mllib
+@@ -82,7 +82,7 @@ batteries.odocl: src/batteries.mllib src/batteriesThread.mllib
  	cat $^ > $@
  
- doc: prefilter batteries.odocl
+ doc: batteries.odocl
 -	$(OCAMLBUILD) $(OCAMLBUILDFLAGS) batteries.docdir/index.html
 +	$(OCAMLBUILD) -no-hygiene $(OCAMLBUILDFLAGS) batteries.docdir/index.html
  
diff --git a/debian/patches/0002-Disable-qtest-based-tests.patch b/debian/patches/0002-Disable-qtest-based-tests.patch
index 5556525..284d4b5 100644
--- a/debian/patches/0002-Disable-qtest-based-tests.patch
+++ b/debian/patches/0002-Disable-qtest-based-tests.patch
@@ -3,28 +3,22 @@ Date: Sat, 6 Jul 2013 14:26:16 +0200
 Subject: Disable qtest-based tests
 
 ---
- Makefile | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index e793723..85f9780 100644
+index fa51b38..4126d5a 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -203,15 +203,13 @@ qtest: prefilter qtest-clean
- ### run all unit tests
- ##############################################
- 
--test-byte: prefilter _build/testsuite/main.byte _build/$(QTESTDIR)/all_tests.byte
-+test-byte: prefilter _build/testsuite/main.byte
- 	@_build/testsuite/main.byte
- 	@echo "" # newline after "OK"
--	@_build/$(QTESTDIR)/all_tests.byte
- 
--test-native: prefilter _build/testsuite/main.native _build/$(QTESTDIR)/all_tests.native
-+test-native: prefilter _build/testsuite/main.native
+@@ -196,9 +196,9 @@ testsuite-only-native: _build/testsuite/main.native
  	@_build/testsuite/main.native
  	@echo "" # newline after "OK"
--	@_build/$(QTESTDIR)/all_tests.native
+ 
+-test-byte: qtest-byte testsuite-only-byte
++test-byte: testsuite-only-byte
+ 
+-test-native: qtest-native testsuite-only-native
++test-native: testsuite-only-native
  
  full-test: $(TEST_TARGET)
  
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
deleted file mode 100644
index 1447dd3..0000000
--- a/debian/patches/0003-Disable-test-compat-broken-with-OCaml-4.01.0.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Sat, 16 Nov 2013 11:53:32 +0100
-Subject: Disable test-compat (broken with OCaml 4.01.0)
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 85f9780..5de14ad 100644
---- a/Makefile
-+++ b/Makefile
-@@ -216,7 +216,7 @@ full-test: $(TEST_TARGET)
- test-compat: prefilter src/batteries_compattest.ml
- 	$(OCAMLBUILD) $(OCAMLBUILDFLAGS) src/batteries_compattest.byte
- 
--test: test-byte test-compat
-+test: test-byte
- 
- ###############################################################################
- #	BENCHMARK SUITE
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 5d51878..b1d97c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-Do-not-enforce-sanity-check-rules.patch
 0002-Disable-qtest-based-tests.patch
-0003-Disable-test-compat-broken-with-OCaml-4.01.0.patch

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