[Pkg-ocaml-maint-commits] [dose3] 01/04: Imported Upstream version 4.0.2

[Johannes Schauer]

This is an automated email from the git hooks/post-receive script.

josch pushed a commit to branch master
in repository dose3.

commit 21fb3b37592da80b787bdbef33b28c86a8e13cda
Author: Johannes Schauer <josch at debian.org>
Date:   Sun Sep 27 11:00:44 2015 +0200

    Imported Upstream version 4.0.2
---
 META.in            | 8 ++++----
 Makefile.config.in | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/META.in b/META.in
index 9e1155c..beb28be 100644
--- a/META.in
+++ b/META.in
@@ -1,7 +1,7 @@
 description = "Dose3 libraries"
 version = "@PACKAGE_VERSION@"
-archive(byte) = "common.cma algo.cma debian.cma csw.cma pef.cma"
-archive(native) = "common.cmxa algo.cmxa debian.cmxa csw.cmxa pef.cmxa"
+archive(byte) = "common.cma algo.cma versioning.cma debian.cma pef.cma csw.cma"
+archive(native) = "common.cmxa algo.cmxa versioning.cmxa debian.cmxa pef.cmxa csw.cmxa"
 requires = "extlib, re.pcre, cudf, @OCAMLGRAPH@, unix, @ZIP@, @BZ2@"
 
 package "common" (
@@ -29,14 +29,14 @@ package "debian" (
 version = "@PACKAGE_VERSION@"
 archive(byte) = "debian.cma"
 archive(native) = "debian.cmxa"
-requires = "dose3.common dose3.versioning"
+requires = "dose3.common, dose3.versioning"
 )
 
 package "opam" (
 version = "@PACKAGE_VERSION@"
 archive(byte) = "opam.cma"
 archive(native) = "opam.cmxa"
-requires = "dose3.common dose3.pef"
+requires = "dose3.common, dose3.pef"
 )
 
 package "pef" (
diff --git a/Makefile.config.in b/Makefile.config.in
index 5df1a68..e35d74c 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -17,7 +17,7 @@ ifeq ($(DESTDIR),)
   ifeq (@libdir@,)
     LIBDIR=$(shell OCAMLFIND_DESTDIR=@prefix@/lib/ocaml ocamlfind printconf destdir)
   else
-    LIBDIR=@libdir@/ocaml/${OCAMLVERSION}
+    LIBDIR=@libdir@/ocaml/$(shell ocamlc -version)
   endif
 else
   LIBDIR = $(DESTDIR)/$(shell ocamlc -where)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git