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

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

commit b168963869c4e483872a25fa5ec9996b5f35a8cd
Author: Stephane Glondu <st...@glondu.net>
Date:   Fri Jan 31 10:03:41 2014 +0100

    Refresh patches
    
    Patch applied upstream:
     - Fix compilation with OCaml 4.01.0
    
    Patch no longer applicable:
     - Do not call git in clean rule
---
 .../0001-Do-not-enforce-sanity-check-rules.patch   |  4 ++--
 ....patch => 0002-Disable-qtest-based-tests.patch} |  4 ++--
 .../0002-Do-not-call-git-in-clean-rule.patch       | 21 ------------------
 ...ble-test-compat-broken-with-OCaml-4.01.0.patch} |  6 +++---
 .../0004-Fix-compilation-with-OCaml-4.01.0.patch   | 25 ----------------------
 debian/patches/series                              |  6 ++----
 6 files changed, 9 insertions(+), 57 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 4030962..23f88c1 100644
--- a/debian/patches/0001-Do-not-enforce-sanity-check-rules.patch
+++ b/debian/patches/0001-Do-not-enforce-sanity-check-rules.patch
@@ -7,10 +7,10 @@ Subject: Do not enforce sanity-check rules
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 7d0cd42..dd14ce4 100644
+index 9d37afc..e88d9f9 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -82,7 +82,7 @@ batteries.odocl: src/batteries.mllib 
src/batteriesThread.mllib
+@@ -86,7 +86,7 @@ batteries.odocl: src/batteries.mllib 
src/batteriesThread.mllib
        cat $^ > $@
  
  doc: prefilter batteries.odocl
diff --git a/debian/patches/0003-Disable-qtest-based-tests.patch 
b/debian/patches/0002-Disable-qtest-based-tests.patch
similarity index 91%
rename from debian/patches/0003-Disable-qtest-based-tests.patch
rename to debian/patches/0002-Disable-qtest-based-tests.patch
index 13faa33..cae5e8f 100644
--- a/debian/patches/0003-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 702578d..87d8f90 100644
+index e88d9f9..3f7fbff 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -176,15 +176,13 @@ qtest: prefilter qtest-clean
+@@ -180,15 +180,13 @@ qtest: prefilter qtest-clean
  ### run all unit tests
  ##############################################
  
diff --git a/debian/patches/0002-Do-not-call-git-in-clean-rule.patch 
b/debian/patches/0002-Do-not-call-git-in-clean-rule.patch
deleted file mode 100644
index fb3f6b4..0000000
--- a/debian/patches/0002-Do-not-call-git-in-clean-rule.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Stephane Glondu <st...@glondu.net>
-Date: Sat, 6 Jul 2013 14:06:22 +0200
-Subject: Do not call git in clean rule
-
----
- Makefile | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index dd14ce4..702578d 100644
---- a/Makefile
-+++ b/Makefile
-@@ -75,7 +75,6 @@ clean:
-       @${RM} src/batteriesConfig.ml src/batUnix.mli batteries.odocl bench.log
-       @${RM} -r man/
-       @$(OCAMLBUILD) -clean
--      @git clean -xfd
-       @echo " Cleaned up working copy" # Note: ocamlbuild eats the first char!
- 
- batteries.odocl: src/batteries.mllib src/batteriesThread.mllib
--- 
diff --git 
a/debian/patches/0005-Disable-test-compat-broken-with-OCaml-4.01.0.patch 
b/debian/patches/0003-Disable-test-compat-broken-with-OCaml-4.01.0.patch
similarity index 78%
rename from 
debian/patches/0005-Disable-test-compat-broken-with-OCaml-4.01.0.patch
rename to debian/patches/0003-Disable-test-compat-broken-with-OCaml-4.01.0.patch
index 82086e0..67d4237 100644
--- a/debian/patches/0005-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,11 +7,11 @@ Subject: Disable test-compat (broken with OCaml 4.01.0)
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 87d8f90..815b4ab 100644
+index 3f7fbff..d874bf8 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -189,7 +189,7 @@ full-test: $(TEST_TARGET)
- test-compat: src/batteries_compattest.ml
+@@ -193,7 +193,7 @@ full-test: $(TEST_TARGET)
+ test-compat: prefilter src/batteries_compattest.ml
        ocamlbuild src/batteries_compattest.byte -no-links
  
 -test: test-byte test-compat
diff --git a/debian/patches/0004-Fix-compilation-with-OCaml-4.01.0.patch 
b/debian/patches/0004-Fix-compilation-with-OCaml-4.01.0.patch
deleted file mode 100644
index 81fbac1..0000000
--- a/debian/patches/0004-Fix-compilation-with-OCaml-4.01.0.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Stephane Glondu <st...@glondu.net>
-Date: Sat, 16 Nov 2013 11:09:41 +0100
-Subject: Fix compilation with OCaml 4.01.0
-
-Origin: 
https://raw.github.com/ocaml/opam-repository/master/packages/batteries.2.1.0/files/cloexec.patch
----
- src/batUnix.mliv | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/batUnix.mliv b/src/batUnix.mliv
-index bd710a7..d994e61 100644
---- a/src/batUnix.mliv
-+++ b/src/batUnix.mliv
-@@ -261,6 +261,10 @@ type open_flag = Unix.open_flag =
-                                     O_SYNC/O_DSYNC) *)
- ##V4##  | O_SHARE_DELETE              (** OCaml 4 and Windows only: allow the 
file to be deleted
- ##V4##                                   while still open *)
-+##V4.1##  | O_CLOEXEC                   (** Set the close-on-exec flag on the
-+##V4.1##                                    descriptor returned by {!openfile}
-+##V4.1##
-+##V4.1##                                    Since OCaml 4.1 *)
- (** The flags to {!Unix.openfile}. *)
- 
- 
--- 
diff --git a/debian/patches/series b/debian/patches/series
index e0bac3e..5d51878 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 0001-Do-not-enforce-sanity-check-rules.patch
-0002-Do-not-call-git-in-clean-rule.patch
-0003-Disable-qtest-based-tests.patch
-0004-Fix-compilation-with-OCaml-4.01.0.patch
-0005-Disable-test-compat-broken-with-OCaml-4.01.0.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

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to