The following commit has been merged in the master branch:
commit ee756289bd7a2268a6e275268ecdd5530d3a8eb1
Author: Nicolas Dandrimont <nicolas.dandrim...@crans.org>
Date:   Thu May 19 17:03:54 2011 +0200

    Drop 0001-Move-the-cmxs-rule-to-Before_rules.patch

diff --git a/debian/changelog b/debian/changelog
index d70e0a4..f357b4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ ocaml-usb (1.2.0-1) unstable; urgency=low
 
   * New upstream release
     - Bump required Lwt version to 2.3.0
+    - Drop 0001-Move-the-cmxs-rule-to-Before_rules.patch
 
- -- Nicolas Dandrimont <nicolas.dandrim...@crans.org>  Thu, 19 May 2011 
16:44:01 +0200
+ -- Nicolas Dandrimont <nicolas.dandrim...@crans.org>  Thu, 19 May 2011 
17:03:34 +0200
 
 ocaml-usb (1.0-1) unstable; urgency=low
 
diff --git a/debian/patches/0001-Move-the-cmxs-rule-to-Before_rules.patch 
b/debian/patches/0001-Move-the-cmxs-rule-to-Before_rules.patch
deleted file mode 100644
index d971a6b..0000000
--- a/debian/patches/0001-Move-the-cmxs-rule-to-Before_rules.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Stephane Glondu <st...@glondu.net>
-Date: Thu, 29 Apr 2010 07:24:15 +0200
-Subject: [PATCH] Move the cmxs rule to Before_rules
-
-Move the cmxs rule to Before_rules, so that it overrides the built-in
-rules (which are present in OCaml 3.12).
-
-Signed-off-by: Stephane Glondu <st...@glondu.net>
----
- myocamlbuild.ml |   18 ++++++++++--------
- 1 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/myocamlbuild.ml b/myocamlbuild.ml
-index 712e121..6bd3547 100644
---- a/myocamlbuild.ml
-+++ b/myocamlbuild.ml
-@@ -123,6 +123,16 @@ let _ =
-         Options.ocamldep := ocamlfind "ocamldep";
-         Options.ocamldoc := S[A"ocamlfind"; A"ocamldoc"; A"-hide-warnings"]
- 
-+    | Before_rules ->
-+
-+        (* +---------------------------------------------------------+
-+           | Shared libraries                                        |
-+           +---------------------------------------------------------+ *)
-+
-+        rule "shared libraries (cmxs)"
-+          ~dep:"%.cmxa" ~prod:"%.cmxs"
-+          (fun env _ -> Cmd(S[!(Options.ocamlopt); A"-cclib"; A"-L."; 
A"-shared"; A"-linkall"; A(env "%.cmxa"); A"-o"; A(env "%.cmxs")]))
-+
-     | After_rules ->
- 
-         (* +---------------------------------------------------------+
-@@ -138,14 +148,6 @@ let _ =
-         virtual_rule "native" & ["META"; "usb.cmxa"; "usb.cmxs"];
- 
-         (* +---------------------------------------------------------+
--           | Shared libraries                                        |
--           +---------------------------------------------------------+ *)
--
--        rule "shared libraries (cmxs)"
--          ~dep:"%.cmxa" ~prod:"%.cmxs"
--          (fun env _ -> Cmd(S[!(Options.ocamlopt); A"-cclib"; A"-L."; 
A"-shared"; A"-linkall"; A(env "%.cmxa"); A"-o"; A(env "%.cmxs")]));
--
--        (* +---------------------------------------------------------+
-            | Ocamlfind stuff                                         |
-            +---------------------------------------------------------+ *)
- 
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index cb900f9..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Move-the-cmxs-rule-to-Before_rules.patch

-- 
ocaml-usb packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to