The following commit has been merged in the master branch:
commit 50b89e2d09a63db6958e8f209fcc2a0412a73834
Author: Stephane Glondu <st...@glondu.net>
Date:   Thu Jul 25 07:49:47 2013 +0200

    Refresh patches

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 49a1caa..cd1c468 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 af13897..4f30077 100644
+index 7d0cd42..dd14ce4 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -81,7 +81,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
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
index 83fbe91..bd523cc 100644
--- a/debian/patches/0002-Do-not-call-git-in-clean-rule.patch
+++ b/debian/patches/0002-Do-not-call-git-in-clean-rule.patch
@@ -7,10 +7,10 @@ Subject: Do not call git in clean rule
  1 file changed, 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 4f30077..d56a3ca 100644
+index dd14ce4..702578d 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -74,7 +74,6 @@ clean:
+@@ -75,7 +75,6 @@ clean:
        @${RM} src/batteriesConfig.ml src/batUnix.mli batteries.odocl bench.log
        @${RM} -r man/
        @$(OCAMLBUILD) -clean
diff --git a/debian/patches/0003-Disable-qtest-based-tests.patch 
b/debian/patches/0003-Disable-qtest-based-tests.patch
index e5b5aa0..992da66 100644
--- a/debian/patches/0003-Disable-qtest-based-tests.patch
+++ b/debian/patches/0003-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 d56a3ca..e39a2ba 100644
+index 702578d..87d8f90 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -174,15 +174,13 @@ qtest: prefilter qtest-clean
+@@ -176,15 +176,13 @@ qtest: prefilter qtest-clean
  ### run all unit tests
  ##############################################
  
@@ -20,8 +20,8 @@ index d56a3ca..e39a2ba 100644
        @echo "" # newline after "OK"
 -      @_build/$(QTESTDIR)/all_tests.byte
  
--test-native: test-byte _build/testsuite/main.native 
_build/$(QTESTDIR)/all_tests.native
-+test-native: test-byte _build/testsuite/main.native
+-test-native: prefilter _build/testsuite/main.native 
_build/$(QTESTDIR)/all_tests.native
++test-native: prefilter _build/testsuite/main.native
        @_build/testsuite/main.native
        @echo "" # newline after "OK"
 -      @_build/$(QTESTDIR)/all_tests.native

-- 
ocaml-batteries packaging

_______________________________________________
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