[Pkg-ocaml-maint-commits] [SCM] calendar packaging branch, master, updated. debian/2.01.1-3-7-gac00e32

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 460a4d82d5c129c68f2d078355e99e9356b5826f
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Sun Apr 12 15:08:09 2009 +0200

    Building and installing calendarLib.cmxs

diff --git a/debian/patches/00list b/debian/patches/00list
index e0026f8..aa9ae94 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1,3 @@
 install_destdir.dpatch
+cmxs.dpatch
 meta.dpatch
diff --git a/debian/patches/cmxs.dpatch b/debian/patches/cmxs.dpatch
new file mode 100755
index 0000000..83d4056
--- /dev/null
+++ b/debian/patches/cmxs.dpatch
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## cmxs.dpatch by Mehdi Dogguy <dogguy at pps.jussieu.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at 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
+@@ -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
+ CLIBS   := $(CLIBS) $(LIBDIR)/$(NAMELIB)$(OBJ_EXT) \
+ 	$(LIBDIR)/$(NAMELIB)$(LIB_EXT)
+ endif
+@@ -107,6 +108,9 @@
+ $(LIBDIR)/$(NAMELIB).a $(LIBDIR)/$(NAMELIB).cmxa: $(LIBDIR)/$(NAMELIB).cmx 
+ 	$(CAMLFIND) ocamlopt $(OPTFLAGS) -a -o $@ $<
+ 
++$(LIBDIR)/$(NAMELIB).cmxs: $(LIBDIR)/$(NAMELIB).cmxa
++	$(CAMLFIND) ocamlopt -I $(LIBDIR) -shared -linkall -o $@ $<
++
+ src/version.ml: Makefile
+ 	echo "let version = \"$(VERSION)\"" > $@
+ 	echo "let date = \"`date`\"" >> $@
diff --git a/debian/patches/install_destdir.dpatch b/debian/patches/install_destdir.dpatch
index dcd6ea9..d2085bc 100755
--- a/debian/patches/install_destdir.dpatch
+++ b/debian/patches/install_destdir.dpatch
@@ -18,7 +18,7 @@ diff -urNad calendar~/Makefile.in calendar/Makefile.in
  	  (if test -d `ocamlfind install -help | grep destdir | sed -e "s/.*default: \(.*\))/\1/"`/$(NAME); then $(MAKE) uninstall; fi;\
 -	  $(CAMLFIND) install $(NAME) target/*.cm[iox] target/*.cma target/*.cmxa $(MLI) $(CMI) $(CLIBS) META\
 +	  mkdir -p $(OCAML_LIB_DIR);\
-+	  $(CAMLFIND) install -destdir $(OCAML_LIB_DIR) $(NAME) target/calendarLib.cmi target/calendarLib.cma $(wildcard target/calendarLib.cmx target/calendarLib.cmxa target/calendarLib.a) $(MLI) META\
++	  $(CAMLFIND) install -destdir $(OCAML_LIB_DIR) $(NAME) target/calendarLib.cmi target/calendarLib.cma $(wildcard target/calendarLib.cmx target/calendarLib.cmxa target/calendarLib.a target/calendarLib.cmxs) $(MLI) META\
  	)else \
  	  (echo; echo "Not the good version. Please, do :"; \
  	   echo "  make clean && make"; \

-- 
calendar packaging