The following commit has been merged in the master branch:
commit a2243e5cd96011e66a1b883e5ba7cdf71bd7f9dc
Author: Stephane Glondu <st...@glondu.net>
Date:   Fri Dec 7 08:27:54 2012 +0100

    Refresh patches

diff --git a/debian/patches/0001-Do-not-build-manual-manual.pdf.patch 
b/debian/patches/0001-Do-not-build-manual-manual.pdf.patch
index 3a8b94e..068009c 100644
--- a/debian/patches/0001-Do-not-build-manual-manual.pdf.patch
+++ b/debian/patches/0001-Do-not-build-manual-manual.pdf.patch
@@ -4,13 +4,13 @@ Subject: Do not build manual/manual.pdf
 
 ---
  setup.ml |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/setup.ml b/setup.ml
-index f799762..89f1a90 100644
+index f6c7214..6c95478 100644
 --- a/setup.ml
 +++ b/setup.ml
-@@ -5160,7 +5160,7 @@ let setup_t =
+@@ -5601,7 +5601,7 @@ let setup_t =
                   CustomPlugin.cmd_main =
                     [
                        (OASISExpr.EBool true,
@@ -19,7 +19,7 @@ index f799762..89f1a90 100644
                     ];
                   cmd_clean = [(OASISExpr.EBool true, None)];
                   cmd_distclean = [(OASISExpr.EBool true, None)];
-@@ -5205,7 +5205,7 @@ let setup_t =
+@@ -5654,7 +5654,7 @@ let setup_t =
                   CustomPlugin.cmd_main =
                     [
                        (OASISExpr.EBool true,
@@ -28,7 +28,7 @@ index f799762..89f1a90 100644
                     ];
                   cmd_clean = [(OASISExpr.EBool true, None)];
                   cmd_distclean = [(OASISExpr.EBool true, None)];
-@@ -5247,7 +5247,7 @@ let setup_t =
+@@ -5705,7 +5705,7 @@ let setup_t =
                   CustomPlugin.cmd_main =
                     [
                        (OASISExpr.EBool true,
diff --git 
a/debian/patches/0002-Remove-buggy-dependencies-causing-FTBFS-on-no-natdyn.patch
 
b/debian/patches/0002-Remove-buggy-dependencies-causing-FTBFS-on-no-natdyn.patch
index 76d34fd..44b8916 100644
--- 
a/debian/patches/0002-Remove-buggy-dependencies-causing-FTBFS-on-no-natdyn.patch
+++ 
b/debian/patches/0002-Remove-buggy-dependencies-causing-FTBFS-on-no-natdyn.patch
@@ -1,42 +1,40 @@
 From: Stephane Glondu <st...@glondu.net>
-Date: Sat, 31 Dec 2011 12:31:28 +0100
+Date: Fri, 7 Dec 2012 08:30:03 +0100
 Subject: Remove buggy dependencies causing FTBFS on no-natdynlink archs
 
 ---
- _tags |    9 ---------
- 1 files changed, 0 insertions(+), 9 deletions(-)
+ _tags |    6 ------
+ 1 file changed, 6 deletions(-)
 
 diff --git a/_tags b/_tags
-index 81f7f8e..1c24e3b 100644
+index eadc7ef..bbd5621 100644
 --- a/_tags
 +++ b/_tags
-@@ -141,18 +141,12 @@
- <examples/unix/relay.{native,byte}>: use_lwt-unix
- <examples/unix/relay.{native,byte}>: use_lwt
- <examples/unix/relay.{native,byte}>: pkg_unix
--<examples/unix/relay.{native,byte}>: pkg_camlp4.quotations.o
--<examples/unix/relay.{native,byte}>: pkg_camlp4.lib
--<examples/unix/relay.{native,byte}>: pkg_camlp4.extend
- <examples/unix/relay.{native,byte}>: pkg_bigarray
- # Executable logging
+@@ -233,8 +233,6 @@
  <examples/unix/logging.{native,byte}>: use_lwt-syntax
- <examples/unix/logging.{native,byte}>: use_lwt-unix
- <examples/unix/logging.{native,byte}>: use_lwt
  <examples/unix/logging.{native,byte}>: pkg_unix
+ <examples/unix/logging.{native,byte}>: pkg_camlp4
 -<examples/unix/logging.{native,byte}>: pkg_camlp4.quotations.o
--<examples/unix/logging.{native,byte}>: pkg_camlp4.lib
 -<examples/unix/logging.{native,byte}>: pkg_camlp4.extend
  <examples/unix/logging.{native,byte}>: pkg_bigarray
- # Library lwt-syntax-log
- "syntax/lwt-syntax-log.cmxs": use_lwt-syntax-log
-@@ -184,9 +178,6 @@
+ # Executable relay
+ <examples/unix/relay.{native,byte}>: use_lwt-unix
+@@ -242,8 +240,6 @@
+ <examples/unix/relay.{native,byte}>: use_lwt-syntax
+ <examples/unix/relay.{native,byte}>: pkg_unix
+ <examples/unix/relay.{native,byte}>: pkg_camlp4
+-<examples/unix/relay.{native,byte}>: pkg_camlp4.quotations.o
+-<examples/unix/relay.{native,byte}>: pkg_camlp4.extend
+ <examples/unix/relay.{native,byte}>: pkg_bigarray
+ # Executable parallelize
  <examples/unix/parallelize.{native,byte}>: use_lwt-unix
- <examples/unix/parallelize.{native,byte}>: use_lwt
+@@ -251,8 +247,6 @@
+ <examples/unix/parallelize.{native,byte}>: use_lwt-syntax
  <examples/unix/parallelize.{native,byte}>: pkg_unix
+ <examples/unix/parallelize.{native,byte}>: pkg_camlp4
 -<examples/unix/parallelize.{native,byte}>: pkg_camlp4.quotations.o
--<examples/unix/parallelize.{native,byte}>: pkg_camlp4.lib
 -<examples/unix/parallelize.{native,byte}>: pkg_camlp4.extend
  <examples/unix/parallelize.{native,byte}>: pkg_bigarray
- <examples/unix/*.ml{,i}>: use_lwt-syntax
  <examples/unix/*.ml{,i}>: use_lwt-unix
+ <examples/unix/*.ml{,i}>: use_lwt
 -- 

-- 
Cooperative light-weight thread library for OCaml

_______________________________________________
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