The following commit has been merged in the master branch:
commit 52542d7874c77770c4eca81f5f8d81ee1348a1f2
Author: Mehdi Dogguy <me...@debian.org>
Date: Sat Apr 6 12:56:26 2013 +0200
Remove 0001-Use-Re_pcre-instead-of-Pcre.patch (fixed in 1.0.0)
diff --git a/debian/patches/0001-Use-Re_pcre-instead-of-Pcre.patch
b/debian/patches/0001-Use-Re_pcre-instead-of-Pcre.patch
deleted file mode 100644
index 85c2b56..0000000
--- a/debian/patches/0001-Use-Re_pcre-instead-of-Pcre.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Mehdi Dogguy <me...@debian.org>
-Date: Sat, 12 Jan 2013 23:20:30 +0100
-Subject: Use Re_pcre instead of Pcre
-
----
- src/core/opamFile.ml | 2 +-
- src/core/opamMisc.ml | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/opamFile.ml b/src/core/opamFile.ml
-index 0161913..9658fc8 100644
---- a/src/core/opamFile.ml
-+++ b/src/core/opamFile.ml
-@@ -1367,7 +1367,7 @@ module Subst = struct
- let v = OpamVariable.Full.of_string str in
- OpamVariable.string_of_variable_contents (f v) in
- let rex = Re_perl.compile_pat "%\\{[^%]+\\}%" in
-- Pcre.substitute ~rex ~subst t
-+ Re_pcre.substitute ~rex ~subst t
-
- let replace_string = replace
-
-diff --git a/src/core/opamMisc.ml b/src/core/opamMisc.ml
-index ba24f08..44833d1 100644
---- a/src/core/opamMisc.ml
-+++ b/src/core/opamMisc.ml
-@@ -215,7 +215,7 @@ let contains s c =
- with Not_found -> false
-
- let split s c =
-- Pcre.split ~rex:(Re_perl.compile (Re.char c)) s
-+ Re_pcre.split ~rex:(Re_perl.compile (Re.char c)) s
-
- (* Remove from a ':' separated list of string the one with the given prefix *)
- let reset_env_value ~prefix v =
---
diff --git a/debian/patches/series b/debian/patches/series
index 6c079f2..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-0001-Use-Re_pcre-instead-of-Pcre.patch
--
opam 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
