[Pkg-ocaml-maint-commits] [SCM] approx upstream and debian packaging branch, master, updated. debian/5.1-1-3-g9cd505a

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 9efcdfba0e7fc52509a817473ac221b8495e5c6e
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Mar 7 07:53:43 2012 +0100

    Fix FTBFS with ocamlnet 3.5.1 (Closes: #661775)

diff --git a/debian/patches/0001-Fix-FTBFS-with-ocamlnet-3.5.1.patch b/debian/patches/0001-Fix-FTBFS-with-ocamlnet-3.5.1.patch
new file mode 100644
index 0000000..b0b9caf
--- /dev/null
+++ b/debian/patches/0001-Fix-FTBFS-with-ocamlnet-3.5.1.patch
@@ -0,0 +1,23 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Wed, 7 Mar 2012 07:53:01 +0100
+Subject: Fix FTBFS with ocamlnet 3.5.1
+
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=661775
+---
+ url.ml |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/url.ml b/url.ml
+index 661d8ac..d73ba17 100644
+--- a/url.ml
++++ b/url.ml
+@@ -9,7 +9,7 @@ open Util
+ let string_of_time t =
+   Netdate.format ~fmt: "%a, %d %b %Y %T GMT" (Netdate.create ~zone: 0 t)
+ 
+-let time_of_string = Netdate.parse_epoch ?zone: None
++let time_of_string x = Netdate.parse_epoch ?zone: None x
+ 
+ let translate_request url =
+   let path = relative_url url in
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e03fa3e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-FTBFS-with-ocamlnet-3.5.1.patch

-- 
approx upstream and debian packaging