[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 a47e73ca0cd8d633cfdb1cae39b1ff4aa9976302
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Wed Dec 1 15:22:49 2010 +0000

    Add a build depends on camlp4

diff --git a/META b/META
index e8fb5ba..af48ddd 100644
--- a/META
+++ b/META
@@ -1,7 +1,8 @@
 # OASIS_START
-# DO NOT EDIT (digest: c56186eb734135e41d3ef2531dd8062b)
+# DO NOT EDIT (digest: f5881b80c4e296b1f5c1e46704c583d1)
 version = "1.8"
 description = "brace expansions in string"
+requires = "camlp4"
 archive(syntax,preprocessor) = "xstrp4.cma"
 archive(syntax,toploop) = "xstrp4.cma"
 exists_if = "xstrp4.cma"
diff --git a/_oasis b/_oasis
index 95c585d..4ae2f38 100644
--- a/_oasis
+++ b/_oasis
@@ -39,6 +39,7 @@ Library xstrp4
   XMETAType:        syntax
   XMETADescription: brace expansions in string
   CompiledObject:   byte
+  BuildDepends:     camlp4
   
 SourceRepository head
   Type:     svn
diff --git a/debian/patches/oasis-enabled.patch b/debian/patches/oasis-enabled.patch
index 6e96b05..7143c0b 100644
--- a/debian/patches/oasis-enabled.patch
+++ b/debian/patches/oasis-enabled.patch
@@ -1,15 +1,17 @@
---- xstrp4-1.8.orig/META
-+++ xstrp4-1.8/META
-@@ -1,11 +1,9 @@
+Index: xstrp4/META
+===================================================================
+--- xstrp4.orig/META	2010-12-01 14:55:28.000000000 +0000
++++ xstrp4/META	2010-12-01 15:06:37.000000000 +0000
+@@ -1,11 +1,10 @@
 -version = "1.7"
--requires = "camlp4"
--
--# This line counts when the compiler is invoked with
--# ocamlfind ocamlc -syntax -package xstrp4
 +# OASIS_START
-+# DO NOT EDIT (digest: c56186eb734135e41d3ef2531dd8062b)
++# DO NOT EDIT (digest: f5881b80c4e296b1f5c1e46704c583d1)
 +version = "1.8"
 +description = "brace expansions in string"
+ requires = "camlp4"
+-
+-# This line counts when the compiler is invoked with
+-# ocamlfind ocamlc -syntax -package xstrp4
  archive(syntax,preprocessor) = "xstrp4.cma"
 -
 -# This line counts when a toploop is running and 
@@ -19,9 +21,11 @@
 +exists_if = "xstrp4.cma"
 +# OASIS_STOP
  
---- xstrp4-1.8.orig/configure
-+++ xstrp4-1.8/configure
-@@ -146,6 +146,13 @@ while [ "$#" -gt 0 ]; do
+Index: xstrp4/configure
+===================================================================
+--- xstrp4.orig/configure	2010-12-01 14:55:28.000000000 +0000
++++ xstrp4/configure	2010-12-01 14:55:29.000000000 +0000
+@@ -146,6 +146,13 @@
                          echo "$version"
                          exit 0
                          ;;
@@ -35,15 +39,17 @@
                  *)
                          usage
          esac
-@@ -220,3 +227,5 @@ echo "for the native-code compiler (if s
+@@ -220,3 +227,5 @@
  echo "Finally, a"
  echo "   make install"
  echo "will install the package(s)."
 +
 +touch setup.data
---- /dev/null
-+++ xstrp4-1.8/_oasis
-@@ -0,0 +1,47 @@
+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 @@
 +OASISFormat:  0.2
 +Name:         xstrp4
 +Version:      1.8
@@ -85,6 +91,7 @@
 +  XMETAType:        syntax
 +  XMETADescription: brace expansions in string
 +  CompiledObject:   byte
++  BuildDepends:     camlp4
 +  
 +SourceRepository head
 +  Type:     svn
diff --git a/debian/patches/oasis-setup.patch b/debian/patches/oasis-setup.patch
index b047166..2194e6e 100644
--- a/debian/patches/oasis-setup.patch
+++ b/debian/patches/oasis-setup.patch
@@ -1,10 +1,12 @@
---- /dev/null
-+++ xstrp4-1.8/setup.ml
+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
 @@ -0,0 +1,4302 @@
 +(* setup.ml generated for the first time by OASIS v0.2.0 *)
 +
 +(* OASIS_START *)
-+(* DO NOT EDIT (digest: c4836bded74b753db5c8befee59f04f8) *)
++(* DO NOT EDIT (digest: 7cb0dfb4d7112b18e36356c804ce88d6) *)
 +(*
 +   Regenerated by OASIS v0.2.0
 +   Visit http://oasis.forge.ocamlcore.org for more information and
@@ -4268,7 +4270,7 @@
 +                      bs_install = [(OASISExpr.EBool true, true)];
 +                      bs_path = ".";
 +                      bs_compiled_object = Byte;
-+                      bs_build_depends = [];
++                      bs_build_depends = [FindlibPackage ("camlp4", None)];
 +                      bs_build_tools = [];
 +                      bs_c_sources = [];
 +                      bs_data_files = [];
diff --git a/setup.ml b/setup.ml
index f53494f..05f3603 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: c4836bded74b753db5c8befee59f04f8) *)
+(* DO NOT EDIT (digest: 7cb0dfb4d7112b18e36356c804ce88d6) *)
 (*
    Regenerated by OASIS v0.2.0
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -4265,7 +4265,7 @@ let setup_t =
                       bs_install = [(OASISExpr.EBool true, true)];
                       bs_path = ".";
                       bs_compiled_object = Byte;
-                      bs_build_depends = [];
+                      bs_build_depends = [FindlibPackage ("camlp4", None)];
                       bs_build_tools = [];
                       bs_c_sources = [];
                       bs_data_files = [];

-- 
xstrp4 packaging