[Pkg-ocaml-maint-commits] [SCM] xstrp4 packaging branch, master, updated. debian/1.8-1

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 1b7879e7f0e3abfc20286760a9479d1728983754
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Thu Dec 2 00:56:43 2010 +0100

    Update _oasis to reflect the need of camlp4, the tool

diff --git a/_oasis b/_oasis
index 4ae2f38..0f42e7b 100644
--- a/_oasis
+++ b/_oasis
@@ -40,6 +40,7 @@ Library xstrp4
   XMETADescription: brace expansions in string
   CompiledObject:   byte
   BuildDepends:     camlp4
+  BuildTools:       camlp4
   
 SourceRepository head
   Type:     svn
diff --git a/debian/patches/oasis-enabled.patch b/debian/patches/oasis-enabled.patch
index 7143c0b..177d87d 100644
--- a/debian/patches/oasis-enabled.patch
+++ b/debian/patches/oasis-enabled.patch
@@ -1,7 +1,7 @@
 Index: xstrp4/META
 ===================================================================
---- xstrp4.orig/META	2010-12-01 14:55:28.000000000 +0000
-+++ xstrp4/META	2010-12-01 15:06:37.000000000 +0000
+--- xstrp4.orig/META	2010-12-02 00:53:12.000000000 +0100
++++ xstrp4/META	2010-12-02 00:53:13.000000000 +0100
 @@ -1,11 +1,10 @@
 -version = "1.7"
 +# OASIS_START
@@ -23,8 +23,8 @@ Index: xstrp4/META
  
 Index: xstrp4/configure
 ===================================================================
---- xstrp4.orig/configure	2010-12-01 14:55:28.000000000 +0000
-+++ xstrp4/configure	2010-12-01 14:55:29.000000000 +0000
+--- xstrp4.orig/configure	2010-12-02 00:53:12.000000000 +0100
++++ xstrp4/configure	2010-12-02 00:53:13.000000000 +0100
 @@ -146,6 +146,13 @@
                          echo "$version"
                          exit 0
@@ -48,8 +48,8 @@ Index: xstrp4/configure
 Index: xstrp4/_oasis
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xstrp4/_oasis	2010-12-01 15:05:39.000000000 +0000
-@@ -0,0 +1,48 @@
++++ xstrp4/_oasis	2010-12-02 00:54:49.000000000 +0100
+@@ -0,0 +1,49 @@
 +OASISFormat:  0.2
 +Name:         xstrp4
 +Version:      1.8
@@ -92,6 +92,7 @@ Index: xstrp4/_oasis
 +  XMETADescription: brace expansions in string
 +  CompiledObject:   byte
 +  BuildDepends:     camlp4
++  BuildTools:       camlp4
 +  
 +SourceRepository head
 +  Type:     svn
diff --git a/debian/patches/oasis-setup.patch b/debian/patches/oasis-setup.patch
index 2194e6e..915ab8a 100644
--- a/debian/patches/oasis-setup.patch
+++ b/debian/patches/oasis-setup.patch
@@ -1,12 +1,12 @@
 Index: xstrp4/setup.ml
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xstrp4/setup.ml	2010-12-01 15:07:16.000000000 +0000
++++ xstrp4/setup.ml	2010-12-02 00:55:19.000000000 +0100
 @@ -0,0 +1,4302 @@
 +(* setup.ml generated for the first time by OASIS v0.2.0 *)
 +
 +(* OASIS_START *)
-+(* DO NOT EDIT (digest: 7cb0dfb4d7112b18e36356c804ce88d6) *)
++(* DO NOT EDIT (digest: f9a71cfdf1860565b4d884bf8262edba) *)
 +(*
 +   Regenerated by OASIS v0.2.0
 +   Visit http://oasis.forge.ocamlcore.org for more information and
@@ -4271,7 +4271,7 @@ Index: xstrp4/setup.ml
 +                      bs_path = ".";
 +                      bs_compiled_object = Byte;
 +                      bs_build_depends = [FindlibPackage ("camlp4", None)];
-+                      bs_build_tools = [];
++                      bs_build_tools = [ExternalTool "camlp4"];
 +                      bs_c_sources = [];
 +                      bs_data_files = [];
 +                      bs_ccopt = [(OASISExpr.EBool true, [])];
diff --git a/setup.ml b/setup.ml
index 05f3603..16f7abc 100644
--- a/setup.ml
+++ b/setup.ml
@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.2.0 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 7cb0dfb4d7112b18e36356c804ce88d6) *)
+(* DO NOT EDIT (digest: f9a71cfdf1860565b4d884bf8262edba) *)
 (*
    Regenerated by OASIS v0.2.0
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -4266,7 +4266,7 @@ let setup_t =
                       bs_path = ".";
                       bs_compiled_object = Byte;
                       bs_build_depends = [FindlibPackage ("camlp4", None)];
-                      bs_build_tools = [];
+                      bs_build_tools = [ExternalTool "camlp4"];
                       bs_c_sources = [];
                       bs_data_files = [];
                       bs_ccopt = [(OASISExpr.EBool true, [])];

-- 
xstrp4 packaging