[Pkg-ocaml-maint-commits] [SCM] calendar packaging branch, master, updated. debian/2.01.1-4-9-gb3f6447

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 66b9e5c86d94d267b5ac8cb82d9046da3db0c770
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Tue Apr 14 14:30:32 2009 +0200

    More ocaml-version-insensitive patch

diff --git a/debian/patches/cmxs.dpatch b/debian/patches/cmxs.dpatch
index 83d4056..dae77e4 100755
--- a/debian/patches/cmxs.dpatch
+++ b/debian/patches/cmxs.dpatch
@@ -6,15 +6,15 @@
 
 @DPATCH@
 diff -urNad calendar~/Makefile.in calendar/Makefile.in
---- calendar~/Makefile.in	2009-03-21 00:30:25.000000000 +0100
-+++ calendar/Makefile.in	2009-04-12 13:09:53.000000000 +0200
+--- calendar~/Makefile.in	2009-04-14 15:00:44.000000000 +0200
++++ calendar/Makefile.in	2009-04-14 15:01:29.000000000 +0200
 @@ -49,7 +49,8 @@
  LIBS	= $(LIBDIR)/$(NAMELIB).cmo $(LIBDIR)/$(NAMELIB).cma
  CLIBS   =
  ifneq ($(CAMLOPT),no)
 -LIBS	:= $(LIBS) $(LIBDIR)/$(NAMELIB).cmx $(LIBDIR)/$(NAMELIB).cmxa
-+LIBS	:= $(LIBS) $(LIBDIR)/$(NAMELIB).cmx $(LIBDIR)/$(NAMELIB).cmxa \
-+           $(LIBDIR)/$(NAMELIB).cmxs
++LIBS	:= $(LIBS) $(LIBDIR)/$(NAMELIB).cmx \
++        $(LIBDIR)/$(NAMELIB).cmxa $(if $(wildcard $(CAMLLIB)/dynlink.cmxa),$(LIBDIR)/$(NAMELIB).cmxs)
  CLIBS   := $(CLIBS) $(LIBDIR)/$(NAMELIB)$(OBJ_EXT) \
  	$(LIBDIR)/$(NAMELIB)$(LIB_EXT)
  endif

-- 
calendar packaging