The following commit has been merged in the master branch:
commit dbfc9efec3542b253ed85358250e669ddd2811e3
Author: Mehdi Dogguy <me...@debian.org>
Date:   Tue Jun 5 22:35:55 2012 +0200

    Add two patches to fix minor issues

diff --git a/debian/changelog b/debian/changelog
index cb08171..acb7f6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ocaml-batteries (1.4.3-1) UNRELEASED; urgency=low
 
   * New upstream release (Closes: 668027)
+    - add 0002-Use-mirror-of-ocaml-tutorial.org-which-is-dead.patch
+    - add 0003-Fix-doc-batteries-html-extensions.html.patch
 
  -- Mehdi Dogguy <me...@debian.org>  Tue, 05 Jun 2012 21:31:12 +0200
 
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
new file mode 100644
index 0000000..7ab0ef9
--- /dev/null
+++ b/debian/patches/0002-Use-mirror-of-ocaml-tutorial.org-which-is-dead.patch
@@ -0,0 +1,23 @@
+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
new file mode 100644
index 0000000..d836579
--- /dev/null
+++ b/debian/patches/0003-Fix-doc-batteries-html-extensions.html.patch
@@ -0,0 +1,33 @@
+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 98d1f0e..cc47de0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 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