[Pkg-ocaml-maint-commits] [SCM] approx upstream and debian packaging branch, master, updated. debian/5.1-1.1-16-gb1e4ac9

[Eric Cooper]

The following commit has been merged in the master branch:
commit 9a06f94794053911a847becf1e5b78412f667a17
Author: Eric Cooper <ecc at cmu.edu>
Date:   Tue May 1 17:49:57 2012 -0400

    applied "Fix FTBFS with ocamlnet 3.5.1 (Closes: #661775)" upstream
    
    This reverts commit 9efcdfba0e7fc52509a817473ac221b8495e5c6e.

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
deleted file mode 100644
index b0b9caf..0000000
--- a/debian/patches/0001-Fix-FTBFS-with-ocamlnet-3.5.1.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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
deleted file mode 100644
index e03fa3e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Fix-FTBFS-with-ocamlnet-3.5.1.patch

-- 
approx upstream and debian packaging