[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, master, updated. debian/0.5.0-5-8-ga08d581

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 58fceda2596a9c21ba3318660e302370efacf344
Merge: e0e24cad277e094132926a6aeedf0876e39e621c c8735eece1f1d098de545c85dc2de633ffa812c3
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Mon Mar 16 15:23:00 2009 +0100

    Merge commit 'upstream/0.5.2'
    
    Conflicts:
    	lib/META

diff --combined debian/changelog
index 3749917,0000000..3a86900
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,52 -1,0 +1,56 @@@
- janest-core (0.5.0-6) UNRELEASED; urgency=low
++janest-core (0.5.2-1) UNRELEASED; urgency=low
 +
++  [ Stefano Zacchiroli ]
++  * New upstream release
++
++  [ Mehdi Dogguy ]
 +  * Fix watch file.
 +
-  -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Thu, 19 Feb 2009 15:26:29 +0100
++ -- Stefano Zacchiroli <zack at debian.org>  Mon, 16 Mar 2009 15:22:44 +0100
 +
 +janest-core (0.5.0-5) unstable; urgency=medium
 +
 +  * debian/README.Debian: clarify the bin-prot issue on some arch
 +  * get rid of the (unused) conditional quilt machinery (Closes: #485156)
 +
 + -- Stefano Zacchiroli <zack at debian.org>  Sat, 19 Jul 2008 19:47:03 +0200
 +
 +janest-core (0.5.0-4) unstable; urgency=low
 +
 +  * change build-dep on bin-prot to non arch specific, as now bin-prot is used
 +    on all archs; fix FTBFS on archs other than i386, amd64
 +
 + -- Stefano Zacchiroli <zack at debian.org>  Sun, 01 Jun 2008 11:34:16 +0200
 +
 +janest-core (0.5.0-3) unstable; urgency=low
 +
 +  * uploading to unstable
 +  * disabling the arch-specific patch machinery to give a try to bin-prot
 +    Arch:any. In that package it has been documented what works properly on
 +    all archs and what does not.
 +
 + -- Stefano Zacchiroli <zack at debian.org>  Fri, 09 May 2008 14:04:57 +0200
 +
 +janest-core (0.5.0-2) experimental; urgency=low
 +
 +  * make the package Architecture: any
 +    - add debian/patches/no-bin-prot ; this patch is conditionally applied on
 +      architectures with no bin_prot support to relax the dependency on it
 +    - debian/control: set Arch:any, add build-dep on quilt
 +    - debian/rules: add conditional patch application
 +    - debian/rules: add a target to generate the no-bin-prot patch
 +      automatically from git branches
 +    - debian/README.source: explain how to refresh no-bin-prot patch
 +    - debian/README.Debian: explain to users that on some arch they won't get
 +      the legacy library
 +    - debian/TODO close the todo item about bin_prot dependency
 +  * ship .ml sources acting as module interfaces (Comparable, Hashable, ...)
 +
 + -- Stefano Zacchiroli <zack at debian.org>  Sun, 04 May 2008 21:44:07 +0200
 +
 +janest-core (0.5.0-1) experimental; urgency=low
 +
 +  * Initial release (Closes: #479152)
 +
 + -- Stefano Zacchiroli <zack at debian.org>  Sat, 03 May 2008 10:55:27 +0200
 +
diff --combined lib/META
index 22fd4d0,ad5c489..e086f7d
--- a/lib/META
+++ b/lib/META
@@@ -1,6 -1,8 +1,6 @@@
  name = "core"
- version = "0.5.0"
+ version = "0.5.2"
  description = "Core - Jane Street Capital's standard library overlay"
- requires = "bigarray, res, sexplib, bin_prot, unix"
 -
 -requires = "bigarray, res, sexplib, bin_prot, threads"
 -
++requires = "bigarray, res, sexplib, bin_prot, unix, threads"
  archive(byte) = "core.cma"
  archive(native) = "core.cmxa"
diff --combined lib/Makefile
index d9ad8fe,1edd843..b15a5ad
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -3,6 -3,7 +3,7 @@@ OCAMLMAKEFILE = ../OCamlMakefil
  ifeq ($(shell uname -s), Linux)
    LINUX_EXT_STUBS_C = linux_ext_stubs.c
    LINUX_EXT_ML = linux_ext.ml
+ 	CLIBS = rt
  endif
  
  SOURCES = \
@@@ -149,9 -150,15 +150,15 @@@
    ocaml_utils_stubs.c \
    unix_ext_stubs.c
  
+ ifeq ($(shell uname -s), Darwin)
+ 	export SEXPLIB_CPP = cc -E -no-cpp-precomp -x c
+ else
+ 	export SEXPLIB_CPP = cpp
+ endif
+ 
  LIB_PACK_NAME = core
  INCDIRS = +camlp4 .
- OCAMLFLAGS = -for-pack Core -dtypes
+ OCAMLFLAGS = -for-pack Core -dtypes -annot
  CFLAGS = \
    -pipe -g -fPIC -O2 -fomit-frame-pointer \
    -Wall -pedantic -Wextra -Wunused -Wno-long-long
@@@ -161,7 -168,6 +168,7 @@@ THREADS = ye
  ANNOTATE = true
  
  all: byte-code-library native-code-library
 +byte: byte-code-library
  
  LIBINSTALL_FILES = \
    core.cmi core.cma core.cmxa core.a libcore_stubs.a dllcore_stubs.so

-- 
janest-core packaging