[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 5a05b5c3de3417e2399e36c373d149c608cd4d3d
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Wed Dec 1 14:28:06 2010 +0000

    Further support for OASIS

diff --git a/_oasis b/_oasis
index 2ebbe0d..95c585d 100644
--- a/_oasis
+++ b/_oasis
@@ -2,7 +2,9 @@ OASISFormat:  0.2
 Name:         xstrp4
 Version:      1.8
 Authors:      Gerd Stolpmann
+Copyrights:   (C) 1999 Gerd Stolpmann
 License:      MIT
+LicenseFile:  LICENSE
 Plugins:      META (0.2)
 Homepage:     http://projects.camlcity.org/projects/xstrp4.html
 OCamlVersion: >= 3.10.0
@@ -20,7 +22,7 @@ Description:
 
 
 ConfType:    custom
-XCustomConf: ./configure && touch setup.data 
+XCustomConf: ./configure
 
 BuildType:    custom
 XCustomBuild: make all 
@@ -33,10 +35,10 @@ XCustomUninstall: make uninstall
 
 Library xstrp4
   Path:             .
-  Modules:          Xstrp4_here
-  InternalModules:  Xstrp4_here_lexer, Xstrp4_here_types
+  InternalModules:  Xstrp4_here_lexer, Xstrp4_here_types, Xstrp4_here
   XMETAType:        syntax
   XMETADescription: brace expansions in string
+  CompiledObject:   byte
   
 SourceRepository head
   Type:     svn
diff --git a/configure b/configure
index 9ddbf34..5152fac 100755
--- a/configure
+++ b/configure
@@ -146,6 +146,13 @@ while [ "$#" -gt 0 ]; do
                         echo "$version"
                         exit 0
                         ;;
+                --prefix|--destdir)
+                        shift
+                        shift
+                        ;;
+                --prefix=*|--destdir=*)
+                        shift
+                        ;;
                 *)
                         usage
         esac
@@ -220,3 +227,5 @@ echo "for the native-code compiler (if supported on your architecture)."
 echo "Finally, a"
 echo "   make install"
 echo "will install the package(s)."
+
+touch setup.data
diff --git a/setup.ml b/setup.ml
index 47eae93..f53494f 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: 1348ff53a21348f52b4eb49797af2e97) *)
+(* DO NOT EDIT (digest: c4836bded74b753db5c8befee59f04f8) *)
 (*
    Regenerated by OASIS v0.2.0
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -4074,10 +4074,7 @@ let setup_t =
        CustomPlugin.main
          {
             CustomPlugin.cmd_main =
-              [
-                 (OASISExpr.EBool true,
-                   ("./configure", ["&&"; "touch"; "setup.data"]))
-              ];
+              [(OASISExpr.EBool true, ("./configure", []))];
             cmd_clean = [(OASISExpr.EBool true, None)];
             cmd_distclean = [(OASISExpr.EBool true, None)];
             };
@@ -4113,10 +4110,7 @@ let setup_t =
           CustomPlugin.clean
             {
                CustomPlugin.cmd_main =
-                 [
-                    (OASISExpr.EBool true,
-                      ("./configure", ["&&"; "touch"; "setup.data"]))
-                 ];
+                 [(OASISExpr.EBool true, ("./configure", []))];
                cmd_clean = [(OASISExpr.EBool true, None)];
                cmd_distclean = [(OASISExpr.EBool true, None)];
                };
@@ -4151,10 +4145,7 @@ let setup_t =
           CustomPlugin.distclean
             {
                CustomPlugin.cmd_main =
-                 [
-                    (OASISExpr.EBool true,
-                      ("./configure", ["&&"; "touch"; "setup.data"]))
-                 ];
+                 [(OASISExpr.EBool true, ("./configure", []))];
                cmd_clean = [(OASISExpr.EBool true, None)];
                cmd_distclean = [(OASISExpr.EBool true, None)];
                };
@@ -4198,8 +4189,8 @@ let setup_t =
                  exceptions = [];
                  version = OASISLicense.NoVersion;
                  };
-          license_file = None;
-          copyrights = [];
+          license_file = Some "LICENSE";
+          copyrights = ["(C) 1999 Gerd Stolpmann"];
           maintainers = [];
           authors = ["Gerd Stolpmann"];
           homepage = Some "http://projects.camlcity.org/projects/xstrp4.html";
@@ -4273,7 +4264,7 @@ let setup_t =
                       bs_build = [(OASISExpr.EBool true, true)];
                       bs_install = [(OASISExpr.EBool true, true)];
                       bs_path = ".";
-                      bs_compiled_object = Best;
+                      bs_compiled_object = Byte;
                       bs_build_depends = [];
                       bs_build_tools = [];
                       bs_c_sources = [];
@@ -4286,9 +4277,13 @@ let setup_t =
                       bs_nativeopt = [(OASISExpr.EBool true, [])];
                       },
                    {
-                      lib_modules = ["Xstrp4_here"];
+                      lib_modules = [];
                       lib_internal_modules =
-                        ["Xstrp4_here_lexer"; "Xstrp4_here_types"];
+                        [
+                           "Xstrp4_here_lexer";
+                           "Xstrp4_here_types";
+                           "Xstrp4_here"
+                        ];
                       lib_findlib_parent = None;
                       lib_findlib_name = None;
                       lib_findlib_containers = [];

-- 
xstrp4 packaging