[Pkg-ocaml-maint-commits] r5214 - in /trunk/packages/ocsigen/trunk/debian: changelog control rules

[glondu-guest at users.alioth.debian.org]

Author: glondu-guest
Date: Wed Feb 27 08:17:00 2008
New Revision: 5214

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5214
Log:
 * Build and install native version of Lwt (Closes: #467618).
 * Delete *depend files during cleanup.

Modified:
    trunk/packages/ocsigen/trunk/debian/changelog
    trunk/packages/ocsigen/trunk/debian/control
    trunk/packages/ocsigen/trunk/debian/rules

Modified: trunk/packages/ocsigen/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/changelog?rev=5214&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/changelog (original)
+++ trunk/packages/ocsigen/trunk/debian/changelog Wed Feb 27 08:17:00 2008
@@ -4,8 +4,10 @@
   * Fix dependencies of ocsigen binary package for dynamic linking.
   * Fix dependencies and description of ocsigen-doc binary package.
   * Fix lintian warning build-depends-on-1-revision (libssl-ocaml-dev).
+  * Build and install native version of Lwt (Closes: #467618).
+  * Delete *depend files during cleanup.
 
- -- Stephane Glondu <steph at glondu.net>  Wed, 20 Feb 2008 17:15:15 +0100
+ -- Stephane Glondu <steph at glondu.net>  Wed, 27 Feb 2008 08:58:37 +0100
 
 ocsigen (0.99.5-1) unstable; urgency=low
 

Modified: trunk/packages/ocsigen/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/control?rev=5214&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/control (original)
+++ trunk/packages/ocsigen/trunk/debian/control Wed Feb 27 08:17:00 2008
@@ -41,7 +41,9 @@
  handles sessions, URLs, and page parameters automatically.
  .
  This package contains the documentation of all Ocsigen's modules
- (including Lwt).
+ (including Lwt). This is developer's documentation, generated by
+ ocamldoc. The documentation for the server itself is available
+ online.
 
 Package: liblwt-ocaml-dev
 Section: libdevel

Modified: trunk/packages/ocsigen/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/rules?rev=5214&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/rules (original)
+++ trunk/packages/ocsigen/trunk/debian/rules Wed Feb 27 08:17:00 2008
@@ -12,10 +12,12 @@
 include /usr/share/dpatch/dpatch.make
 
 OCAMLABI := $(shell ocamlc -version)
+NATIVECODE := $(shell [ -x /usr/bin/ocamlopt ] && echo yes)
 OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
 
 DESTDIR := $(CURDIR)/debian/ocsigen
-
+LWT_XTARGET := $(if $(NATIVECODE),lwt.opt)
+LWT_XARCHIVES := $(if $(NATIVECODE),lwt/lwt.a lwt/lwt.cmxa)
 
 ocamlinit:
 	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
@@ -43,7 +45,7 @@
 	dh_testdir
 
 	$(MAKE) depend
-	$(MAKE) all
+	$(MAKE) all $(LWT_XTARGET)
 #	$(MAKE) doc
 
 	touch $@
@@ -54,6 +56,7 @@
 	rm -f build-stamp configure-stamp
 
 	[ ! -f Makefile.config ] || $(MAKE) clean
+	-find -name "*depend" -delete
 
 	dh_clean
 
@@ -66,6 +69,7 @@
 	$(MAKE) install MODULEINSTALLDIR=$(shell ocamlc -where) CHOWN=true
 	$(MAKE) logrotate
 	rm -f $(DESTDIR)/var/run/ocsigen_command
+	-install -t $(DESTDIR)/usr/lib/ocaml/$(OCAMLABI)/lwt -m 0644 $(LWT_XARCHIVES)
 	mv $(DESTDIR)/usr/share/doc/ocsigen/ocsigen debian/ocsigen-doc/usr/share/doc/ocsigen-doc/html
 	mv $(DESTDIR)/usr/lib/ocaml/$(OCAMLABI)/lwt debian/liblwt-ocaml-dev/usr/lib/ocaml/$(OCAMLABI)
 	mv $(DESTDIR)/usr/lib/ocsigen/*.cmi debian/ocsigen-dev/usr/lib/ocsigen