ocaml 3.09 transition

diff --git a/helm/DEVEL/ocaml-http/debian/changelog b/helm/DEVEL/ocaml-http/debian/changelog
index c7f6e581df41353a1c09f31b8f5a7c5bfa3b3afa..8c31daf3c27ff6fead8c6ed518d89090e4ef1b41 100644 (file)
--- a/helm/DEVEL/ocaml-http/debian/changelog
+++ b/helm/DEVEL/ocaml-http/debian/changelog
@@ -1,3 +1,13 @@
+ocaml-http (0.1.2-2) unstable; urgency=low
+
+  * rebuilt with ocaml 3.09
+  * debian/*
+    - no more hardcoding of ocaml abi version anywhere
+  * debian/rules
+    - use cdbs
+
+ -- Stefano Zacchiroli <zack@debian.org>  Sat, 26 Nov 2005 20:28:26 +0100
+
 ocaml-http (0.1.2-1) unstable; urgency=low
 
   * avoid exceptions for closing connection twice during finaliztion of

diff --git a/helm/DEVEL/ocaml-http/debian/control b/helm/DEVEL/ocaml-http/debian/control
index 9a3d6c384db016cd8c12b813246297be7aeb3bc7..ed54d2aa288c052b8372a415a1206c1ea4ae2e83 100644 (file)
--- a/helm/DEVEL/ocaml-http/debian/control
+++ b/helm/DEVEL/ocaml-http/debian/control
@@ -2,12 +2,12 @@ Source: ocaml-http
 Section: devel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack@debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml-nox-3.08.3, ocaml-findlib, libpcre-ocaml-dev (>= 5.10.0), libocamlnet-ocaml-dev (>= 1.1)
+Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= 3.09.0), ocaml-findlib (>= 1.1), libpcre-ocaml-dev (>= 5.10.1), libocamlnet-ocaml-dev (>= 1.1-7), cdbs
 Standards-Version: 3.6.2
 
 Package: libhttp-ocaml-dev
 Architecture: any
-Depends: ocaml-nox-3.08.3, libpcre-ocaml-dev (>= 5.10.0), libocamlnet-ocaml-dev (>= 1.1)
+Depends: ocaml-nox-${F:OCamlABI}, libpcre-ocaml-dev (>= 5.10.1), libocamlnet-ocaml-dev (>= 1.1-7)
 Description: OCaml library for writing HTTP servers
  OCaml HTTP is a library for the Objective Caml programming language,
  used to build simple HTTP servers, largely inspired to Perl's

diff --git a/helm/DEVEL/ocaml-http/debian/control.in b/helm/DEVEL/ocaml-http/debian/control.in
new file mode 100644 (file)
index 0000000..4131e11
--- /dev/null
+++ b/helm/DEVEL/ocaml-http/debian/control.in
@@ -0,0 +1,23 @@
+Source: ocaml-http
+Section: devel
+Priority: optional
+Maintainer: Stefano Zacchiroli <zack@debian.org>
+Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= @OCamlABI@), ocaml-findlib (>= 1.1), libpcre-ocaml-dev (>= 5.10.1), libocamlnet-ocaml-dev (>= 1.1-7), cdbs
+Standards-Version: 3.6.2
+
+Package: libhttp-ocaml-dev
+Architecture: any
+Depends: ocaml-nox-${F:OCamlABI}, libpcre-ocaml-dev (>= 5.10.1), libocamlnet-ocaml-dev (>= 1.1-7)
+Description: OCaml library for writing HTTP servers
+ OCaml HTTP is a library for the Objective Caml programming language,
+ used to build simple HTTP servers, largely inspired to Perl's
+ HTTP::Daemon module.
+ .
+ In order to implement an HTTP servers the programmer has to provide a
+ daemon specification which contains, among other parameters, a callback
+ function invoked by OCaml HTTP on well formed HTTP requests received.
+ HTTP responses could be sent over an out_channel connected with client
+ socket, accessible from the callback.
+ .
+ The library contains also facility functions that helps in creating
+ well formed HTTP responses and a tiny HTTP client.

diff --git a/helm/DEVEL/ocaml-http/debian/dirs b/helm/DEVEL/ocaml-http/debian/dirs
index 45f0546bffc3fe0c80d9fe5b376db97a0124d5c2..2f455d562b54e508808dd65b3c5b61aa6ac9698b 100644 (file)
--- a/helm/DEVEL/ocaml-http/debian/dirs
+++ b/helm/DEVEL/ocaml-http/debian/dirs
@@ -1 +1 @@
-/usr/lib/ocaml/3.08.3
+/usr/lib/ocaml/3.09.0

diff --git a/helm/DEVEL/ocaml-http/debian/dirs.in b/helm/DEVEL/ocaml-http/debian/dirs.in
new file mode 100644 (file)
index 0000000..330aaf4
--- /dev/null
+++ b/helm/DEVEL/ocaml-http/debian/dirs.in
@@ -0,0 +1 @@
+/usr/lib/ocaml/@OCamlABI@

diff --git a/helm/DEVEL/ocaml-http/debian/rules b/helm/DEVEL/ocaml-http/debian/rules
index 83dee8f5cee759741013d55a45cbcfeb4d43d8dc..bde0727440b5c0279bbaa2a28d9a4787cf55cf84 100755 (executable)
--- a/helm/DEVEL/ocaml-http/debian/rules
+++ b/helm/DEVEL/ocaml-http/debian/rules
@@ -1,46 +1,20 @@
 #!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/makefile.mk
 
-#export DH_VERBOSE=1
+PKGNAME = libhttp-ocaml-dev
 
-TARGETDIR = $(CURDIR)/debian/libhttp-ocaml-dev
-OCAML_LIB_DIR = $(shell ocamlc -where)
+OCAMLABI := $(shell ocamlc -version)
+OCAMLLIBDIR := $(shell ocamlc -where)
+OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
+HAVE_OCAMLOPT := $(shell test -x /usr/bin/ocamlopt && echo "yes")
+DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAMLLIBDIR)
 
-build: build-stamp
-build-stamp:
-       dh_testdir
-       $(MAKE) all
-       if [ -x /usr/bin/ocamlopt ]; then $(MAKE) opt; else true; fi
-       touch build-stamp
+ocamlinit:
+       for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
 
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp
-       -$(MAKE) distclean
-       dh_clean
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       dh_installdirs
-       $(MAKE) install DESTDIR=$(TARGETDIR)$(OCAML_LIB_DIR)
-
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installdocs
-       dh_installexamples
-       dh_installchangelogs 
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-arch
-.PHONY: build clean binary-arch binary install
+ifeq ($(HAVE_OCAMLOPT),yes)
+build/$(PKGNAME)::
+       $(MAKE) opt
+endif