The following commit has been merged in the master branch:
commit e46408ecce1d4a82c3f996528d22bc6a4dd67c01
Author: Stephane Glondu <st...@glondu.net>
Date:   Sat Jul 6 14:00:28 2013 +0200

    Refresh patches
    
    doc/ has been removed, therefore remove patches patching there.

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 a7fa9b6..49a1caa 100644
--- a/debian/patches/0001-Do-not-enforce-sanity-check-rules.patch
+++ b/debian/patches/0001-Do-not-enforce-sanity-check-rules.patch
@@ -7,16 +7,16 @@ Subject: Do not enforce sanity-check rules
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index f359e95..29fc6e3 100644
+index af13897..4f30077 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -72,7 +72,7 @@ clean:
-       $(OCAMLBUILD) -clean
+@@ -81,7 +81,7 @@ batteries.odocl: src/batteries.mllib 
src/batteriesThread.mllib
+       cat $^ > $@
  
- doc:
+ doc: prefilter batteries.odocl
 -      $(OCAMLBUILD) batteries.docdir/index.html
 +      $(OCAMLBUILD) -no-hygiene batteries.docdir/index.html
-       test -e apidocs || ln -s _build/batteries.docdir apidocs
  
- install: all uninstall_packages
+ man: all batteries.odocl
+       -mkdir man
 -- 
diff --git 
a/debian/patches/0002-Use-mirror-of-ocaml-tutorial.org-which-is-dead.patch 
b/debian/patches/0002-Use-mirror-of-ocaml-tutorial.org-which-is-dead.patch
deleted file mode 100644
index 7ab0ef9..0000000
--- a/debian/patches/0002-Use-mirror-of-ocaml-tutorial.org-which-is-dead.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Mehdi Dogguy <me...@debian.org>
-Date: Tue, 5 Jun 2012 22:21:14 +0200
-Subject: Use mirror of ocaml-tutorial.org, which is dead
-
----
- doc/batteries/language.idex |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/doc/batteries/language.idex b/doc/batteries/language.idex
-index 0eedbf7..78af91b 100644
---- a/doc/batteries/language.idex
-+++ b/doc/batteries/language.idex
-@@ -1,7 +1,7 @@
- "the tutorial": "http://www.cs.jhu.edu/~scott/pl/lectures/caml-intro.html";
- "The tutorial": "http://www.cs.jhu.edu/~scott/pl/lectures/caml-intro.html";
- "The Tutorial": "http://www.cs.jhu.edu/~scott/pl/lectures/caml-intro.html";
--"For programmers": "http://www.ocaml-tutorial.org";
--"for programmers": "http://www.ocaml-tutorial.org";
-+"For programmers": "http://mirror.ocamlcore.org/ocaml-tutorial.org/";
-+"for programmers": "http://mirror.ocamlcore.org/ocaml-tutorial.org/";
- "directives":   "html/toplevel.html#directives"
- "batteries":    "html/index.html"
--- 
diff --git a/debian/patches/0003-Fix-doc-batteries-html-extensions.html.patch 
b/debian/patches/0003-Fix-doc-batteries-html-extensions.html.patch
deleted file mode 100644
index d836579..0000000
--- a/debian/patches/0003-Fix-doc-batteries-html-extensions.html.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Mehdi Dogguy <me...@debian.org>
-Date: Tue, 5 Jun 2012 22:34:22 +0200
-Subject: Fix doc/batteries/html/extensions.html
-
----
- doc/batteries/html/extensions.html |    7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/doc/batteries/html/extensions.html 
b/doc/batteries/html/extensions.html
-index 1f19e2f..cca8cbd 100644
---- a/doc/batteries/html/extensions.html
-+++ b/doc/batteries/html/extensions.html
-@@ -111,7 +111,7 @@ Again, immutable latin-1 strings are automatically 
optimized.
- 
- The same syntax may be used to pattern-match against ropes, UTF-8 strings and 
string with capabilities.
- 
--<h2> Lazy List syntax <h2>
-+<h2> Lazy List syntax </h2>
- 
- <p> A few new constructs are added to make using lazy lists easier.  As an 
expression, <code>[%]</code> is a shortcut for <code>lazy 
BatLazyList.Nil</code>, the empty lazy list. </p>
- 
-@@ -123,10 +123,5 @@ BatLazyList.Cons(a,b)</code>.  </p>
- 
- <code>
- 
--<h1>Summary of new keywords<a name="new_keywords"></a></h1>
--<ul>
--<li><code>where</code>, defined by <a href="#where">pa_where</a></li>
--</ul>
--
- </body>
- </html>
--- 
diff --git a/debian/patches/series b/debian/patches/series
index cc47de0..98d1f0e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 0001-Do-not-enforce-sanity-check-rules.patch
-0002-Use-mirror-of-ocaml-tutorial.org-which-is-dead.patch
-0003-Fix-doc-batteries-html-extensions.html.patch

-- 
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